diff --git a/.backportrc.json b/.backportrc.json index 211bc320bb5c..7f963b78d355 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -1,9 +1,9 @@ { "upstream" : "elastic/elasticsearch", - "targetBranchChoices" : [ "main", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ], + "targetBranchChoices" : [ "main", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ], "targetPRLabels" : [ "backport" ], "branchLabelMapping" : { - "^v8.7.0$" : "main", + "^v8.8.0$" : "main", "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2" } } \ No newline at end of file diff --git a/.ci/bwcVersions b/.ci/bwcVersions index 6dabe613c827..e87af7bc1a4f 100644 --- a/.ci/bwcVersions +++ b/.ci/bwcVersions @@ -85,3 +85,4 @@ BWC_VERSION: - "8.6.1" - "8.6.2" - "8.7.0" + - "8.8.0" diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions index c89f884223c0..680bf24b9d46 100644 --- a/.ci/snapshotBwcVersions +++ b/.ci/snapshotBwcVersions @@ -2,3 +2,4 @@ BWC_VERSION: - "7.17.10" - "8.6.2" - "8.7.0" + - "8.8.0" diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index 0444d4152ce1..426a83cbe25d 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -1,4 +1,4 @@ -elasticsearch = 8.7.0 +elasticsearch = 8.8.0 lucene = 9.5.0 bundled_jdk_vendor = openjdk diff --git a/docs/reference/migration/index.asciidoc b/docs/reference/migration/index.asciidoc index a523ea2d47f7..63da0894f76a 100644 --- a/docs/reference/migration/index.asciidoc +++ b/docs/reference/migration/index.asciidoc @@ -1,5 +1,6 @@ include::migration_intro.asciidoc[] +* <> * <> * <> * <> @@ -9,6 +10,7 @@ include::migration_intro.asciidoc[] * <> * <> +include::migrate_8_8.asciidoc[] include::migrate_8_7.asciidoc[] include::migrate_8_6.asciidoc[] include::migrate_8_5.asciidoc[] diff --git a/docs/reference/migration/migrate_8_8.asciidoc b/docs/reference/migration/migrate_8_8.asciidoc new file mode 100644 index 000000000000..d7caa91a68e7 --- /dev/null +++ b/docs/reference/migration/migrate_8_8.asciidoc @@ -0,0 +1,22 @@ +[[migrating-8.8]] +== Migrating to 8.8 +++++ +8.8 +++++ + +This section discusses the changes that you need to be aware of when migrating +your application to {es} 8.8. + +See also {ref-bare}/8.8/release-highlights.html[What's new in 8.8] and <>. + +coming::[8.8.0] + + +[discrete] +[[breaking-changes-8.8]] +=== Breaking changes + +// tag::notable-breaking-changes[] +There are no breaking changes in {es} 8.8. +// end::notable-breaking-changes[] + diff --git a/docs/reference/release-notes.asciidoc b/docs/reference/release-notes.asciidoc index 5b557a23c32b..2d5c73263311 100644 --- a/docs/reference/release-notes.asciidoc +++ b/docs/reference/release-notes.asciidoc @@ -6,7 +6,7 @@ This section summarizes the changes in each release. - +* <> * <> * <> * <> @@ -40,6 +40,7 @@ This section summarizes the changes in each release. -- +include::release-notes/8.8.0.asciidoc[] include::release-notes/8.7.0.asciidoc[] include::release-notes/8.6.1.asciidoc[] include::release-notes/8.6.0.asciidoc[] diff --git a/docs/reference/release-notes/8.8.0.asciidoc b/docs/reference/release-notes/8.8.0.asciidoc new file mode 100644 index 000000000000..85fd294347e7 --- /dev/null +++ b/docs/reference/release-notes/8.8.0.asciidoc @@ -0,0 +1,8 @@ +[[release-notes-8.8.0]] +== {es} version 8.8.0 + +coming[8.8.0] + +Also see <>. + + diff --git a/docs/reference/release-notes/highlights.asciidoc b/docs/reference/release-notes/highlights.asciidoc index c0a06628631d..1852528dba4b 100644 --- a/docs/reference/release-notes/highlights.asciidoc +++ b/docs/reference/release-notes/highlights.asciidoc @@ -12,7 +12,8 @@ endif::[] // Add previous release to the list Other versions: -{ref-bare}/8.6/release-highlights.html[8.6] +{ref-bare}/8.7/release-highlights.html[8.7] +| {ref-bare}/8.6/release-highlights.html[8.6] | {ref-bare}/8.5/release-highlights.html[8.5] | {ref-bare}/8.4/release-highlights.html[8.4] | {ref-bare}/8.3/release-highlights.html[8.3] diff --git a/server/src/main/java/org/elasticsearch/TransportVersion.java b/server/src/main/java/org/elasticsearch/TransportVersion.java index 8f986efe2721..f20772150280 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersion.java +++ b/server/src/main/java/org/elasticsearch/TransportVersion.java @@ -133,6 +133,7 @@ public class TransportVersion implements Comparable { public static final TransportVersion V_8_6_1 = new TransportVersion(8_06_01_99, "9f113acb-1b21-4fda-bef9-2a3e669b5c7b"); public static final TransportVersion V_8_6_2 = new TransportVersion(8_06_02_99, "5a82fb68-b265-4a06-97c5-53496f823f51"); public static final TransportVersion V_8_7_0 = new TransportVersion(8_07_00_99, "f1ee7a85-4fa6-43f5-8679-33e2b750448b"); + public static final TransportVersion V_8_8_0 = new TransportVersion(8_08_00_99, "f64fe576-0767-4ec3-984e-3e30b33b6c46"); /* * READ THE JAVADOC ABOVE BEFORE ADDING NEW TRANSPORT VERSIONS * Detached transport versions added below here. Starts at ES major version 10 equivalent. @@ -148,7 +149,7 @@ public class TransportVersion implements Comparable { */ /** Reference to the current transport version */ - public static final TransportVersion CURRENT = V_8_7_0; + public static final TransportVersion CURRENT = V_8_8_0; /** Reference to the earliest compatible transport version to this version of the codebase */ // TODO: can we programmatically calculate or check this? Don't want to introduce circular ref between Version/TransportVersion diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index 5c29f5ba97a2..f81d26bfaf9b 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -138,7 +138,8 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_8_6_2 = new Version(8_06_02_99, TransportVersion.V_8_6_2, org.apache.lucene.util.Version.LUCENE_9_4_2); public static final Version V_8_7_0 = new Version(8_07_00_99, TransportVersion.V_8_7_0, org.apache.lucene.util.Version.LUCENE_9_5_0); - public static final Version CURRENT = V_8_7_0; + public static final Version V_8_8_0 = new Version(8_08_00_99, TransportVersion.V_8_8_0, org.apache.lucene.util.Version.LUCENE_9_5_0); + public static final Version CURRENT = V_8_8_0; private static final NavigableMap VERSION_IDS; private static final Map VERSION_STRINGS;