Merge branch 'main' into take-date-nanos-implicit-casting-out-of-snapshot

Author: fang-xing-esql

benchmarks/src/main/java/org/elasticsearch/benchmark/exponentialhistogram/ExponentialHistogramMergeBench.java

@@ -130,7 +130,7 @@ private ExponentialHistogram asCompressedHistogram(ExponentialHistogram histogra
             CompressedExponentialHistogram.writeHistogramBytes(histoBytes, histogram.scale(), negativeBuckets, positiveBuckets);
             CompressedExponentialHistogram result = new CompressedExponentialHistogram();
             BytesRef data = histoBytes.bytes().toBytesRef();
-            result.reset(histogram.zeroBucket().zeroThreshold(), totalCount, histogram.sum(), data);
+            result.reset(histogram.zeroBucket().zeroThreshold(), totalCount, histogram.sum(), histogram.min(), data);
             return result;
         } catch (IOException e) {
             throw new RuntimeException(e);

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/ChangelogEntry.java

@@ -43,6 +43,7 @@ public class ChangelogEntry {
     private Breaking breaking;
     private Highlight highlight;
     private Deprecation deprecation;
+    private String entryOverride;
 
     private static final ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory());
 
@@ -125,6 +126,14 @@ public void setDeprecation(Deprecation deprecation) {
         this.deprecation = deprecation;
     }
 
+    public String getEntryOverride() {
+        return entryOverride;
+    }
+
+    public void setEntryOverride(String entryOverride) {
+        this.entryOverride = entryOverride;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -140,12 +149,13 @@ public boolean equals(Object o) {
             && Objects.equals(type, that.type)
             && Objects.equals(summary, that.summary)
             && Objects.equals(highlight, that.highlight)
-            && Objects.equals(breaking, that.breaking);
+            && Objects.equals(breaking, that.breaking)
+            && Objects.equals(entryOverride, that.entryOverride);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(pr, issues, area, type, summary, highlight, breaking);
+        return Objects.hash(pr, issues, area, type, summary, highlight, breaking, entryOverride);
     }
 
     @Override

build-tools-internal/src/main/resources/forbidden/jdk-signatures.txt

@@ -102,3 +102,29 @@ java.util.Collections#shuffle(java.util.List) @ Use java.util.Collections#shuffl
 
 @defaultMessage Avoid creating FilePermission objects directly, but use FilePermissionUtils instead
 java.io.FilePermission#<init>(java.lang.String,java.lang.String)
+
+@defaultMessage DocumentBuilderFactory should not be used directly. Use XmlUtils#getHardenedDocumentBuilder(java.lang.String[]) instead.
+javax.xml.parsers.DocumentBuilderFactory#newInstance()
+javax.xml.parsers.DocumentBuilderFactory#newInstance(java.lang.String, java.lang.ClassLoader)
+javax.xml.parsers.DocumentBuilderFactory#newDefaultNSInstance()
+javax.xml.parsers.DocumentBuilderFactory#newNSInstance()
+javax.xml.parsers.DocumentBuilderFactory#newNSInstance(java.lang.String, java.lang.ClassLoader)
+
+@defaultMessage TransformerFactory should not be used directly. Use XmlUtils#getHardenedXMLTransformer() instead.
+javax.xml.transform.TransformerFactory#newInstance()
+javax.xml.transform.TransformerFactory#newInstance(java.lang.String, java.lang.ClassLoader)
+
+@defaultMessage SAXParserFactory should not be used directly. Use XmlUtils#getHardenedSaxParser() instead
+javax.xml.parsers.SAXParserFactory#newInstance()
+javax.xml.parsers.SAXParserFactory#newInstance(java.lang.String, java.lang.ClassLoader)
+javax.xml.parsers.SAXParserFactory#newDefaultNSInstance()
+javax.xml.parsers.SAXParserFactory#newNSInstance()
+javax.xml.parsers.SAXParserFactory#newNSInstance(java.lang.String, java.lang.ClassLoader)
+
+@defaultMessage SchemaValidator should not be used directly. Use XmlUtils#getHardenedSchemaValidator() instead
+javax.xml.validation.SchemaFactory#newDefaultInstance()
+javax.xml.validation.SchemaFactory#newInstance(java.lang.String)
+javax.xml.validation.SchemaFactory#newInstance(java.lang.String, java.lang.String, java.lang.ClassLoader)
+
+@defaultMessage Validator should not be used directly. Use XmlUtils#getHardenedValidator() instead
+javax.xml.validation.Schema#newValidator()

build-tools-internal/src/main/resources/templates/breaking-changes.md

@@ -22,29 +22,35 @@ for(bundle in changelogBundles) {
     if (coming) {
         print "\n"
         print "```{applies_to}\n"
-        print "stack: coming ${version}\n"
+        print "stack: ga ${version}\n"
         print "```"
     }
 %>
 ## ${unqualifiedVersion} [elasticsearch-${versionForIds}-breaking-changes]
+
 <%
     if (!changelogsByTypeByArea['breaking']) {
-        print "\nNo breaking changes in this version.\n"
+        print "There are no breaking changes associated with this release.\n"
     } else {
         for (team in (changelogsByTypeByArea['breaking'] ?: [:]).keySet()) {
-            print "\n${team}:\n";
+            print "${team}:\n";
 
             for (change in changelogsByTypeByArea['breaking'][team]) {
-                print "* ${change.summary} [#${change.pr}](https://github.com/elastic/elasticsearch/pull/${change.pr})"
-                if (change.issues != null && change.issues.empty == false) {
-                    print change.issues.size() == 1 ? " (issue: " : " (issues: "
-                    print change.issues.collect { "[#${it}](https://github.com/elastic/elasticsearch/issues/${it})" }.join(", ")
-                    print ")"
+                if (!change.entryOverride) {
+                    print "* ${change.summary} [#${change.pr}](https://github.com/elastic/elasticsearch/pull/${change.pr})"
+                    if (change.issues != null && change.issues.empty == false) {
+                        print change.issues.size() == 1 ? " (issue: " : " (issues: "
+                        print change.issues.collect { "[#${it}](https://github.com/elastic/elasticsearch/issues/${it})" }.join(", ")
+                        print ")"
+                    }
+                } else {
+                    print change.entryOverride;
                 }
                 print "\n"
             }
+            print "\n"
         }
 
-        print "\n\n"
+        print "\n"
     }
 }

build-tools-internal/src/main/resources/templates/deprecations.md

@@ -26,14 +26,14 @@ for(bundle in changelogBundles) {
     if (coming) {
         print "\n"
         print "```{applies_to}\n"
-        print "stack: coming ${version}\n"
+        print "stack: ga ${version}\n"
         print "```"
     }
 %>
 ## ${unqualifiedVersion} [elasticsearch-${versionForIds}-deprecations]
 <%
     if (!changelogsByTypeByArea['deprecation']) {
-        print "\nNo deprecations in this version.\n"
+        print "\nThere are no deprecations associated with this release.\n"
     } else {
         for (team in (changelogsByTypeByArea['deprecation'] ?: [:]).keySet()) {
             print "\n${team}:\n";

build-tools-internal/src/main/resources/templates/index.md

@@ -34,7 +34,7 @@ for(bundle in changelogBundles) {
 
 if (coming) {
     print "```{applies_to}\n"
-    print "stack: coming ${version}\n"
+    print "stack: ga ${version}\n"
     print "```"
     print "\n"
 }
@@ -59,18 +59,24 @@ for (changeType in ['features-enhancements', 'fixes', 'regression']) {
     }
 %>
 ### ${ TYPE_LABELS.getOrDefault(changeType, 'No mapping for TYPE_LABELS[' + changeType + ']') } [elasticsearch-${versionForIds}-${changeType}]
+
 <% for (team in changelogsByTypeByArea[changeType].keySet()) {
-    print "\n${team}:\n";
+    print "${team}:\n";
 
     for (change in changelogsByTypeByArea[changeType][team]) {
-        print "* ${change.summary} [#${change.pr}](https://github.com/elastic/elasticsearch/pull/${change.pr})"
-        if (change.issues != null && change.issues.empty == false) {
-            print change.issues.size() == 1 ? " (issue: " : " (issues: "
-            print change.issues.collect { "[#${it}](https://github.com/elastic/elasticsearch/issues/${it})" }.join(", ")
-            print ")"
+        if (!change.entryOverride) {
+            print "* ${change.summary} [#${change.pr}](https://github.com/elastic/elasticsearch/pull/${change.pr})"
+            if (change.issues != null && change.issues.empty == false) {
+                print change.issues.size() == 1 ? " (issue: " : " (issues: "
+                print change.issues.collect { "[#${it}](https://github.com/elastic/elasticsearch/issues/${it})" }.join(", ")
+                print ")"
+            }
+        } else {
+            print change.entryOverride.trim();
         }
         print "\n"
     }
+    print "\n"
 }
 }
 print "\n"

build-tools-internal/src/test/resources/org/elasticsearch/gradle/internal/release/ReleaseNotesGeneratorTest.breaking-changes.md

@@ -13,54 +13,54 @@ If you are migrating from a version prior to version 9.0, you must first upgrade
 % ## Next version [elasticsearch-nextversion-breaking-changes]
 
 ```{applies_to}
-stack: coming 9.1.0
+stack: ga 9.1.0
 ```
 ## 9.1.0 [elasticsearch-9.1.0-breaking-changes]
 
-No breaking changes in this version.
+There are no breaking changes associated with this release.
 
 ```{applies_to}
-stack: coming 9.0.10
+stack: ga 9.0.10
 ```
 ## 9.0.10 [elasticsearch-9.0.10-breaking-changes]
 
-No breaking changes in this version.
+There are no breaking changes associated with this release.
 
 ## 9.0.9 [elasticsearch-9.0.9-breaking-changes]
 
-No breaking changes in this version.
+There are no breaking changes associated with this release.
 
 ## 9.0.8 [elasticsearch-9.0.8-breaking-changes]
 
-No breaking changes in this version.
+There are no breaking changes associated with this release.
 
 ## 9.0.7 [elasticsearch-9.0.7-breaking-changes]
 
-No breaking changes in this version.
+There are no breaking changes associated with this release.
 
 ## 9.0.6 [elasticsearch-9.0.6-breaking-changes]
 
-No breaking changes in this version.
+There are no breaking changes associated with this release.
 
 ## 9.0.5 [elasticsearch-9.0.5-breaking-changes]
 
-No breaking changes in this version.
+There are no breaking changes associated with this release.
 
 ## 9.0.4 [elasticsearch-9.0.4-breaking-changes]
 
-No breaking changes in this version.
+There are no breaking changes associated with this release.
 
 ## 9.0.3 [elasticsearch-9.0.3-breaking-changes]
 
-No breaking changes in this version.
+There are no breaking changes associated with this release.
 
 ## 9.0.2 [elasticsearch-9.0.2-breaking-changes]
 
-No breaking changes in this version.
+There are no breaking changes associated with this release.
 
 ## 9.0.1 [elasticsearch-9.0.1-breaking-changes]
 
-No breaking changes in this version.
+There are no breaking changes associated with this release.
 
 ## 9.0.0 [elasticsearch-900-breaking-changes]
 

build-tools-internal/src/test/resources/org/elasticsearch/gradle/internal/release/ReleaseNotesGeneratorTest.deprecations.md

@@ -17,38 +17,38 @@ To give you insight into what deprecated features you’re using, {{es}}:
 % ## Next version [elasticsearch-nextversion-deprecations]
 
 ```{applies_to}
-stack: coming 9.1.0
+stack: ga 9.1.0
 ```
 ## 9.1.0 [elasticsearch-9.1.0-deprecations]
 
-No deprecations in this version.
+There are no deprecations associated with this release.
 
 ```{applies_to}
-stack: coming 9.0.10
+stack: ga 9.0.10
 ```
 ## 9.0.10 [elasticsearch-9.0.10-deprecations]
 
-No deprecations in this version.
+There are no deprecations associated with this release.
 
 ## 9.0.9 [elasticsearch-9.0.9-deprecations]
 
-No deprecations in this version.
+There are no deprecations associated with this release.
 
 ## 9.0.8 [elasticsearch-9.0.8-deprecations]
 
-No deprecations in this version.
+There are no deprecations associated with this release.
 
 ## 9.0.7 [elasticsearch-9.0.7-deprecations]
 
-No deprecations in this version.
+There are no deprecations associated with this release.
 
 ## 9.0.6 [elasticsearch-9.0.6-deprecations]
 
-No deprecations in this version.
+There are no deprecations associated with this release.
 
 ## 9.0.5 [elasticsearch-9.0.5-deprecations]
 
-No deprecations in this version.
+There are no deprecations associated with this release.
 
 ## 9.0.4 [elasticsearch-9.0.4-deprecations]
 
@@ -60,16 +60,16 @@ Search:
 
 ## 9.0.3 [elasticsearch-9.0.3-deprecations]
 
-No deprecations in this version.
+There are no deprecations associated with this release.
 
 ## 9.0.2 [elasticsearch-9.0.2-deprecations]
 
-No deprecations in this version.
+There are no deprecations associated with this release.
 
 ## 9.0.1 [elasticsearch-9.0.1-deprecations]
 
-No deprecations in this version.
+There are no deprecations associated with this release.
 
 ## 9.0.0 [elasticsearch-900-deprecations]
 
-No deprecations in this version.
+There are no deprecations associated with this release.