elastic · craigtaverner · Jun 30, 2022 · Jun 3, 2022 · Jun 3, 2022 · Jun 9, 2022
diff --git a/...nal/src/main/java/org/elasticsearch/gradle/internal/release/BreakingChangesGenerator.java b/...nal/src/main/java/org/elasticsearch/gradle/internal/release/BreakingChangesGenerator.java
@@ -74,6 +74,7 @@ static String generateMigrationFile(QualifiedVersion version, String template, L
         bindings.put("deprecationsByNotabilityByArea", deprecationsByNotabilityByArea);
         bindings.put("isElasticsearchSnapshot", version.isSnapshot());
         bindings.put("majorDotMinor", version.major() + "." + version.minor());
+        bindings.put("majorDotMinorDotRevision", version.major() + "." + version.minor() + "." + version.revision());
         bindings.put("majorMinor", String.valueOf(version.major()) + version.minor());
         bindings.put("nextMajor", (version.major() + 1) + ".0");
         bindings.put("version", version);

diff --git a/...ools-internal/src/main/java/org/elasticsearch/gradle/internal/release/ChangelogEntry.java b/...ools-internal/src/main/java/org/elasticsearch/gradle/internal/release/ChangelogEntry.java
@@ -99,6 +99,7 @@ public Highlight getHighlight() {
 
     public void setHighlight(Highlight highlight) {
         this.highlight = highlight;
+        if (this.highlight != null) this.highlight.pr = this.pr;
     }
 
     public Breaking getBreaking() {
@@ -160,6 +161,7 @@ public static class Highlight {
         private boolean notable;
         private String title;
         private String body;
+        private Integer pr;
 
         public boolean isNotable() {
             return notable;
@@ -189,6 +191,10 @@ public String getAnchor() {
             return generatedAnchor(this.title);
         }
 
+        public Integer getPr() {
+            return pr;
+        }
+
         @Override
         public boolean equals(Object o) {
             if (this == o) {

diff --git a/...l/src/main/java/org/elasticsearch/gradle/internal/release/ReleaseHighlightsGenerator.java b/...l/src/main/java/org/elasticsearch/gradle/internal/release/ReleaseHighlightsGenerator.java
@@ -17,6 +17,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -50,6 +51,7 @@ static String generateFile(QualifiedVersion version, String template, List<Chang
         final Map<Boolean, List<ChangelogEntry.Highlight>> groupedHighlights = entries.stream()
             .map(ChangelogEntry::getHighlight)
             .filter(Objects::nonNull)
+            .sorted(Comparator.comparingInt(ChangelogEntry.Highlight::getPr))
             .collect(Collectors.groupingBy(ChangelogEntry.Highlight::isNotable, Collectors.toList()));
 
         final List<ChangelogEntry.Highlight> notableHighlights = groupedHighlights.getOrDefault(true, List.of());

diff --git a/build-tools-internal/src/main/resources/templates/breaking-changes.asciidoc b/build-tools-internal/src/main/resources/templates/breaking-changes.asciidoc
@@ -9,14 +9,16 @@ your application to {es} ${majorDotMinor}.
 
 See also <<release-highlights>> and <<es-release-notes>>.
 <% if (isElasticsearchSnapshot) { %>
-coming::[${version}]
+coming::[${majorDotMinorDotRevision}]
 <% } %>
 
 [discrete]
 [[breaking-changes-${majorDotMinor}]]
 === Breaking changes
 <% if (breakingByNotabilityByArea.isEmpty()) { %>
+// tag::notable-breaking-changes[]
 There are no breaking changes in {es} ${majorDotMinor}.
+// end::notable-breaking-changes[]
 <% } else { %>
 The following changes in {es} ${majorDotMinor} might affect your applications
 and prevent them from operating normally.

diff --git a/build-tools-internal/src/main/resources/templates/release-highlights.asciidoc b/build-tools-internal/src/main/resources/templates/release-highlights.asciidoc
@@ -32,14 +32,14 @@ if (notableHighlights.isEmpty()) { %>
 <% for (highlight in notableHighlights) { %>
 [discrete]
 [[${ highlight.anchor }]]
-=== ${highlight.title}
+=== {es-pull}${highlight.pr}[${highlight.title}]
 ${highlight.body.trim()}
 <% } %>
 // end::notable-highlights[]
 <% } %>
 <% for (highlight in nonNotableHighlights) { %>
 [discrete]
 [[${ highlight.anchor }]]
-=== ${highlight.title}
+=== {es-pull}${highlight.pr}[${highlight.title}]
 ${highlight.body.trim()}
 <% } %>
diff --git a/...c/test/java/org/elasticsearch/gradle/internal/release/ReleaseHighlightsGeneratorTest.java b/...c/test/java/org/elasticsearch/gradle/internal/release/ReleaseHighlightsGeneratorTest.java
@@ -60,31 +60,24 @@ public void generateFile_rendersCorrectMarkup() throws Exception {
     }
 
     private List<ChangelogEntry> getEntries() {
-        ChangelogEntry entry1 = new ChangelogEntry();
-        ChangelogEntry.Highlight highlight1 = new ChangelogEntry.Highlight();
-        entry1.setHighlight(highlight1);
-
-        highlight1.setNotable(true);
-        highlight1.setTitle("Notable release highlight number 1");
-        highlight1.setBody("Notable release body number 1");
-
-        ChangelogEntry entry2 = new ChangelogEntry();
-        ChangelogEntry.Highlight highlight2 = new ChangelogEntry.Highlight();
-        entry2.setHighlight(highlight2);
-
-        highlight2.setNotable(true);
-        highlight2.setTitle("Notable release highlight number 2");
-        highlight2.setBody("Notable release body number 2");
+        ChangelogEntry entry1 = makeChangelogEntry(1, true);
+        ChangelogEntry entry2 = makeChangelogEntry(2, true);
+        ChangelogEntry entry3 = makeChangelogEntry(3, false);
+        // Return unordered list, to test correct re-ordering
+        return List.of(entry2, entry1, entry3);
+    }
 
-        ChangelogEntry entry3 = new ChangelogEntry();
-        ChangelogEntry.Highlight highlight3 = new ChangelogEntry.Highlight();
-        entry3.setHighlight(highlight3);
+    private ChangelogEntry makeChangelogEntry(int pr, boolean notable) {
+        ChangelogEntry entry = new ChangelogEntry();
+        entry.setPr(pr);
+        ChangelogEntry.Highlight highlight = new ChangelogEntry.Highlight();
+        entry.setHighlight(highlight);
 
-        highlight3.setNotable(false);
-        highlight3.setTitle("Notable release highlight number 3");
-        highlight3.setBody("Notable release body number 3");
+        highlight.setNotable(notable);
+        highlight.setTitle("Notable release highlight number " + pr);
+        highlight.setBody("Notable release body number " + pr);
 
-        return List.of(entry1, entry2, entry3);
+        return entry;
     }
 
     private String getResource(String name) throws Exception {

diff --git a/...le/internal/release/BreakingChangesGeneratorTest.generateMigrationFile.asciidoc b/...le/internal/release/BreakingChangesGeneratorTest.generateMigrationFile.asciidoc
@@ -9,7 +9,7 @@ your application to {es} 8.4.
 
 See also <<release-highlights>> and <<es-release-notes>>.
 
-coming::[8.4.0-SNAPSHOT]
+coming::[8.4.0]
 
 
 [discrete]

diff --git a/...ch/gradle/internal/release/ReleaseHighlightsGeneratorTest.generateFile.asciidoc b/...ch/gradle/internal/release/ReleaseHighlightsGeneratorTest.generateFile.asciidoc
@@ -21,19 +21,19 @@ Other versions:
 
 [discrete]
 [[notable_release_highlight_number_1]]
-=== Notable release highlight number 1
+=== {es-pull}1[Notable release highlight number 1]
 Notable release body number 1
 
 [discrete]
 [[notable_release_highlight_number_2]]
-=== Notable release highlight number 2
+=== {es-pull}2[Notable release highlight number 2]
 Notable release body number 2
 
 // end::notable-highlights[]
 
 
 [discrete]
 [[notable_release_highlight_number_3]]
-=== Notable release highlight number 3
+=== {es-pull}3[Notable release highlight number 3]
 Notable release body number 3
 
diff --git a/docs/changelog/86227.yaml b/docs/changelog/86227.yaml
diff --git a/docs/changelog/86852.yaml b/docs/changelog/86852.yaml
diff --git a/docs/reference/migration/index.asciidoc b/docs/reference/migration/index.asciidoc
@@ -1,9 +1,13 @@
 include::migration_intro.asciidoc[]
 
-* <<migrating-8.1,Migrating to 8.2>>
+* <<migrating-8.4,Migrating to 8.4>>
+* <<migrating-8.3,Migrating to 8.3>>
+* <<migrating-8.2,Migrating to 8.2>>
 * <<migrating-8.1,Migrating to 8.1>>
 * <<migrating-8.0,Migrating to 8.0>>
 
+include::migrate_8_4.asciidoc[]
+include::migrate_8_3.asciidoc[]
 include::migrate_8_2.asciidoc[]
 include::migrate_8_1.asciidoc[]
 include::migrate_8_0.asciidoc[]

diff --git a/docs/reference/migration/migrate_8_3.asciidoc b/docs/reference/migration/migrate_8_3.asciidoc
@@ -0,0 +1,64 @@
+[[migrating-8.3]]
+== Migrating to 8.3
+++++
+<titleabbrev>8.3</titleabbrev>
+++++
+
+This section discusses the changes that you need to be aware of when migrating
+your application to {es} 8.3.
+
+See also <<release-highlights>> and <<es-release-notes>>.
+
+coming::[8.3.0-SNAPSHOT]
+
+
+
+[discrete]
+[[breaking-changes-8.3]]
+=== Breaking changes
+
+There are no breaking changes in {es} 8.3.
+
+
+
+[discrete]
+[[deprecated-8.3]]
+=== Deprecations
+
+The following functionality has been deprecated in {es} 8.3
+and will be removed in a future version.
+While this won't have an immediate impact on your applications,
+we strongly encourage you take the described steps to update your code
+after upgrading to 8.3.
+
+To find out if you are using any deprecated functionality,
+enable <<deprecation-logging, deprecation logging>>.
+
+
+[discrete]
+[[deprecations_83_cluster_and_node_setting]]
+==== Cluster and node setting deprecations
+
+[[configuring_bind_dn_in_an_ldap_or_active_directory_ad_realm_without_corresponding_bind_password_deprecated]]
+.Configuring a bind DN in an LDAP or Active Directory (AD) realm without a corresponding bind password is deprecated
+[%collapsible]
+====
+*Details* +
+For LDAP or AD authentication realms, setting a bind DN (via the
+`xpack.security.authc.realms.ldap.*.bind_dn` realm setting) without a
+bind password is a misconfiguration that may prevent successful
+authentication to the node. In the next major release, nodes will fail
+to start if a bind DN is specified without a password.
+
+*Impact* +
+If you have a bind DN configured for an LDAP or AD authentication
+realm, set a bind password for {ref}/ldap-realm.html#ldap-realm-configuration[LDAP]
+or {ref}/active-directory-realm.html#ad-realm-configuration[Active Directory].
+Configuring a bind DN without a password generates a warning in the
+deprecation logs.
+
+*Note:* This deprecation only applies if your current LDAP or AD
+configuration specifies a bind DN without a password. This scenario is
+unlikely, but might impact a small subset of users.
+====
+
diff --git a/docs/reference/migration/migrate_8_4.asciidoc b/docs/reference/migration/migrate_8_4.asciidoc
@@ -0,0 +1,22 @@
+[[migrating-8.4]]
+== Migrating to 8.4
+++++
+<titleabbrev>8.4</titleabbrev>
+++++
+
+This section discusses the changes that you need to be aware of when migrating
+your application to {es} 8.4.
+
+See also <<release-highlights>> and <<es-release-notes>>.
+
+coming::[8.4.0]
+
+
+[discrete]
+[[breaking-changes-8.4]]
+=== Breaking changes
+
+// tag::notable-breaking-changes[]
+There are no breaking changes in {es} 8.4.
+// end::notable-breaking-changes[]
+
diff --git a/docs/reference/release-notes.asciidoc b/docs/reference/release-notes.asciidoc
@@ -6,6 +6,8 @@
 
 This section summarizes the changes in each release.
 
+* <<release-notes-8.4.0>>
+* <<release-notes-8.3.0>>
 * <<release-notes-8.2.3>>
 * <<release-notes-8.2.2>>
 * <<release-notes-8.2.1>>
@@ -24,6 +26,8 @@ This section summarizes the changes in each release.
 
 --
 
+include::release-notes/8.4.0.asciidoc[]
+include::release-notes/8.3.0.asciidoc[]
 include::release-notes/8.2.3.asciidoc[]
 include::release-notes/8.2.2.asciidoc[]
 include::release-notes/8.2.1.asciidoc[]