<pre style='margin:0'>
Frank Schima (mf2k) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/90a50538e4abfba2f01e8680ded2e77405568f94">https://github.com/macports/macports-ports/commit/90a50538e4abfba2f01e8680ded2e77405568f94</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 90a5053  elasticsearch: Update to 7.4.0 and java version dependencies
</span>90a5053 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 90a50538e4abfba2f01e8680ded2e77405568f94
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Fri Oct 4 05:30:47 2019 -0400

<span style='display:block; white-space:pre;color:#404040;'>    elasticsearch: Update to 7.4.0 and java version dependencies
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * Update to Elasticsearch 7.4.0
</span><span style='display:block; white-space:pre;color:#404040;'>    * Update Java version requirements and fallbacks
</span>---
 databases/elasticsearch/Portfile                    | 21 +++++++++++----------
 .../files/patch-elasticsearch-env.diff              |  4 ++--
 2 files changed, 13 insertions(+), 12 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/elasticsearch/Portfile b/databases/elasticsearch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e1b0e88..ac18fff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/elasticsearch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/elasticsearch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 
 PortSystem          1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           java         1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           java 1.0
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             7.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             7.4.0
</span> revision            0
 
 name                elasticsearch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ long_description    Elasticsearch is a highly scalable open-source full-text \
</span>                     real time. It is generally used as the underlying \
                     engine/technology that powers applications that have complex \
                     search features and requirements. \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    Elasticsearch requires Java/OpenJDK 12, which comes installed. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    Elasticsearch requires Java/OpenJDK 11+, which comes installed. \
</span>                     Other Java versions are not supported.
 
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,17 +29,18 @@ master_sites        https://artifacts.elastic.co/downloads/${name}/
</span> worksrcdir          ${distname}
 distname            ${name}-${version}-darwin-x86_64
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  c50a7a2e66e53b5df70afde3da2f971d1ac73886 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  283859570434cd64146c61e5263c2cb3ce537e0dec567c39e0bc41e507eefed1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    338459414
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  f6c8a5214a60391c39c04db66ae0fc7b6b180375 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  ce819d92b889ac36608aff3bc7226741e1fe599328ef3221344933725286f1e3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    279571527
</span> 
 use_configure       no
 build {}
 
 # Required java version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-java.version        12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://www.elastic.co/support/matrix#matrix_jvm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.version        9+
</span> # JDK port to install if required java not found
<span style='display:block; white-space:pre;background:#ffe0e0;'>-java.fallback       openjdk12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+java.fallback       openjdk13
</span> 
 patchfiles          patch-elasticsearch-yml.diff \
                     patch-elasticsearch-env.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,7 +106,7 @@ post-activate {
</span>     system "chown -R ${user}:${group} ${dbdir}"
 
     ui_msg "###########################################################"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    ui_msg "# Elasticsearch requires Java/OpenJDK 12, which comes installed."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    ui_msg "# Elasticsearch requires Java/OpenJDK ${java.version}, which comes installed."
</span>     ui_msg "# Other Java versions are not supported."
     ui_msg "# Use `sudo port load elasticsearch` to start the service"
     ui_msg "###########################################################"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +139,7 @@ curl -XDELETE \"http://localhost:9200/my_first_index\"
</span> 
 Each Elasticsearch shard is a Lucene index; aim for 10-50 GB per shard.
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-${name} is tested with the JDK provided in port openjdk12. Add these
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+${name} is tested with the JDK provided in port openjdk${java.version}. Add these
</span> lines to your ~/.profile to set up your java environment and test with
 'java -version':
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/elasticsearch/files/patch-elasticsearch-env.diff b/databases/elasticsearch/files/patch-elasticsearch-env.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index cf0987c..ad6b9c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/elasticsearch/files/patch-elasticsearch-env.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/elasticsearch/files/patch-elasticsearch-env.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,8 +39,8 @@
</span> -  else
 -    JAVA="$ES_HOME/jdk/bin/java"
 -  fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# MacPorts' port:elasticsearch includes port:openjdk12 as a dependency;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# no need to include this bundled Elasticsearch copy of OpenJDK12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# MacPorts' port:elasticsearch includes port:openjdk13 as a dependency;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# no need to include this bundled Elasticsearch copy of OpenJDK13
</span> +## else
 +##   if [ "$(uname -s)" = "Darwin" ]; then
 +##     # OSX has a different structure
</pre><pre style='margin:0'>

</pre>