diff --git a/.backportrc.json b/.backportrc.json index eef30c5e93c3..702113b5600e 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -1,10 +1,10 @@ { "upstream" : "elastic/elasticsearch", - "targetBranchChoices" : [ "main", "8.x", "8.18", "8.17", "8.16", "8.15", "8.14", "8.13", "8.12", "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" ], + "targetBranchChoices" : [ "main", "8.x", "9.0", "8.18", "8.17", "8.16", "8.15", "8.14", "8.13", "8.12", "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" : { - "^v9.0.0$" : "main", + "^v9.1.0$" : "main", "^v8.19.0$" : "8.x", "^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 ea04a0340076..a207eeafaaae 100644 --- a/.buildkite/pipelines/intake.yml +++ b/.buildkite/pipelines/intake.yml @@ -56,7 +56,7 @@ steps: timeout_in_minutes: 300 matrix: setup: - BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"] + BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "8.19.0", "9.0.0", "9.1.0"] agents: provider: gcp image: family/elasticsearch-ubuntu-2004 diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml index 9565aa4072a6..99ff9ec9ecf2 100644 --- a/.buildkite/pipelines/periodic-packaging.yml +++ b/.buildkite/pipelines/periodic-packaging.yml @@ -367,6 +367,22 @@ steps: env: BWC_VERSION: 9.0.0 + - label: "{{matrix.image}} / 9.1.0 / packaging-tests-upgrade" + command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.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: 9.1.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 2eb617493eb1..d925f7e2bffb 100644 --- a/.buildkite/pipelines/periodic.yml +++ b/.buildkite/pipelines/periodic.yml @@ -401,6 +401,25 @@ steps: - signal_reason: agent_stop limit: 3 + - label: 9.1.0 / bwc + command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.1.0#bwcTest + timeout_in_minutes: 300 + agents: + provider: gcp + image: family/elasticsearch-ubuntu-2004 + machineType: n1-standard-32 + buildDirectory: /dev/shm/bk + preemptible: true + env: + BWC_VERSION: 9.1.0 + retry: + automatic: + - exit_status: "-1" + limit: 3 + signal_reason: none + - signal_reason: agent_stop + limit: 3 + - 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 functionalTests timeout_in_minutes: 420 @@ -467,7 +486,7 @@ steps: setup: ES_RUNTIME_JAVA: - openjdk21 - BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"] + BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "8.19.0", "9.0.0", "9.1.0"] agents: provider: gcp image: family/elasticsearch-ubuntu-2004 @@ -509,7 +528,7 @@ steps: ES_RUNTIME_JAVA: - openjdk21 - openjdk23 - BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"] + BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "8.19.0", "9.0.0", "9.1.0"] agents: provider: gcp image: family/elasticsearch-ubuntu-2004 diff --git a/.ci/bwcVersions b/.ci/bwcVersions index 63549d42b882..e80e036907a0 100644 --- a/.ci/bwcVersions +++ b/.ci/bwcVersions @@ -20,3 +20,4 @@ BWC_VERSION: - "8.18.0" - "8.19.0" - "9.0.0" + - "9.1.0" diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions index 38104e03edb5..68663fdfb178 100644 --- a/.ci/snapshotBwcVersions +++ b/.ci/snapshotBwcVersions @@ -2,4 +2,6 @@ BWC_VERSION: - "8.16.4" - "8.17.2" - "8.18.0" + - "8.19.0" - "9.0.0" + - "9.1.0" diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index c041bd2dd215..a0c663b19a0c 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -1,4 +1,4 @@ -elasticsearch = 9.0.0 +elasticsearch = 9.1.0 lucene = 10.1.0 bundled_jdk_vendor = openjdk diff --git a/docs/reference/migration/index.asciidoc b/docs/reference/migration/index.asciidoc index 11aca45b003f..1624910aa383 100644 --- a/docs/reference/migration/index.asciidoc +++ b/docs/reference/migration/index.asciidoc @@ -1,6 +1,8 @@ include::migration_intro.asciidoc[] +* <> * <> +include::migrate_9_1.asciidoc[] include::migrate_9_0.asciidoc[] diff --git a/docs/reference/migration/migrate_9_1.asciidoc b/docs/reference/migration/migrate_9_1.asciidoc new file mode 100644 index 000000000000..07966c04ae10 --- /dev/null +++ b/docs/reference/migration/migrate_9_1.asciidoc @@ -0,0 +1,20 @@ +[[migrating-9.1]] +== Migrating to 9.1 +++++ +9.1 +++++ + +This section discusses the changes that you need to be aware of when migrating +your application to {es} 9.1. + +See also <> and <>. + +coming::[9.1.0] + + +[discrete] +[[breaking-changes-9.1]] +=== Breaking changes + +There are no breaking changes in {es} 9.1. + diff --git a/docs/reference/release-notes.asciidoc b/docs/reference/release-notes.asciidoc index 615e7135365c..85a5af66aceb 100644 --- a/docs/reference/release-notes.asciidoc +++ b/docs/reference/release-notes.asciidoc @@ -6,9 +6,11 @@ This section summarizes the changes in each release. +* <> * <> -- +include::release-notes/9.1.0.asciidoc[] include::release-notes/9.0.0.asciidoc[] diff --git a/docs/reference/release-notes/9.1.0.asciidoc b/docs/reference/release-notes/9.1.0.asciidoc new file mode 100644 index 000000000000..2f614615005f --- /dev/null +++ b/docs/reference/release-notes/9.1.0.asciidoc @@ -0,0 +1,8 @@ +[[release-notes-9.1.0]] +== {es} version 9.1.0 + +coming[9.1.0] + +Also see <>. + + diff --git a/docs/reference/release-notes/highlights.asciidoc b/docs/reference/release-notes/highlights.asciidoc index b87081639c68..eeac56577828 100644 --- a/docs/reference/release-notes/highlights.asciidoc +++ b/docs/reference/release-notes/highlights.asciidoc @@ -8,6 +8,11 @@ ifeval::["{release-state}"!="unreleased"] For detailed information about this release, see the <> and <>. +// Add previous release to the list +Other versions: + +{ref-bare}/9.0/release-highlights.html[9.0] + endif::[] // The notable-highlights tag marks entries that diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index 1f4ab769182d..49f1f6c0d4a1 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -199,7 +199,8 @@ public class Version implements VersionId, ToXContentFragment { public static final Version V_8_18_0 = new Version(8_18_00_99); public static final Version V_8_19_0 = new Version(8_19_00_99); public static final Version V_9_0_0 = new Version(9_00_00_99); - public static final Version CURRENT = V_9_0_0; + public static final Version V_9_1_0 = new Version(9_01_00_99); + public static final Version CURRENT = V_9_1_0; private static final NavigableMap VERSION_IDS; private static final Map VERSION_STRINGS;