Merge remote-tracking branch 'origin/develop' into compile-tests-with…

…-scala3 # Conflicts: # integration-tests/src/test/scala/tech/beshu/ror/integration/suites/AdminApiAuthMockSuite.scala # integration-tests/src/test/scala/tech/beshu/ror/integration/suites/AdminApiWithDefaultRorIndexSuite.scala # integration-tests/src/test/scala/tech/beshu/ror/integration/suites/ClusterApiSuite.scala # integration-tests/src/test/scala/tech/beshu/ror/integration/suites/FipsSslSuite.scala # integration-tests/src/test/scala/tech/beshu/ror/integration/suites/IndexLifecycleManagementApiSuite.scala # integration-tests/src/test/scala/tech/beshu/ror/integration/suites/JwtAuthSuite.scala # integration-tests/src/test/scala/tech/beshu/ror/integration/suites/base/XpackClusterWithRorNodesAndInternodeSslSuite.scala
sscarduzio · Apr 8, 2024 · 2d3e418 · 2d3e418
2 parents 9178f46 + 519e600
commit 2d3e418
Show file tree

Hide file tree

Showing 1,232 changed files with 7,770 additions and 64,714 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -108,6 +108,8 @@ stages:
         strategy:
           maxParallel: 99
           matrix:
+            IT_es813x:
+              ROR_TASK: integration_es813x
             IT_es812x:
               ROR_TASK: integration_es812x
             IT_es811x:
@@ -160,8 +162,8 @@ stages:
         strategy:
           maxParallel: 99
           matrix:
-            IT_es812x:
-              ROR_TASK: integration_es812x
+            IT_es813x:
+              ROR_TASK: integration_es813x
             IT_es80x:
               ROR_TASK: integration_es80x
       - job:
@@ -215,20 +217,8 @@ stages:
               ROR_TASK: integration_es72x
             IT_es70x:
               ROR_TASK: integration_es70x
-            IT_es67x:
-              ROR_TASK: integration_es67x
-            IT_es66x:
-              ROR_TASK: integration_es66x
-            IT_es65x:
-              ROR_TASK: integration_es65x
-            IT_es63x:
-              ROR_TASK: integration_es63x
-            IT_es62x:
-              ROR_TASK: integration_es62x
-            IT_es61x:
-              ROR_TASK: integration_es61x
-            IT_es60x:
-              ROR_TASK: integration_es60x
+            IT_es68x:
+              ROR_TASK: integration_es68x
       - job:
         condition: and(ne(variables.isEpic, true), ne(variables.isDevelop, true), ne(variables.isMaster, true))
         timeoutInMinutes: 120
@@ -262,10 +252,8 @@ stages:
               ROR_TASK: integration_es710x
             IT_es70x:
               ROR_TASK: integration_es70x
-            IT_es67x:
-              ROR_TASK: integration_es67x
-            IT_es60x:
-              ROR_TASK: integration_es60x
+            IT_es68x:
+              ROR_TASK: integration_es68x
 
   - stage: BUILD_ROR
     dependsOn:

diff --git a/build-base/src/main/groovy/readonlyrest.base-common-conventions.gradle b/build-base/src/main/groovy/readonlyrest.base-common-conventions.gradle
@@ -32,6 +32,13 @@ dependencies {
     implementation group: 'org.scala-lang',     name: 'scala-library',      version: '2.13.13'
 }
 
