[RORDEV-962][RORDEV-964] ES 8.9.0 & 7.17.12 support (#927)

azure-pipelines.yml

@@ -121,6 +121,8 @@ stages:
         strategy:
           maxParallel: 99
           matrix:
+            IT_es89x:
+              ROR_TASK: integration_es89x
             IT_es88x:
               ROR_TASK: integration_es88x
             IT_es87x:
@@ -165,8 +167,8 @@ stages:
         strategy:
           maxParallel: 99
           matrix:
-            IT_es88x:
-              ROR_TASK: integration_es88x
+            IT_es89x:
+              ROR_TASK: integration_es89x
             IT_es80x:
               ROR_TASK: integration_es80x
       - job:

bin/build.sh

@@ -40,6 +40,11 @@ if [[ -z $TRAVIS ]] ||  [[ $ROR_TASK == "core_tests" ]]; then
     ./gradlew --stacktrace core:test
 fi
 
+if [[ -z $TRAVIS ]] ||  [[ $ROR_TASK == "integration_es89x" ]]; then
+    echo ">>> es89x => Running testcontainers.."
+    ./gradlew integration-tests:test '-PesModule=es89x' || ( find . |grep hs_err |xargs cat && exit 1 )
+fi
+
 if [[ -z $TRAVIS ]] ||  [[ $ROR_TASK == "integration_es88x" ]]; then
     echo ">>> es88x => Running testcontainers.."
     ./gradlew integration-tests:test '-PesModule=es88x' || ( find . |grep hs_err |xargs cat && exit 1 )
@@ -179,6 +184,9 @@ if [[ -z $TRAVIS ]] ||  [[ $ROR_TASK == "package_es8xx" ]]; then
 
     echo ">>> ($0) additional builds of ES module for specified ES version"
 
+    #es89
+    ./gradlew --stacktrace es89x:ror '-PesVersion=8.9.0'
+
     #es88
     ./gradlew --stacktrace es88x:ror '-PesVersion=8.8.2'
     ./gradlew --stacktrace es88x:ror '-PesVersion=8.8.1'
@@ -232,6 +240,7 @@ if [[ -z $TRAVIS ]] ||  [[ $ROR_TASK == "package_es7xx" ]]; then
     echo ">>> ($0) additional builds of ES module for specified ES version"
 
     #es716x
+    ./gradlew --stacktrace es716x:ror '-PesVersion=7.17.12'
     ./gradlew --stacktrace es716x:ror '-PesVersion=7.17.11'
     ./gradlew --stacktrace es716x:ror '-PesVersion=7.17.10'
     ./gradlew --stacktrace es716x:ror '-PesVersion=7.17.9'

bin/upload_es_artifacts.sh

@@ -4,9 +4,10 @@ set -xe
 
 echo ">>> ($0) UPLOADING ES ARTIFACTS ..."
 
-./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=8.8.2
-./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=8.8.1
-./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=8.8.0
+./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=8.9.0
+#./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=8.8.2
+#./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=8.8.1
+#./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=8.8.0
 #./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=8.7.1
 #./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=8.7.0
 #./gradlew --stacktrace --info clean ror-tools:uploadArtifactsFromEsBinaries -PesVersion=8.6.2

es716x/gradle.properties

@@ -1 +1 @@
-esVersion=7.17.11
+esVersion=7.17.12

es89x/build.gradle

@@ -0,0 +1,92 @@
+/*
+ *    This file is part of ReadonlyREST.
+ *
+ *    ReadonlyREST is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, either version 3 of the License, or
+ *    (at your option) any later version.
+ *
+ *    ReadonlyREST is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with ReadonlyREST.  If not, see http://www.gnu.org/licenses/
+ */
+
+plugins {
+    id "readonlyrest.plugin-common-conventions"
+}
+
+def pluginFullName = pluginName + '-' + version
+
+compileScala {
+    sourceCompatibility = 17
+    targetCompatibility = 17
+}
+
+dependencies {
+    implementation  project(path: ':core')
+    implementation  project(path: ':ror-tools', configuration: 'shadow')
+    implementation  project(path: ':ror-tools-core')
+    implementation  group: 'org.elasticsearch',                 name: 'elasticsearch' ,                         version: esVersion
+    implementation  group: 'org.elasticsearch.client',          name: 'elasticsearch-rest-client',              version: esVersion
+    implementation  group: 'org.apache.httpcomponents',         name: 'httpclient',                             version: '4.5.13'
+    implementation  group: 'org.apache.logging.log4j',          name: 'log4j-core',                             version: '2.11.1'
+    compileOnly     group: 'org.locationtech.spatial4j',        name: 'spatial4j',                              version: '0.7'
+    // if you don't have this dependency in local maven, please run publishToMavenLocal task first
+    compileOnly     group: 'org.elasticsearch.plugin',          name: 'transport-netty4',                       version: esVersion
+}
+
+configurations {
+    wagon
+    distJars {
+        exclude group: 'org.elasticsearch'
+        exclude group: 'lucene-core'
+        exclude module: 'log4j-api'
+        exclude module: 'log4j-core'
+        exclude group: 'lucene-analyzers-common'
+        exclude group: 'org.apache.commons'
+        exclude group: 'org.yaml'
+        exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
+    }
+}
+
+tasks.register('cleanOldData') {
+    doLast {
+        delete 'build/tmp/' + pluginFullName
+    }
+}
+
+tasks.register('jarHellCheck', JavaExec) {
+    outputs.upToDateWhen { false }
+    mainClass.set("org.elasticsearch.jdk.JarHell")
+    classpath = project.sourceSets.main.compileClasspath.filter { it.exists() }
+}
+
+tasks.register('resolvePluginDescriptorTemplate', Copy) {
+    dependsOn configureEsVersion
+    outputs.upToDateWhen { false }
+    from './plugin-metadata'
+    into 'build/tmp/' + pluginFullName
+    expand([
+            'descriptor': [
+                    'name'         : pluginName,
+                    'pluginVersion': project.properties['pluginVersion'],
+                    'esVersion'    : project.properties['esVersion']
+            ]
+    ])
+}
+
+tasks.register('ror', Zip) {
+    dependsOn(cleanOldData, jarHellCheck, toJar, resolvePluginDescriptorTemplate)
+    outputs.upToDateWhen { false }
+    archivesBaseName = pluginName
+    into('.')
+            {
+                from configurations.distJars.filter { x -> !x.name.contains('spatial4j') && !x.name.contains('jts') }
+                from 'build/libs/' + pluginFullName + '.jar'
+                from 'build/tmp/' + pluginFullName
+            }
+}

es89x/gradle.properties

@@ -0,0 +1 @@
+esVersion=8.9.0

es89x/plugin-metadata/plugin-descriptor.properties

@@ -0,0 +1,27 @@
+#
+# This file is part of ReadonlyREST.
+#
+#     ReadonlyREST is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     ReadonlyREST is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with ReadonlyREST.  If not, see http://www.gnu.org/licenses/
+#
+#
+# Elasticsearch plugin descriptor file
+# This file must exist as 'plugin-descriptor.properties' in a folder named `elasticsearch`
+# inside all plugins.
+#
+name=${descriptor.name}
+version=${descriptor.pluginVersion}
+description=Safely expose Elasticsearch REST API
+classname=tech.beshu.ror.es.ReadonlyRestPlugin
+java.version=1.8
+elasticsearch.version=${descriptor.esVersion}

es89x/plugin-metadata/plugin-security.policy

@@ -0,0 +1,14 @@
+grant {
+  permission java.io.FilePermission "/usr/share/elasticsearch", "read";
+  permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
+  permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
+  permission java.lang.RuntimePermission "accessClassInPackage.sun.misc.*";
+  permission java.lang.RuntimePermission "accessDeclaredMembers";
+  permission java.lang.RuntimePermission "getClassLoader";
+  permission java.lang.RuntimePermission "setContextClassLoader";
+  permission java.net.SocketPermission "*", "accept, resolve, connect";
+  permission java.security.SecurityPermission "insertProvider";
+  permission java.security.SecurityPermission "putProviderProperty.BCFIPS";
+  permission java.security.SecurityPermission "putProviderProperty.BCJSSE";
+  permission java.util.PropertyPermission "*", "read,write";
+};