This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git

commit 944e2389ae502217aebfdeeef4769e884069b92b
Author: Volkan Yazıcı <[email protected]>
AuthorDate: Thu Nov 16 16:26:16 2023 +0100

    Release changelog
---
 src/changelog/.2.x.x/.release-notes.adoc.ftl       | 23 +---------
 src/changelog/2.22.0/.release-notes.adoc.ftl       | 25 ++++++++++
 src/changelog/2.22.0/.release.xml                  | 21 +++++++++
 .../1223_change_formatted_message_heuristic.xml    |  0
 .../change_basic_auth_encoding.xml                 |  0
 .../fix_MDC_pattern_converter_for_notEmpty.xml     |  0
 .../{.2.x.x => 2.22.0}/fix_bnd_api_leak.xml        |  0
 .../{.2.x.x => 2.22.0}/fix_dependency_scopes.xml   |  0
 src/changelog/{.2.x.x => 2.22.0}/fix_jlink.xml     |  0
 src/changelog/{.2.x.x => 2.22.0}/fix_manifest.xml  |  0
 ...ix_reusable_message_factory_serializability.xml |  0
 .../{.2.x.x => 2.22.0}/remove_FastDateParser.xml   |  0
 .../update_com_fasterxml_jackson_jackson_bom.xml   |  0
 .../update_com_github_luben_zstd_jni.xml           |  0
 .../update_com_google_guava_guava.xml              |  0
 .../update_io_netty_netty_bom.xml                  |  0
 ...pse_persistence_org_eclipse_persistence_jpa.xml |  0
 .../update_org_fusesource_jansi_jansi.xml          |  0
 .../{.2.x.x => 2.22.0}/update_org_mongodb_bson.xml |  0
 ...e_org_spring_framework_spring_framework_bom.xml |  0
 ...update_org_springframework_boot_spring_boot.xml |  0
 ...te_org_springframework_spring_framework_bom.xml |  0
 .../update_org_zeromq_jeromq.xml                   |  0
 src/site/_constants.adoc                           |  2 +-
 src/site/_release-notes.adoc                       |  2 +-
 src/site/_release-notes/_2.22.0.adoc               | 53 ++++++++++++++++++++++
 26 files changed, 102 insertions(+), 24 deletions(-)

diff --git a/src/changelog/.2.x.x/.release-notes.adoc.ftl 
b/src/changelog/.2.x.x/.release-notes.adoc.ftl
index 4bef52a4a9..c95aa7ad69 100644
--- a/src/changelog/.2.x.x/.release-notes.adoc.ftl
+++ b/src/changelog/.2.x.x/.release-notes.adoc.ftl
@@ -20,27 +20,6 @@
 
 <#if release.date?has_content>Release date:: ${release.date}</#if>
 
-This release primarily focuses on enhancements to our OSGi and JPMS support 
and contains several bug fixes.
-It will be the first release built and signed by the CI using the 
https://keyserver.ubuntu.com/pks/lookup?search=077E8893A6DCC33DD4A4D5B256E73BA9A0B592D0&op=index[ASF
 Logging Services Release Manager GPG key], which is shared in 
https://www.apache.org/dist/logging/KEYS[KEYS].
-
-The Log4j 2.21.0 API, as well as the other artifacts, maintains binary 
compatibility with the previous release.
-
-Apache Log4j 2.21.0 requires Java 8 to run.
-The build requires JDK 11 and generates reproducible binaries.
-
-For complete information on Apache Log4j 2, including instructions on how to 
submit bug reports, patches, get support, or suggestions for improvement, see 
http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website].
-
-=== OSGi changes
-
-All the published artifacts are OSGi bundles or fragments.
-
-This release introduces a change in the bundle symbolic names to allow them to 
function as JPMS module name: all hyphens `-` present in the bundle names of 
previous releases were replaced by dots `.`.
-
-=== JPMS changes
-
-All the published artifacts have been migrated from automatic modules to named 
JPMS modules.
-All packages marked as private in the Javadoc are not exported.
-
-The module name of four bridges (`log4j-slf4j-impl`, `log4j-slf4j2-impl`, 
`log4j-to-jul` and `log4j-to-slf4j`) have been changed to adhere to the same 
convention as the OSGi bundle names.
+This releases contains ...
 
 <#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/2.22.0/.release-notes.adoc.ftl 