+tasks.withType(ScalaCompile).configureEach {
+    scalaCompileOptions.forkOptions.with {
+        memoryMaximumSize = '1g'
+        jvmArgs = ['-XX:MaxMetaspaceSize=512m']
+    }
+}
+
 test {
     reports {
         junitXml.getRequired().set(true)

diff --git a/buildSrc/src/main/java/tech/beshu/ror/gradle/RorTaskFinder.java b/buildSrc/src/main/java/tech/beshu/ror/gradle/RorTaskFinder.java
@@ -30,7 +30,7 @@
 
 public class RorTaskFinder extends DefaultTask {
 
-  private final static VersionNumber oldestEsVersionSupported = VersionNumber.parse("6.0.0");
+  private final static VersionNumber oldestEsVersionSupported = VersionNumber.parse("6.8.0");
 
   @TaskAction
   public void runRorPluginBuilder() {

diff --git a/ci/run-pipeline.sh b/ci/run-pipeline.sh
@@ -50,6 +50,10 @@ run_integration_tests() {
   ./gradlew integration-tests:test "-PesModule=$ES_MODULE" || (find . | grep hs_err | xargs cat && exit 1)
 }
 
+if [[ -z $TRAVIS ]] || [[ $ROR_TASK == "integration_es813x" ]]; then
+  run_integration_tests "es813x"
+fi
+
 if [[ -z $TRAVIS ]] || [[ $ROR_TASK == "integration_es812x" ]]; then
   run_integration_tests "es812x"
 fi
@@ -146,32 +150,8 @@ if [[ -z $TRAVIS ]] || [[ $ROR_TASK == "integration_es70x" ]]; then
   run_integration_tests "es70x"
 fi
 
-if [[ -z $TRAVIS ]] || [[ $ROR_TASK == "integration_es67x" ]]; then
-  run_integration_tests "es67x"
-fi
-
-if [[ -z $TRAVIS ]] || [[ $ROR_TASK == "integration_es66x" ]]; then
-  run_integration_tests "es66x"
-fi
-
-if [[ -z $TRAVIS ]] || [[ $ROR_TASK == "integration_es65x" ]]; then
-  run_integration_tests "es65x"
-fi
-
-if [[ -z $TRAVIS ]] || [[ $ROR_TASK == "integration_es63x" ]]; then
-  run_integration_tests "es63x"
-fi
-
-if [[ -z $TRAVIS ]] || [[ $ROR_TASK == "integration_es62x" ]]; then
-  run_integration_tests "es62x"
-fi
-
-if [[ -z $TRAVIS ]] || [[ $ROR_TASK == "integration_es61x" ]]; then
-  run_integration_tests "es61x"
-fi
-
-if [[ -z $TRAVIS ]] || [[ $ROR_TASK == "integration_es60x" ]]; then
-  run_integration_tests "es60x"
+if [[ -z $TRAVIS ]] || [[ $ROR_TASK == "integration_es68x" ]]; then
+  run_integration_tests "es68x"
 fi
 
 if [[ $TRAVIS_PULL_REQUEST == "true" ]] && [[ $TRAVIS_BRANCH != "master" ]]; then

diff --git a/ci/supported-es-versions/es6x.txt b/ci/supported-es-versions/es6x.txt
@@ -21,34 +21,4 @@
 6.8.3
 6.8.2
 6.8.1
-6.8.0
-6.7.2
-6.7.1
-6.7.0
-6.6.2
-6.6.1
-6.6.0
-6.5.4
-6.5.3
-6.5.2
-6.5.1
-6.5.0
-6.4.3
-6.4.2
-6.4.1
-6.4.0
-6.3.2
-6.3.1
-6.3.0
-6.2.4
-6.2.3
-6.2.2
-6.2.1
-6.2.0
-6.1.4
-6.1.3
-6.1.2
-6.1.1
-6.1.0
-6.0.1
-6.0.0
+6.8.0
diff --git a/ci/supported-es-versions/es7x.txt b/ci/supported-es-versions/es7x.txt
@@ -1,3 +1,4 @@
+7.17.19
 7.17.18
 7.17.17
 7.17.16

diff --git a/ci/supported-es-versions/es8x.txt b/ci/supported-es-versions/es8x.txt
@@ -1,3 +1,4 @@
+8.13.0
 8.12.2
 8.12.1
 8.12.0

diff --git a/ci/test.sh b/ci/test.sh
diff --git a/core/build.gradle b/core/build.gradle
@@ -130,11 +130,11 @@ dependencies {
     testImplementation  group: 'com.dimafeng',               name: 'testcontainers-scala_2.13',  version: '0.40.16'
 
     constraints {
-        api group: 'io.netty',              name: 'netty-codec-http2',                  version: '4.1.101.Final'
-        api group: 'io.netty',              name: 'netty-handler-proxy',                version: '4.1.101.Final'
-        api group: 'io.netty',              name: 'netty-transport-native-unix-common', version: '4.1.101.Final'
-        api group: 'io.netty',              name: 'netty-transport-native-epoll',       version: '4.1.101.Final'
-        api group: 'io.netty',              name: 'netty-transport-native-kqueue',      version: '4.1.101.Final'
+        api group: 'io.netty',              name: 'netty-codec-http2',                  version: '4.1.108.Final'
+        api group: 'io.netty',              name: 'netty-handler-proxy',                version: '4.1.108.Final'
+        api group: 'io.netty',              name: 'netty-transport-native-unix-common', version: '4.1.108.Final'
+        api group: 'io.netty',              name: 'netty-transport-native-epoll',       version: '4.1.108.Final'
+        api group: 'io.netty',              name: 'netty-transport-native-kqueue',      version: '4.1.108.Final'
         api group: 'com.google.guava',      name: 'guava',                              version: '32.0.1-jre'
         api group: 'io.spray',              name: 'spray-json_2.13',                    version: '1.3.5'
         api group: 'org.scala-lang',        name: 'scala-reflect',                      version: '2.13.13'