Merge branch 'upstream/main' into add-alibabacloud-inference

* upstream/main: (22 commits) Prune changelogs after 8.15.0 release Bump versions after 8.15.0 release EIS integration (elastic#111154) Skip LOOKUP/INLINESTATS cases unless on snapshot (elastic#111755) Always enforce strict role validation (elastic#111056) Mute org.elasticsearch.xpack.esql.analysis.VerifierTests testUnsupportedAndMultiTypedFields elastic#111753 [ML] Force time shift integration test (elastic#111620) ESQL: Add tests for sort, where with unsupported type (elastic#111737) [ML] Force time shift documentation (elastic#111668) Fix remote cluster credential secure settings reload (elastic#111535) ESQL: Fix for overzealous validation in case of invalid mapped fields (elastic#111475) Pass allow security manager flag in gradle test policy setup plugin (elastic#111725) Rename streamContent/Separator to bulkContent/Separator (elastic#111716) Mute org.elasticsearch.tdigest.ComparisonTests testSparseGaussianDistribution elastic#111721 Remove 8.14 from branches.json Only emit product origin in deprecation log if present (elastic#111683) Forward port release notes for v8.15.0 (elastic#111714) [ES|QL] Combine Disjunctive CIDRMatch (elastic#111501) ESQL: Remove qualifier from attrs (elastic#110581) Force using the last centroid during merging (elastic#111644) ... # Conflicts: # server/src/main/java/org/elasticsearch/TransportVersions.java # x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/InferenceNamedWriteablesProvider.java
weizijun · Aug 9, 2024 · 4528f9e · 4528f9e
2 parents 66f2e19 + bceac55
commit 4528f9e
Show file tree

Hide file tree

Showing 478 changed files with 5,815 additions and 2,704 deletions.
diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
@@ -62,7 +62,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["7.17.24", "8.14.4", "8.15.0", "8.16.0"]
+            BWC_VERSION: ["7.17.24", "8.15.1", "8.16.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml
@@ -577,8 +577,8 @@ steps:
         env:
           BWC_VERSION: 8.13.4
 
-      - label: "{{matrix.image}} / 8.14.4 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.14.4
+      - label: "{{matrix.image}} / 8.14.3 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.14.3
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -592,10 +592,10 @@ steps:
           buildDirectory: /dev/shm/bk
           diskSizeGb: 250
         env:
-          BWC_VERSION: 8.14.4
+          BWC_VERSION: 8.14.3
 
-      - label: "{{matrix.image}} / 8.15.0 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.0
+      - label: "{{matrix.image}} / 8.15.1 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.15.1
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -609,7 +609,7 @@ steps:
           buildDirectory: /dev/shm/bk
           diskSizeGb: 250
         env:
-          BWC_VERSION: 8.15.0
+          BWC_VERSION: 8.15.1
 
       - label: "{{matrix.image}} / 8.16.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.0

diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml
@@ -642,8 +642,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 8.14.4 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.14.4#bwcTest
+      - label: 8.14.3 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.14.3#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -653,7 +653,7 @@ steps:
           preemptible: true
           diskSizeGb: 250
         env:
-          BWC_VERSION: 8.14.4
+          BWC_VERSION: 8.14.3
         retry:
           automatic:
             - exit_status: "-1"
@@ -662,8 +662,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 8.15.0 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.0#bwcTest
+      - label: 8.15.1 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.15.1#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -673,7 +673,7 @@ steps:
           preemptible: true
           diskSizeGb: 250
         env:
-          BWC_VERSION: 8.15.0
+          BWC_VERSION: 8.15.1
         retry:
           automatic:
             - exit_status: "-1"
@@ -771,7 +771,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk17
-            BWC_VERSION: ["7.17.24", "8.14.4", "8.15.0", "8.16.0"]
+            BWC_VERSION: ["7.17.24", "8.15.1", "8.16.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
@@ -821,7 +821,7 @@ steps:
               - openjdk21
               - openjdk22
               - openjdk23
-            BWC_VERSION: ["7.17.24", "8.14.4", "8.15.0", "8.16.0"]
+            BWC_VERSION: ["7.17.24", "8.15.1", "8.16.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -31,6 +31,6 @@ BWC_VERSION:
   - "8.11.4"
   - "8.12.2"
   - "8.13.4"
-  - "8.14.4"
-  - "8.15.0"
+  - "8.14.3"
+  - "8.15.1"
   - "8.16.0"
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
@@ -1,5 +1,4 @@
 BWC_VERSION:
   - "7.17.24"
-  - "8.14.4"
-  - "8.15.0"
+  - "8.15.1"
   - "8.16.0"
diff --git a/branches.json b/branches.json
@@ -7,9 +7,6 @@
     {
       "branch": "8.15"
     },
-    {
-      "branch": "8.14"
-    },
     {
       "branch": "7.17"
     }

diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/test/GradleTestPolicySetupPlugin.java b/build-tools/src/main/java/org/elasticsearch/gradle/test/GradleTestPolicySetupPlugin.java
@@ -22,6 +22,9 @@ public void apply(Project project) {
             test.systemProperty("tests.gradle", true);
             test.systemProperty("tests.task", test.getPath());
 
+            // Flag is required for later Java versions since our tests use a custom security manager
+            test.jvmArgs("-Djava.security.manager=allow");
+
             SystemPropertyCommandLineArgumentProvider nonInputProperties = new SystemPropertyCommandLineArgumentProvider();
             // don't track these as inputs since they contain absolute paths and break cache relocatability
             nonInputProperties.systemProperty("gradle.dist.lib", gradle.getGradleHomeDir().getAbsolutePath() + "/lib");

diff --git a/docs/changelog/101373.yaml b/docs/changelog/101373.yaml
diff --git a/docs/changelog/103374.yaml b/docs/changelog/103374.yaml
diff --git a/docs/changelog/105792.yaml b/docs/changelog/105792.yaml
diff --git a/docs/changelog/105829.yaml b/docs/changelog/105829.yaml
diff --git a/docs/changelog/106252.yaml b/docs/changelog/106252.yaml
diff --git a/docs/changelog/106486.yaml b/docs/changelog/106486.yaml
diff --git a/docs/changelog/106553.yaml b/docs/changelog/106553.yaml
diff --git a/docs/changelog/106591.yaml b/docs/changelog/106591.yaml
diff --git a/docs/changelog/106820.yaml b/docs/changelog/106820.yaml
diff --git a/docs/changelog/107081.yaml b/docs/changelog/107081.yaml
diff --git a/docs/changelog/107088.yaml b/docs/changelog/107088.yaml
diff --git a/docs/changelog/107191.yaml b/docs/changelog/107191.yaml
diff --git a/docs/changelog/107216.yaml b/docs/changelog/107216.yaml
diff --git a/docs/changelog/107240.yaml b/docs/changelog/107240.yaml
diff --git a/docs/changelog/107244.yaml b/docs/changelog/107244.yaml
diff --git a/docs/changelog/107279.yaml b/docs/changelog/107279.yaml
diff --git a/docs/changelog/107409.yaml b/docs/changelog/107409.yaml
diff --git a/docs/changelog/107410.yaml b/docs/changelog/107410.yaml
diff --git a/docs/changelog/107415.yaml b/docs/changelog/107415.yaml
diff --git a/docs/changelog/107426.yaml b/docs/changelog/107426.yaml
diff --git a/docs/changelog/107435.yaml b/docs/changelog/107435.yaml
diff --git a/docs/changelog/107493.yaml b/docs/changelog/107493.yaml
diff --git a/docs/changelog/107545.yaml b/docs/changelog/107545.yaml
diff --git a/docs/changelog/107549.yaml b/docs/changelog/107549.yaml
diff --git a/docs/changelog/107567.yaml b/docs/changelog/107567.yaml
diff --git a/docs/changelog/107579.yaml b/docs/changelog/107579.yaml
diff --git a/docs/changelog/107593.yaml b/docs/changelog/107593.yaml
diff --git a/docs/changelog/107640.yaml b/docs/changelog/107640.yaml
diff --git a/docs/changelog/107645.yaml b/docs/changelog/107645.yaml
diff --git a/docs/changelog/107647.yaml b/docs/changelog/107647.yaml
diff --git a/docs/changelog/107663.yaml b/docs/changelog/107663.yaml
diff --git a/docs/changelog/107675.yaml b/docs/changelog/107675.yaml