b/src/changelog/2.22.0/.release-notes.adoc.ftl
new file mode 100644
index 0000000000..f94dd3fd43
--- /dev/null
+++ b/src/changelog/2.22.0/.release-notes.adoc.ftl
@@ -0,0 +1,25 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+[#release-notes-${release.version?replace("[^a-zA-Z0-9]", "-", "r")}]
+== ${release.version}
+
+<#if release.date?has_content>Release date:: ${release.date}</#if>
+
+This releases contains bug fixes addressing issues in the JPMS & OSGi 
infrastructure overhauled in `2.21.0`, dependency updates, and some other minor 
fixes and improvements.
+
+<#include "../.changelog.adoc.ftl">
diff --git a/src/changelog/2.22.0/.release.xml 
b/src/changelog/2.22.0/.release.xml
new file mode 100644
index 0000000000..fd02b4bec7
--- /dev/null
+++ b/src/changelog/2.22.0/.release.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to you under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<release xmlns="http://logging.apache.org/log4j/changelog";
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+         xsi:schemaLocation="http://logging.apache.org/log4j/changelog 
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+         date="2023-11-16" version="2.22.0"/>
diff --git a/src/changelog/.2.x.x/1223_change_formatted_message_heuristic.xml 
b/src/changelog/2.22.0/1223_change_formatted_message_heuristic.xml
similarity index 100%
rename from src/changelog/.2.x.x/1223_change_formatted_message_heuristic.xml
rename to src/changelog/2.22.0/1223_change_formatted_message_heuristic.xml
diff --git a/src/changelog/.2.x.x/change_basic_auth_encoding.xml 
b/src/changelog/2.22.0/change_basic_auth_encoding.xml
similarity index 100%
rename from src/changelog/.2.x.x/change_basic_auth_encoding.xml
rename to src/changelog/2.22.0/change_basic_auth_encoding.xml
diff --git a/src/changelog/.2.x.x/fix_MDC_pattern_converter_for_notEmpty.xml 
b/src/changelog/2.22.0/fix_MDC_pattern_converter_for_notEmpty.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_MDC_pattern_converter_for_notEmpty.xml
rename to src/changelog/2.22.0/fix_MDC_pattern_converter_for_notEmpty.xml
diff --git a/src/changelog/.2.x.x/fix_bnd_api_leak.xml 
b/src/changelog/2.22.0/fix_bnd_api_leak.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_bnd_api_leak.xml
rename to src/changelog/2.22.0/fix_bnd_api_leak.xml
diff --git a/src/changelog/.2.x.x/fix_dependency_scopes.xml 
b/src/changelog/2.22.0/fix_dependency_scopes.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_dependency_scopes.xml
rename to src/changelog/2.22.0/fix_dependency_scopes.xml
diff --git a/src/changelog/.2.x.x/fix_jlink.xml 
b/src/changelog/2.22.0/fix_jlink.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_jlink.xml
rename to src/changelog/2.22.0/fix_jlink.xml
diff --git a/src/changelog/.2.x.x/fix_manifest.xml 
b/src/changelog/2.22.0/fix_manifest.xml
similarity index 100%
rename from src/changelog/.2.x.x/fix_manifest.xml
rename to src/changelog/2.22.0/fix_manifest.xml
diff --git 
a/src/changelog/.2.x.x/fix_reusable_message_factory_serializability.xml 
b/src/changelog/2.22.0/fix_reusable_message_factory_serializability.xml
similarity index 100%
rename from 
src/changelog/.2.x.x/fix_reusable_message_factory_serializability.xml
rename to src/changelog/2.22.0/fix_reusable_message_factory_serializability.xml
diff --git a/src/changelog/.2.x.x/remove_FastDateParser.xml 
b/src/changelog/2.22.0/remove_FastDateParser.xml
similarity index 100%
rename from src/changelog/.2.x.x/remove_FastDateParser.xml
rename to src/changelog/2.22.0/remove_FastDateParser.xml
diff --git a/src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml 
b/src/changelog/2.22.0/update_com_fasterxml_jackson_jackson_bom.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_com_fasterxml_jackson_jackson_bom.xml
rename to src/changelog/2.22.0/update_com_fasterxml_jackson_jackson_bom.xml
diff --git a/src/changelog/.2.x.x/update_com_github_luben_zstd_jni.xml 
b/src/changelog/2.22.0/update_com_github_luben_zstd_jni.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_com_github_luben_zstd_jni.xml
rename to src/changelog/2.22.0/update_com_github_luben_zstd_jni.xml
diff --git a/src/changelog/.2.x.x/update_com_google_guava_guava.xml 
b/src/changelog/2.22.0/update_com_google_guava_guava.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_com_google_guava_guava.xml
rename to src/changelog/2.22.0/update_com_google_guava_guava.xml
diff --git a/src/changelog/.2.x.x/update_io_netty_netty_bom.xml 
b/src/changelog/2.22.0/update_io_netty_netty_bom.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_io_netty_netty_bom.xml
rename to src/changelog/2.22.0/update_io_netty_netty_bom.xml
diff --git 
a/src/changelog/.2.x.x/update_org_eclipse_persistence_org_eclipse_persistence_jpa.xml
 
b/src/changelog/2.22.0/update_org_eclipse_persistence_org_eclipse_persistence_jpa.xml
similarity index 100%
rename from 
src/changelog/.2.x.x/update_org_eclipse_persistence_org_eclipse_persistence_jpa.xml
rename to 
src/changelog/2.22.0/update_org_eclipse_persistence_org_eclipse_persistence_jpa.xml
diff --git a/src/changelog/.2.x.x/update_org_fusesource_jansi_jansi.xml 
b/src/changelog/2.22.0/update_org_fusesource_jansi_jansi.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_fusesource_jansi_jansi.xml
rename to src/changelog/2.22.0/update_org_fusesource_jansi_jansi.xml
diff --git a/src/changelog/.2.x.x/update_org_mongodb_bson.xml 
b/src/changelog/2.22.0/update_org_mongodb_bson.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_mongodb_bson.xml
rename to src/changelog/2.22.0/update_org_mongodb_bson.xml
diff --git 
a/src/changelog/.2.x.x/update_org_spring_framework_spring_framework_bom.xml 
b/src/changelog/2.22.0/update_org_spring_framework_spring_framework_bom.xml
similarity index 100%
rename from 
src/changelog/.2.x.x/update_org_spring_framework_spring_framework_bom.xml
rename to 
src/changelog/2.22.0/update_org_spring_framework_spring_framework_bom.xml
diff --git 
a/src/changelog/.2.x.x/update_org_springframework_boot_spring_boot.xml 
b/src/changelog/2.22.0/update_org_springframework_boot_spring_boot.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_springframework_boot_spring_boot.xml
rename to src/changelog/2.22.0/update_org_springframework_boot_spring_boot.xml
diff --git 
a/src/changelog/.2.x.x/update_org_springframework_spring_framework_bom.xml 
b/src/changelog/2.22.0/update_org_springframework_spring_framework_bom.xml
similarity index 100%
rename from 
src/changelog/.2.x.x/update_org_springframework_spring_framework_bom.xml
rename to 
src/changelog/2.22.0/update_org_springframework_spring_framework_bom.xml
diff --git a/src/changelog/.2.x.x/update_org_zeromq_jeromq.xml 
b/src/changelog/2.22.0/update_org_zeromq_jeromq.xml
similarity index 100%
rename from src/changelog/.2.x.x/update_org_zeromq_jeromq.xml
rename to src/changelog/2.22.0/update_org_zeromq_jeromq.xml
diff --git a/src/site/_constants.adoc b/src/site/_constants.adoc
index bc3768c83f..dfcbad0988 100644
--- a/src/site/_constants.adoc
+++ b/src/site/_constants.adoc
@@ -34,7 +34,7 @@
 ////
 
 :project-github-url: https://github.com/apache/logging-log4j2
-:project-version: 2.22.0-SNAPSHOT
+:project-version: 2.22.0
 :project-name: Log4j
 :project-id: log4j
 :java-target-version: 8
diff --git a/src/site/_release-notes.adoc b/src/site/_release-notes.adoc
index 089c66dd4e..27a0fdd6e4 100644
--- a/src/site/_release-notes.adoc
+++ b/src/site/_release-notes.adoc
@@ -36,7 +36,7 @@
 [#release-notes]
 = Release Notes
 
-include::_release-notes/_2.x.x.adoc[]
+include::_release-notes/_2.22.0.adoc[]
 include::_release-notes/_2.21.1.adoc[]
 include::_release-notes/_2.21.0.adoc[]
 include::_release-notes/_2.20.0.adoc[]
diff --git a/src/site/_release-notes/_2.22.0.adoc 
b/src/site/_release-notes/_2.22.0.adoc
new file mode 100644
index 0000000000..b82a29ffc2
--- /dev/null
+++ b/src/site/_release-notes/_2.22.0.adoc
@@ -0,0 +1,53 @@
+////
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         https://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+////
+
+[#release-notes-2-22-0]
+== 2.22.0
+
+Release date:: 2023-11-16
+
+This releases contains bug fixes addressing issues in the JPMS & OSGi 
infrastructure overhauled in `2.21.0`, dependency updates, and some other minor 
fixes and improvements.
+
+
+=== Changed
+
+* Change the order of evaluation of `FormattedMessage` formatters. Messages 
are evaluated using `java.util.Format` only if they don't comply to the 
`java.text.MessageFormat` or `ParameterizedMessage` format. 
(https://github.com/apache/logging-log4j2/issues/1223[1223])
+* Change default encoding of HTTP Basic Authentication to UTF-8 and add 
`log4j2.configurationAuthorizationEncoding` property to overwrite it. 
(https://github.com/apache/logging-log4j2/issues/1970[1970])
+* Update `com.fasterxml.jackson:jackson-bom` to version `2.16.0` 
(https://github.com/apache/logging-log4j2/pull/1974[1974])
+* Update `com.github.luben:zstd-jni` to version `1.5.5-10` 
(https://github.com/apache/logging-log4j2/pull/1940[1940])
+* Update `com.google.guava:guava` to version `32.1.3-jre` 
(https://github.com/apache/logging-log4j2/pull/1875[1875])
+* Update `io.netty:netty-bom` to version `4.1.101.Final` 
(https://github.com/apache/logging-log4j2/pull/1960[1960])
+* Update `org.eclipse.persistence:org.eclipse.persistence.jpa` to version 
`2.7.13` (https://github.com/apache/logging-log4j2/pull/1900[1900])
+* Update `org.fusesource.jansi:jansi` to version `2.4.1` 
(https://github.com/apache/logging-log4j2/pull/1907[1907])
+* Update `org.mongodb:bson` to version `4.11.1` 
(https://github.com/apache/logging-log4j2/pull/1957[1957])
+* Update `org.springframework:spring-framework-bom` to version `5.3.30`
+* Update `org.springframework.boot:spring-boot` to version `2.7.17` 
(https://github.com/apache/logging-log4j2/pull/1874[1874])
+* Update `org.springframework:spring-framework-bom` to version `5.3.31` 
(https://github.com/apache/logging-log4j2/pull/1973[1973])
+* Update `org.zeromq:jeromq` to version `0.5.4` 
(https://github.com/apache/logging-log4j2/pull/1878[1878])
+
+=== Removed
+
+* Removed unused `FastDateParser` which was causing unnecessary heap overhead 
(https://issues.apache.org/jira/browse/LOG4J2-3672[LOG4J2-3672], 
https://github.com/apache/logging-log4j2/pull/1848[1848])
+
+=== Fixed
+
+* Fix MDC pattern converter causing issues for `%notEmpty` 
(https://github.com/apache/logging-log4j2/issues/1922[1922])
+* Export missing OSGi & JPMS modules in `log4j-layout-template-json` and 
`log4j-1.2-api` (https://github.com/apache/logging-log4j2/issues/1895[1895])
+* Fix `spring-test` dependency scope change 
(https://issues.apache.org/jira/browse/LOG4J2-3675[LOG4J2-3675])
+* Fix JPMS descriptors causing `jlink` issues 
(https://github.com/apache/logging-log4j2/issues/1896[1896])
+* Add missing `Implementation-` and `Specification-` entries to `MANIFEST.MF` 
(implemented by `logging-parent` version `10.3.0` update) 
(https://github.com/apache/logging-log4j2/issues/1923[1923])
+* Fix `NotSerializableException` thrown when `Logger` is serialized with a 
`ReusableMessageFactory` 
(https://github.com/apache/logging-log4j2/issues/1884[1884])

Reply via email to