Start new development cycle using version 2.26.0 (#3748)

Author: ppkarwasz

log4j-api/src/main/java/org/apache/logging/log4j/internal/map/UnmodifiableArrayBackedMap.java

@@ -269,10 +269,6 @@ public UnmodifiableArrayBackedMap copyAndPut(String key, String value) {
     /**
      * Creates a new instance that contains the same entries as this map, plus the
      * new entries or updated values passed in the parameters.
-     *
-     * @param key
-     * @param value
-     * @return
      */
     public UnmodifiableArrayBackedMap copyAndPutAll(Map<String, String> entriesToAdd) {
         // create a new array that can hold the maximum output size
@@ -304,10 +300,6 @@ public UnmodifiableArrayBackedMap copyAndPutAll(Map<String, String> entriesToAdd
     /**
      * Creates a new instance that contains the same entries as this map, minus the
      * entry with the specified key (if such an entry exists).
-     *
-     * @param key
-     * @param value
-     * @return
      */
     public UnmodifiableArrayBackedMap copyAndRemove(String key) {
         int indexToRemove = -1;

log4j-core/src/main/java/org/apache/logging/log4j/core/util/internal/instant/InstantPatternFormatter.java

@@ -40,7 +40,7 @@
 public interface InstantPatternFormatter extends InstantFormatter {
 
     boolean LEGACY_FORMATTERS_ENABLED =
-            "legacy".equalsIgnoreCase(PropertiesUtil.getProperties().getStringProperty("log4j2.instant.formatter"));
+            "legacy".equalsIgnoreCase(PropertiesUtil.getProperties().getStringProperty("log4j2.instantFormatter"));
 
     String getPattern();
 

pom.xml

@@ -31,7 +31,7 @@
   <parent>
     <groupId>org.apache.logging</groupId>
     <artifactId>logging-parent</artifactId>
-    <version>12.1.0</version>
+    <version>12.1.1</version>
     <relativePath />
   </parent>
 
@@ -307,11 +307,11 @@
   <properties>
 
     <!-- project version -->
-    <revision>2.25.0-SNAPSHOT</revision>
+    <revision>2.26.0-SNAPSHOT</revision>
     <!-- Versions used on the site: no snapshots! -->
-    <site-log4j-api.version>2.24.3</site-log4j-api.version>
-    <site-log4j-core.version>2.24.3</site-log4j-core.version>
-    <site-log4j-layout-template-json.version>2.24.3</site-log4j-layout-template-json.version>
+    <site-log4j-api.version>2.25.0</site-log4j-api.version>
+    <site-log4j-core.version>2.25.0</site-log4j-core.version>
+    <site-log4j-layout-template-json.version>2.25.0</site-log4j-layout-template-json.version>
 
     <!-- =================
          Common properties
@@ -325,7 +325,7 @@
          2. This value is employed in various places while creating the distribution
          To mitigate these, we define a *dummy* value here and let the CI replace it during a release.
          Hence, *DO NOT MANUALLY EDIT THIS VALUE*! -->
-    <project.build.outputTimestamp>2024-12-10T10:15:05Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-06-13T17:08:55Z</project.build.outputTimestamp>
 
     <!-- ========================
          Site-specific properties

src/changelog/.2.x.x/.release-notes.adoc.ftl

@@ -20,38 +20,6 @@
 
 <#if release.date?has_content>Release date:: ${release.date}</#if>
 
-This minor release contains bug fixes, behavioral improvements, and a fully-fledged support for the GraalVM native image generation.
-
-[#release-notes-2-25-0-graalvm]
-=== GraalVM reachability metadata
-
-Log4j Core and all its extension modules have been enriched with embedded
-https://www.graalvm.org/latest/reference-manual/native-image/metadata/[GraalVM reachability metadata].
-This allows the generation of GraalVM native images out-of-the-box without any additional steps.
-See our xref:graalvm.adoc[GraalVM guide] for details.
-
-[#release-notes-2-25-0-PL-ex]
-=== Exception handling in Pattern Layout
-
-Exception handling in xref:manual/pattern-layout.adoc[Pattern Layout] went through a major rewrite.
-This effectively helped with fixing some bugs by matching the feature parity of all exception converters.
-Some important highlights from this rewrite:
-
-* Rendered stack traces are ensured to be prefixed with a newline, which used to be a whitespace in earlier versions.
-* Switched the default exception converter from xref:manual/pattern-layout.adoc#converter-exception-extended[the extended exception converter] to xref:manual/pattern-layout.adoc#converter-exception[the plain exception converter], which is more performant.
-* The support for the `\{ansi}` option in exception converters is removed.
-
-[#release-notes-2-25-0-instant-format]
-=== Date & time formatting
-
-Historically, Log4j contains custom date & time formatting utilities for performance reasons, i.e., link:javadoc/log4j-core/org/apache/logging/log4j/core/util/datetime/FixedDateFormat.html[`FixedDateFormat`] and link:javadoc/log4j-core/org/apache/logging/log4j/core/util/datetime/FastDateFormat.html[`FastDateFormat`].
-These have been deprecated for removal in favor of Java's https://docs.oracle.com/javase/{java-target-version}/docs/api/java/time/format/DateTimeFormatter.html[`DateTimeFormatter`].
-After upgrading, if you experience any date & time formatting problems (in particular, related with the usage of `n` and `x` directives), please {logging-services-url}/support.html#issues[submit an issue ticket] – as a temporary workaround, you can set xref:manual/systemproperties.adoc#log4j2.instant.formatter[the `log4j2.instant.formatter` property] to `legacy` to switch to the old behaviour.
-
-=== ANSI support on Windows
-
-Since 2017, Windows 10 and newer have offered native support for ANSI escapes.
-The support for the outdated Jansi 1.x library has therefore been removed.
-See xref:manual/pattern-layout.adoc#jansi[ANSI styling on Windows] for more information.
+This release...
 
 <#include "../.changelog.adoc.ftl">