From 132220bf83b1b8177a7c83906abf9bbbb830c8bd Mon Sep 17 00:00:00 2001 From: Matt Culbreth Date: Wed, 4 Oct 2023 09:09:08 -0400 Subject: [PATCH] Bump to version 8.12.0 --- .backportrc.json | 4 ++-- .buildkite/pipelines/intake.yml | 2 +- .buildkite/pipelines/periodic-packaging.yml | 16 +++++++++++++++ .buildkite/pipelines/periodic.yml | 11 ++++++++++ .ci/bwcVersions | 1 + .ci/snapshotBwcVersions | 1 + build-tools-internal/version.properties | 2 +- docs/reference/migration/index.asciidoc | 2 ++ .../reference/migration/migrate_8_12.asciidoc | 20 +++++++++++++++++++ docs/reference/release-notes.asciidoc | 2 ++ docs/reference/release-notes/8.12.0.asciidoc | 8 ++++++++ .../release-notes/highlights.asciidoc | 3 ++- .../main/java/org/elasticsearch/Version.java | 3 ++- 13 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 docs/reference/migration/migrate_8_12.asciidoc create mode 100644 docs/reference/release-notes/8.12.0.asciidoc diff --git a/.backportrc.json b/.backportrc.json index ef4aa68e9c44..9e654b51c767 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -1,9 +1,9 @@ { "upstream" : "elastic/elasticsearch", - "targetBranchChoices" : [ "main", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ], + "targetBranchChoices" : [ "main", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ], "targetPRLabels" : [ "backport" ], "branchLabelMapping" : { - "^v8.11.0$" : "main", + "^v8.12.0$" : "main", "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2" } } \ No newline at end of file diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml index 07cf55e0b3ad..6f0657c3d5e8 100644 --- a/.buildkite/pipelines/intake.yml +++ b/.buildkite/pipelines/intake.yml @@ -40,7 +40,7 @@ steps: timeout_in_minutes: 300 matrix: setup: - BWC_VERSION: ["7.17.14", "8.10.3", "8.11.0"] + BWC_VERSION: ["7.17.14", "8.10.3", "8.11.0", "8.12.0"] agents: provider: gcp image: family/elasticsearch-ubuntu-2004 diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml index 6a2492fb03ef..844570d945fd 100644 --- a/.buildkite/pipelines/periodic-packaging.yml +++ b/.buildkite/pipelines/periodic-packaging.yml @@ -1664,6 +1664,22 @@ steps: env: BWC_VERSION: 8.11.0 + - label: "{{matrix.image}} / 8.12.0 / packaging-tests-upgrade" + command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.12.0 + timeout_in_minutes: 300 + matrix: + setup: + image: + - rocky-8 + - ubuntu-2004 + agents: + provider: gcp + image: family/elasticsearch-{{matrix.image}} + machineType: custom-16-32768 + buildDirectory: /dev/shm/bk + env: + BWC_VERSION: 8.12.0 + - group: packaging-tests-windows steps: - label: "{{matrix.image}} / packaging-tests-windows" diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml index f0a3cfdfd1f5..8e959b07a9bc 100644 --- a/.buildkite/pipelines/periodic.yml +++ b/.buildkite/pipelines/periodic.yml @@ -1022,6 +1022,16 @@ steps: buildDirectory: /dev/shm/bk env: BWC_VERSION: 8.11.0 + - label: 8.12.0 / bwc + command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.12.0#bwcTest + timeout_in_minutes: 300 + agents: + provider: gcp + image: family/elasticsearch-ubuntu-2004 + machineType: custom-32-98304 + buildDirectory: /dev/shm/bk + env: + BWC_VERSION: 8.12.0 - label: concurrent-search-tests command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true check timeout_in_minutes: 420 @@ -1176,6 +1186,7 @@ steps: provider: gcp image: family/elasticsearch-ubuntu-2004 machineType: n2-standard-8 + buildDirectory: /dev/shm/bk - label: third-party / s3 command: | export amazon_s3_bucket=elasticsearch-ci.us-west-2 diff --git a/.ci/bwcVersions b/.ci/bwcVersions index 90ba9b8131dc..536a6cbf2a3b 100644 --- a/.ci/bwcVersions +++ b/.ci/bwcVersions @@ -101,3 +101,4 @@ BWC_VERSION: - "8.10.2" - "8.10.3" - "8.11.0" + - "8.12.0" diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions index 1bc1fa321d9d..7ad88baffac9 100644 --- a/.ci/snapshotBwcVersions +++ b/.ci/snapshotBwcVersions @@ -2,3 +2,4 @@ BWC_VERSION: - "7.17.14" - "8.10.3" - "8.11.0" + - "8.12.0" diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index a4e990c18f5e..5f2e9feca975 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -1,4 +1,4 @@ -elasticsearch = 8.11.0 +elasticsearch = 8.12.0 lucene = 9.8.0 bundled_jdk_vendor = openjdk diff --git a/docs/reference/migration/index.asciidoc b/docs/reference/migration/index.asciidoc index 119eb2600af5..d4f38f1b5d9f 100644 --- a/docs/reference/migration/index.asciidoc +++ b/docs/reference/migration/index.asciidoc @@ -1,5 +1,6 @@ include::migration_intro.asciidoc[] +* <> * <> * <> * <> @@ -13,6 +14,7 @@ include::migration_intro.asciidoc[] * <> * <> +include::migrate_8_12.asciidoc[] include::migrate_8_11.asciidoc[] include::migrate_8_10.asciidoc[] include::migrate_8_9.asciidoc[] diff --git a/docs/reference/migration/migrate_8_12.asciidoc b/docs/reference/migration/migrate_8_12.asciidoc new file mode 100644 index 000000000000..d241a35c686d --- /dev/null +++ b/docs/reference/migration/migrate_8_12.asciidoc @@ -0,0 +1,20 @@ +[[migrating-8.12]] +== Migrating to 8.12 +++++ +8.12 +++++ + +This section discusses the changes that you need to be aware of when migrating +your application to {es} 8.12. + +See also <> and <>. + +coming::[8.12.0] + + +[discrete] +[[breaking-changes-8.12]] +=== Breaking changes + +There are no breaking changes in {es} 8.12. + diff --git a/docs/reference/release-notes.asciidoc b/docs/reference/release-notes.asciidoc index aecbaf0fc928..78e15ff55f7e 100644 --- a/docs/reference/release-notes.asciidoc +++ b/docs/reference/release-notes.asciidoc @@ -6,6 +6,7 @@ This section summarizes the changes in each release. +* <> * <> * <> * <> @@ -51,6 +52,7 @@ This section summarizes the changes in each release. -- +include::release-notes/8.12.0.asciidoc[] include::release-notes/8.11.0.asciidoc[] include::release-notes/8.10.2.asciidoc[] include::release-notes/8.10.1.asciidoc[] diff --git a/docs/reference/release-notes/8.12.0.asciidoc b/docs/reference/release-notes/8.12.0.asciidoc new file mode 100644 index 000000000000..6355b7c5135d --- /dev/null +++ b/docs/reference/release-notes/8.12.0.asciidoc @@ -0,0 +1,8 @@ +[[release-notes-8.12.0]] +== {es} version 8.12.0 + +coming[8.12.0] + +Also see <>. + + diff --git a/docs/reference/release-notes/highlights.asciidoc b/docs/reference/release-notes/highlights.asciidoc index 23e6be1440af..5b43f6940cbf 100644 --- a/docs/reference/release-notes/highlights.asciidoc +++ b/docs/reference/release-notes/highlights.asciidoc @@ -11,7 +11,8 @@ For detailed information about this release, see the <> and // Add previous release to the list Other versions: -{ref-bare}/8.10/release-highlights.html[8.10] +{ref-bare}/8.11/release-highlights.html[8.11] +| {ref-bare}/8.10/release-highlights.html[8.10] | {ref-bare}/8.9/release-highlights.html[8.9] | {ref-bare}/8.8/release-highlights.html[8.8] | {ref-bare}/8.7/release-highlights.html[8.7] diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index 591f93a34726..4d578e77e56b 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -152,7 +152,8 @@ public class Version implements VersionId, ToXContentFragment { public static final Version V_8_10_2 = new Version(8_10_02_99); public static final Version V_8_10_3 = new Version(8_10_03_99); public static final Version V_8_11_0 = new Version(8_11_00_99); - public static final Version CURRENT = V_8_11_0; + public static final Version V_8_12_0 = new Version(8_12_00_99); + public static final Version CURRENT = V_8_12_0; private static final NavigableMap VERSION_IDS; private static final Map VERSION_STRINGS;