This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new e443b03634 Prepare for release.
e443b03634 is described below
commit e443b03634084d2df4eecf12de383ebc34e92ec1
Author: Ralph Goers <[email protected]>
AuthorDate: Fri Feb 17 15:32:19 2023 -0700
Prepare for release.
---
RELEASE-NOTES.md | 71 ++++++++++++++++++++++
log4j-distribution/pom.xml | 25 ++++++++
pom.xml | 7 +++
src/changelog/.2.x.x/.changelog.adoc.ftl | 22 -------
src/changelog/2.20.0/.changelog.adoc.ftl | 36 +++++++++++
src/changelog/2.20.0/.release.xml | 21 +++++++
.../1166_simplify_site_generation.xml | 0
.../1172_switch_from_jira_to_github_issues.xml | 0
.../1193_remove_liquibase_log4j2_module.xml | 0
.../{.2.x.x => 2.20.0}/1197_preserve_location.xml | 0
.../1202_disableAnsi_spurious_warning.xml | 0
.../1214_fix_stacktrace_order.xml | 0
.../1274_fix_RewriteAppender_requiresLocation.xml | 0
.../1277-replace_regexp_in_Rfc5424Layout.xml | 0
...J2-1631_Honor-timezone-in-file-name-pattern.xml | 0
...va_sql_Time_object_formatting_in_MapMessage.xml | 0
...imestamp_to_ProducerRecord_in_KafkaAppender.xml | 0
...ernLayout_abrreviate_all_except_2_rightmost.xml | 0
.../LOG4J2-3357_Fix_CronTriggeringPolicy.xml | 0
...ect_default_to_not_include_AsyncRootLoggers.xml | 0
.../LOG4J2-3554_switch_to_Eclipse_Angus.xml | 0
...Lazily_evaluate_SLF4J_LogEventBuilder_level.xml | 0
...Core_as_runtime_dep_for_SLF4J-to-LOG4J2-API.xml | 0
.../LOG4J2-3615_Fix_OSGI_API_leak.xml | 0
...21_Fix_priority_of_legacy_system_properties.xml | 0
...atch_unchecked_exception_from_ServiceLoader.xml | 0
.../LOG4J2-3628_New_changelog_infra.xml | 0
..._Configurator_setLevel_for_internal_classes.xml | 0
...Fix_level_propagation_in_Log4jBridgeHandler.xml | 0
...OG4J2-3642_disable_OSGI_locator_if_not_OSGI.xml | 0
...ingFileAppender_DateLookup_use_current_time.xml | 0
...3644_Deprecate_package_scanning_for_plugins.xml | 0
...645_improve_logbuilder_traceEntry_traceExit.xml | 0
...dd_support_for_global_filters_to_LogBuilder.xml | 0
34 files changed, 160 insertions(+), 22 deletions(-)
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
new file mode 100644
index 0000000000..a5c024d0f1
--- /dev/null
+++ b/RELEASE-NOTES.md
@@ -0,0 +1,71 @@
+<!---
+ 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 2.20.0 (2023-02-17)
+
+This release primarily contains bug fixes and minor enhancements.
+
+Due to a break in compatibility in the SLF4J binding, Log4j now ships with two
versions of the SLF4J to Log4j adapters. `log4j-slf4j-impl` should be used with
SLF4J 1.7.x and earlier and `log4j-slf4j18-impl` should be used with SLF4J
1.8.x and later. SLF4J-2.0.0 alpha releases are not fully supported. See
[LOG4J2-2975](https://issues.apache.org/jira/browse/LOG4J2-2975) and
[SLF4J-511](https://jira.qos.ch/browse/SLF4J-511).
+
+The Log4j 2.19.0 API, as well as many core components, maintains binary
compatibility with previous releases.
+
+Apache Log4j 2.19.0 requires a minimum of Java 8 to build and run. Log4j
2.12.4 is the last release to support Java 7. Log4j 2.3.2 is the last release
to support Java 6. Java 6 and Java 7 are no longer supported by the Log4j team.
+
+For complete information on Apache Log4j 2, including instructions on how to
submit bug reports, patches, or suggestions for improvement, see [the Apache
Log4j 2 website](http://logging.apache.org/log4j/2.x/).
+
+## Changes
+
+### Added
+* Add support for timezones in `RollingFileAppender` date pattern (for
[LOG4J2-1631](https://issues.apache.org/jira/browse/LOG4J2-1631) by Piotr P.
Karwasz, Danas Mikelinskas)
+* Add `LogEvent` timestamp to `ProducerRecord` in `KafkaAppender` (for
[LOG4J2-2678](https://issues.apache.org/jira/browse/LOG4J2-2678) by Piotr P.
Karwasz, Federico D’Ambrosio)
+* Add `PatternLayout` support for abbreviating the name of all logger
components except the 2 rightmost (for
[LOG4J2-2785](https://issues.apache.org/jira/browse/LOG4J2-2785) by Ralph
Goers, Markus Spann)
+* Removes internal field that leaked into public API. (for
[LOG4J2-3615](https://issues.apache.org/jira/browse/LOG4J2-3615) by Piotr P.
Karwasz)
+* Add a `LogBuilder#logAndGet()` method to emulate the `Logger#traceEntry`
method. (for [LOG4J2-3645](https://issues.apache.org/jira/browse/LOG4J2-3645)
by Piotr P. Karwasz)
+
+### Changed
+* Simplify site generation (for
[1166](https://github.com/apache/logging-log4j2/pull/1166) by Volkan Yazıcı
+* Switch the issue tracker from
[JIRA](https://issues.apache.org/jira/browse/LOG4J2) to [GitHub
Issues](https://github.com/apache/logging-log4j2/issues) (for
[1172](https://github.com/apache/logging-log4j2/pull/1172) by Volkan Yazıcı)
+* Remove liquibase-log4j2 maven module (for
[1193](https://github.com/apache/logging-log4j2/pull/1193) by StevenMassaro)
+* Fix order of stacktrace elements, that causes cache misses in
`ThrowableProxyHelper`. (for
[1214](https://github.com/apache/logging-log4j2/pull/1214) by `alex-dubrouski`,
Piotr P. Karwasz)
+* Switch from `com.sun.mail` to Eclipse Angus. (for
[LOG4J2-3554](https://issues.apache.org/jira/browse/LOG4J2-3554) by Oleh
Astappiev, Piotr P. Karwasz)
+* Add Log4j2 Core as default runtime dependency of the SLF4J2-to-Log4j2 API
bridge. (for [LOG4J2-3601](https://issues.apache.org/jira/browse/LOG4J2-3601)
by `afs`, Piotr P. Karwasz)
+* Replace `maven-changes-plugin` with a custom changelog implementation (for
[LOG4J2-3628](https://issues.apache.org/jira/browse/LOG4J2-3628) by Volkan
Yazıcı)
+
+### Deprecated
+* Deprecate support for package scanning for plugins (for
[LOG4J2-3644](https://issues.apache.org/jira/browse/LOG4J2-3644) by Ralph Goers)
+
+### Fixed
+* Copy programmatically supplied location even if `includeLocation="false"`.
(for [1197](https://github.com/apache/logging-log4j2/pull/1197) by Piotr P.
Karwasz)
+* Eliminate status logger warning, when `disableAnsi` or `noConsoleNoAnsi`
is used the style and highlight patterns. (for
[1202](https://github.com/apache/logging-log4j2/pull/1202) by `wleese`, Piotr
P. Karwasz)
+* Fix detection of location requirements in `RewriteAppender`. (for
[1274](https://github.com/apache/logging-log4j2/pull/1274) by `amirhadadi`,
Piotr P. Karwasz)
+* Replace regex with manual code to escape characters in Rfc5424Layout. (for
[1277](https://github.com/apache/logging-log4j2/pull/1277) by `adwsingh`)
+* Fix `java.sql.Time` object formatting in `MapMessage` (for
[LOG4J2-2297](https://issues.apache.org/jira/browse/LOG4J2-2297) by Ralph Goers)
+* Fix previous fire time computation in `CronTriggeringPolicy` (for
[LOG4J2-3357](https://issues.apache.org/jira/browse/LOG4J2-3357) by Ralph Goers)
+* Correct default to not include location for `AsyncRootLogger`s (for
[LOG4J2-3487](https://issues.apache.org/jira/browse/LOG4J2-3487) by Ralph
Goers, Dave Messink)
+* Lazily evaluate the level of a SLF4J `LogEventBuilder` (for
[LOG4J2-3598](https://issues.apache.org/jira/browse/LOG4J2-3598) by Piotr P.
Karwasz)
+* Fixes priority of Legacy system properties, which are now back to having
higher priority than Environment variables. (for
[LOG4J2-3615](https://issues.apache.org/jira/browse/LOG4J2-3621) by `adwsingh`,
Piotr P. Karwasz)
+* Protects `ServiceLoaderUtil` from unchecked `ServiceLoader` exceptions.
(for [LOG4J2-3624](https://issues.apache.org/jira/browse/LOG4J2-3624) by Piotr
P. Karwasz)
+* Fix `Configurator#setLevel` for internal classes (for
[LOG4J2-3631](https://issues.apache.org/jira/browse/LOG4J2-3631) by Piotr P.
Karwasz, Jeff Thomas)
+* Fix level propagation in `Log4jBridgeHandler` (for
[LOG4J2-3634](https://issues.apache.org/jira/browse/LOG4J2-3634) by Piotr P.
Karwasz, Marcel Koch)
+* Disable `OsgiServiceLocator` if not running in OSGI container. (for
[LOG4J2-3642](https://issues.apache.org/jira/browse/LOG4J2-3642) by `adwsingh`,
Piotr P. Karwasz)
+* When using a Date Lookup in the file pattern the current time should be
used. (for [LOG4J2-3643](https://issues.apache.org/jira/browse/LOG4J2-3643) by
Ralph Goers)
+* Fixed `LogBuilder` filtering in the presence of global filters. (for
[LOG4J2-3647](https://issues.apache.org/jira/browse/LOG4J2-3647) by Piotr P.
Karwasz)
+
+* * *
+
+Copyright © 1999-2023 [The Apache Software
Foundation](https://www.apache.org). All Rights Reserved.
+Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, and the
Apache Logging project logo are trademarks of The Apache Software Foundation.
\ No newline at end of file
diff --git a/log4j-distribution/pom.xml b/log4j-distribution/pom.xml
index 70938c8870..18e24fe7b4 100644
--- a/log4j-distribution/pom.xml
+++ b/log4j-distribution/pom.xml
@@ -30,6 +30,7 @@
<maven.deploy.skip>true</maven.deploy.skip>
<maven.install.skip>true</maven.install.skip>
<maven.test.skip>true</maven.test.skip>
+ <spotless.check.skip>true</spotless.check.skip>
</properties>
<dependencies>
<dependency>
@@ -284,12 +285,24 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -317,12 +330,24 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-spring-cloud-config-client</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-spring-cloud-config-client</artifactId>
<version>${project.version}</version>
<classifier>sources</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
diff --git a/pom.xml b/pom.xml
index 8c4fd41da3..15a1a38331 100644
--- a/pom.xml
+++ b/pom.xml
@@ -344,6 +344,7 @@
<hamcrest.version>2.2</hamcrest.version>
<HdrHistogram.version>2.1.12</HdrHistogram.version>
<hsqldb.version>2.5.2</hsqldb.version>
+ <httpclient.version>4.5.13</httpclient.version>
<icu4j.version>72.1</icu4j.version>
<jackson-bom.version>2.14.1</jackson-bom.version>
<!-- Override the version in Jakarta EE 9 BOM: -->
@@ -596,6 +597,12 @@
<version>${commons-pool2.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+
<dependency>
<groupId>de.flapdoodle.embed</groupId>
<artifactId>de.flapdoodle.embed.mongo</artifactId>
diff --git a/src/changelog/.2.x.x/.changelog.adoc.ftl
b/src/changelog/.2.x.x/.changelog.adoc.ftl
deleted file mode 100644
index 55dd1ed8bd..0000000000
--- a/src/changelog/.2.x.x/.changelog.adoc.ftl
+++ /dev/null
@@ -1,22 +0,0 @@
-////
- 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.version}<#if release.date?has_content> (${release.date})</#if>
-
-Changes staged for the next 2.x.x version that is yet to be released.
-
-<#include "../.changelog-entries.adoc.ftl">
diff --git a/src/changelog/2.20.0/.changelog.adoc.ftl
b/src/changelog/2.20.0/.changelog.adoc.ftl
new file mode 100644
index 0000000000..1e242eaa20
--- /dev/null
+++ b/src/changelog/2.20.0/.changelog.adoc.ftl
@@ -0,0 +1,36 @@
+////
+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.version}<#if release.date?has_content> (${release.date})</#if>
+
+This release primarily contains bug fixes and minor enhancements.
+
+Due to a break in compatibility in the SLF4J binding, Log4j now ships with two
versions of the SLF4J to Log4j adapters.
+`log4j-slf4j-impl` should be used with SLF4J 1.7.x and earlier and
`log4j-slf4j18-impl` should be used with SLF4J 1.8.x and later.
+SLF4J-2.0.0 alpha releases are not fully supported.
+See https://issues.apache.org/jira/browse/LOG4J2-2975[LOG4J2-2975] and
https://jira.qos.ch/browse/SLF4J-511[SLF4J-511].
+
+The Log4j 2.19.0 API, as well as many core components, maintains binary
compatibility with previous releases.
+
+Apache Log4j 2.19.0 requires a minimum of Java 8 to build and run.
+Log4j 2.12.4 is the last release to support Java 7.
+Log4j 2.3.2 is the last release to support Java 6.
+Java 6 and Java 7 are no longer supported by the Log4j team.
+
+For complete information on Apache Log4j 2, including instructions on how to
submit bug reports, patches, or suggestions for improvement, see
http://logging.apache.org/log4j/2.x/[the Apache Log4j 2 website].
+
+<#include "../.changelog-entries.adoc.ftl">
diff --git a/src/changelog/2.20.0/.release.xml
b/src/changelog/2.20.0/.release.xml
new file mode 100644
index 0000000000..9c635662f0
--- /dev/null
+++ b/src/changelog/2.20.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
+
+ 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 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.0.xsd";
+ date="2023-02-17" version="2.20.0"/>
diff --git a/src/changelog/.2.x.x/1166_simplify_site_generation.xml
b/src/changelog/2.20.0/1166_simplify_site_generation.xml
similarity index 100%
rename from src/changelog/.2.x.x/1166_simplify_site_generation.xml
rename to src/changelog/2.20.0/1166_simplify_site_generation.xml
diff --git a/src/changelog/.2.x.x/1172_switch_from_jira_to_github_issues.xml
b/src/changelog/2.20.0/1172_switch_from_jira_to_github_issues.xml
similarity index 100%
rename from src/changelog/.2.x.x/1172_switch_from_jira_to_github_issues.xml
rename to src/changelog/2.20.0/1172_switch_from_jira_to_github_issues.xml
diff --git a/src/changelog/.2.x.x/1193_remove_liquibase_log4j2_module.xml
b/src/changelog/2.20.0/1193_remove_liquibase_log4j2_module.xml
similarity index 100%
rename from src/changelog/.2.x.x/1193_remove_liquibase_log4j2_module.xml
rename to src/changelog/2.20.0/1193_remove_liquibase_log4j2_module.xml
diff --git a/src/changelog/.2.x.x/1197_preserve_location.xml
b/src/changelog/2.20.0/1197_preserve_location.xml
similarity index 100%
rename from src/changelog/.2.x.x/1197_preserve_location.xml
rename to src/changelog/2.20.0/1197_preserve_location.xml
diff --git a/src/changelog/.2.x.x/1202_disableAnsi_spurious_warning.xml
b/src/changelog/2.20.0/1202_disableAnsi_spurious_warning.xml
similarity index 100%
rename from src/changelog/.2.x.x/1202_disableAnsi_spurious_warning.xml
rename to src/changelog/2.20.0/1202_disableAnsi_spurious_warning.xml
diff --git a/src/changelog/.2.x.x/1214_fix_stacktrace_order.xml
b/src/changelog/2.20.0/1214_fix_stacktrace_order.xml
similarity index 100%
rename from src/changelog/.2.x.x/1214_fix_stacktrace_order.xml
rename to src/changelog/2.20.0/1214_fix_stacktrace_order.xml
diff --git a/src/changelog/.2.x.x/1274_fix_RewriteAppender_requiresLocation.xml
b/src/changelog/2.20.0/1274_fix_RewriteAppender_requiresLocation.xml
similarity index 100%
rename from src/changelog/.2.x.x/1274_fix_RewriteAppender_requiresLocation.xml
rename to src/changelog/2.20.0/1274_fix_RewriteAppender_requiresLocation.xml
diff --git a/src/changelog/.2.x.x/1277-replace_regexp_in_Rfc5424Layout.xml
b/src/changelog/2.20.0/1277-replace_regexp_in_Rfc5424Layout.xml
similarity index 100%
rename from src/changelog/.2.x.x/1277-replace_regexp_in_Rfc5424Layout.xml
rename to src/changelog/2.20.0/1277-replace_regexp_in_Rfc5424Layout.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-1631_Honor-timezone-in-file-name-pattern.xml
b/src/changelog/2.20.0/LOG4J2-1631_Honor-timezone-in-file-name-pattern.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-1631_Honor-timezone-in-file-name-pattern.xml
rename to
src/changelog/2.20.0/LOG4J2-1631_Honor-timezone-in-file-name-pattern.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-2297_Fix_java_sql_Time_object_formatting_in_MapMessage.xml
b/src/changelog/2.20.0/LOG4J2-2297_Fix_java_sql_Time_object_formatting_in_MapMessage.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-2297_Fix_java_sql_Time_object_formatting_in_MapMessage.xml
rename to
src/changelog/2.20.0/LOG4J2-2297_Fix_java_sql_Time_object_formatting_in_MapMessage.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-2678_Add_LogEvent_timestamp_to_ProducerRecord_in_KafkaAppender.xml
b/src/changelog/2.20.0/LOG4J2-2678_Add_LogEvent_timestamp_to_ProducerRecord_in_KafkaAppender.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-2678_Add_LogEvent_timestamp_to_ProducerRecord_in_KafkaAppender.xml
rename to
src/changelog/2.20.0/LOG4J2-2678_Add_LogEvent_timestamp_to_ProducerRecord_in_KafkaAppender.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-2785_PatternLayout_abrreviate_all_except_2_rightmost.xml
b/src/changelog/2.20.0/LOG4J2-2785_PatternLayout_abrreviate_all_except_2_rightmost.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-2785_PatternLayout_abrreviate_all_except_2_rightmost.xml
rename to
src/changelog/2.20.0/LOG4J2-2785_PatternLayout_abrreviate_all_except_2_rightmost.xml
diff --git a/src/changelog/.2.x.x/LOG4J2-3357_Fix_CronTriggeringPolicy.xml
b/src/changelog/2.20.0/LOG4J2-3357_Fix_CronTriggeringPolicy.xml
similarity index 100%
rename from src/changelog/.2.x.x/LOG4J2-3357_Fix_CronTriggeringPolicy.xml
rename to src/changelog/2.20.0/LOG4J2-3357_Fix_CronTriggeringPolicy.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-3487_Correct_default_to_not_include_AsyncRootLoggers.xml
b/src/changelog/2.20.0/LOG4J2-3487_Correct_default_to_not_include_AsyncRootLoggers.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-3487_Correct_default_to_not_include_AsyncRootLoggers.xml
rename to
src/changelog/2.20.0/LOG4J2-3487_Correct_default_to_not_include_AsyncRootLoggers.xml
diff --git a/src/changelog/.2.x.x/LOG4J2-3554_switch_to_Eclipse_Angus.xml
b/src/changelog/2.20.0/LOG4J2-3554_switch_to_Eclipse_Angus.xml
similarity index 100%
rename from src/changelog/.2.x.x/LOG4J2-3554_switch_to_Eclipse_Angus.xml
rename to src/changelog/2.20.0/LOG4J2-3554_switch_to_Eclipse_Angus.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-3598_Lazily_evaluate_SLF4J_LogEventBuilder_level.xml
b/src/changelog/2.20.0/LOG4J2-3598_Lazily_evaluate_SLF4J_LogEventBuilder_level.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-3598_Lazily_evaluate_SLF4J_LogEventBuilder_level.xml
rename to
src/changelog/2.20.0/LOG4J2-3598_Lazily_evaluate_SLF4J_LogEventBuilder_level.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-3601_Add_Log4j2_Core_as_runtime_dep_for_SLF4J-to-LOG4J2-API.xml
b/src/changelog/2.20.0/LOG4J2-3601_Add_Log4j2_Core_as_runtime_dep_for_SLF4J-to-LOG4J2-API.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-3601_Add_Log4j2_Core_as_runtime_dep_for_SLF4J-to-LOG4J2-API.xml
rename to
src/changelog/2.20.0/LOG4J2-3601_Add_Log4j2_Core_as_runtime_dep_for_SLF4J-to-LOG4J2-API.xml
diff --git a/src/changelog/.2.x.x/LOG4J2-3615_Fix_OSGI_API_leak.xml
b/src/changelog/2.20.0/LOG4J2-3615_Fix_OSGI_API_leak.xml
similarity index 100%
rename from src/changelog/.2.x.x/LOG4J2-3615_Fix_OSGI_API_leak.xml
rename to src/changelog/2.20.0/LOG4J2-3615_Fix_OSGI_API_leak.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-3621_Fix_priority_of_legacy_system_properties.xml
b/src/changelog/2.20.0/LOG4J2-3621_Fix_priority_of_legacy_system_properties.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-3621_Fix_priority_of_legacy_system_properties.xml
rename to
src/changelog/2.20.0/LOG4J2-3621_Fix_priority_of_legacy_system_properties.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-3624_Catch_unchecked_exception_from_ServiceLoader.xml
b/src/changelog/2.20.0/LOG4J2-3624_Catch_unchecked_exception_from_ServiceLoader.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-3624_Catch_unchecked_exception_from_ServiceLoader.xml
rename to
src/changelog/2.20.0/LOG4J2-3624_Catch_unchecked_exception_from_ServiceLoader.xml
diff --git a/src/changelog/.2.x.x/LOG4J2-3628_New_changelog_infra.xml
b/src/changelog/2.20.0/LOG4J2-3628_New_changelog_infra.xml
similarity index 100%
rename from src/changelog/.2.x.x/LOG4J2-3628_New_changelog_infra.xml
rename to src/changelog/2.20.0/LOG4J2-3628_New_changelog_infra.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-3631_Fix_Configurator_setLevel_for_internal_classes.xml
b/src/changelog/2.20.0/LOG4J2-3631_Fix_Configurator_setLevel_for_internal_classes.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-3631_Fix_Configurator_setLevel_for_internal_classes.xml
rename to
src/changelog/2.20.0/LOG4J2-3631_Fix_Configurator_setLevel_for_internal_classes.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-3634_Fix_level_propagation_in_Log4jBridgeHandler.xml
b/src/changelog/2.20.0/LOG4J2-3634_Fix_level_propagation_in_Log4jBridgeHandler.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-3634_Fix_level_propagation_in_Log4jBridgeHandler.xml
rename to
src/changelog/2.20.0/LOG4J2-3634_Fix_level_propagation_in_Log4jBridgeHandler.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-3642_disable_OSGI_locator_if_not_OSGI.xml
b/src/changelog/2.20.0/LOG4J2-3642_disable_OSGI_locator_if_not_OSGI.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-3642_disable_OSGI_locator_if_not_OSGI.xml
rename to src/changelog/2.20.0/LOG4J2-3642_disable_OSGI_locator_if_not_OSGI.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-3643_RollingFileAppender_DateLookup_use_current_time.xml
b/src/changelog/2.20.0/LOG4J2-3643_RollingFileAppender_DateLookup_use_current_time.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-3643_RollingFileAppender_DateLookup_use_current_time.xml
rename to
src/changelog/2.20.0/LOG4J2-3643_RollingFileAppender_DateLookup_use_current_time.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-3644_Deprecate_package_scanning_for_plugins.xml
b/src/changelog/2.20.0/LOG4J2-3644_Deprecate_package_scanning_for_plugins.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-3644_Deprecate_package_scanning_for_plugins.xml
rename to
src/changelog/2.20.0/LOG4J2-3644_Deprecate_package_scanning_for_plugins.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-3645_improve_logbuilder_traceEntry_traceExit.xml
b/src/changelog/2.20.0/LOG4J2-3645_improve_logbuilder_traceEntry_traceExit.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-3645_improve_logbuilder_traceEntry_traceExit.xml
rename to
src/changelog/2.20.0/LOG4J2-3645_improve_logbuilder_traceEntry_traceExit.xml
diff --git
a/src/changelog/.2.x.x/LOG4J2-3647_Add_support_for_global_filters_to_LogBuilder.xml
b/src/changelog/2.20.0/LOG4J2-3647_Add_support_for_global_filters_to_LogBuilder.xml
similarity index 100%
rename from
src/changelog/.2.x.x/LOG4J2-3647_Add_support_for_global_filters_to_LogBuilder.xml
rename to
src/changelog/2.20.0/LOG4J2-3647_Add_support_for_global_filters_to_LogBuilder.xml
