This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit fa0c52828ce7d639737a0a076e13eb743df8b4ec Author: Piotr P. Karwasz <[email protected]> AuthorDate: Tue Nov 14 13:06:46 2023 +0100 Use @BaselineIgnore instead of packages exclusions --- .../org/apache/logging/log4j/package-info.java | 2 +- log4j-core/pom.xml | 35 ---------------------- .../log4j/core/util/datetime/package-info.java | 4 ++- 3 files changed, 4 insertions(+), 37 deletions(-) diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/package-info.java b/log4j-api/src/main/java/org/apache/logging/log4j/package-info.java index d4e6e4f0df..5407f05f61 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/package-info.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/package-info.java @@ -32,7 +32,7 @@ * @see <a href="http://logging.apache.org/log4j/2.x/manual/api.html";>Log4j 2 API manual</a> */ @Export -@Version("2.20.1") +@Version("2.20.2") package org.apache.logging.log4j; import org.osgi.annotation.bundle.Export; diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml index d444705e53..ba6f896b71 100644 --- a/log4j-core/pom.xml +++ b/log4j-core/pom.xml @@ -184,41 +184,6 @@ </configuration> </plugin> - <!-- Remove the following plugin executions after `2.22.0` release! - In `2.22.0`, we have removed *unused* `FastDateParser` due to LOG4J2-3672 and #1848. - Though `bnd-baseline-m-p` doesn't allow such breaking changes in non-major version upgrades. - Hence, we suppress it until `2.22.0` gets released. --> - <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-baseline-maven-plugin</artifactId> - <configuration> - <diffpackages> - <diffpackage>!org.apache.logging.log4j.core.util.datetime</diffpackage> - <diffpackage>*</diffpackage> - </diffpackages> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>remove-after-release</id> - <goals> - <goal>enforce</goal> - </goals> - <configuration> - <rules> - <requireProperty> - <property>revision</property> - <regex>2\.22\.0(-SNAPSHOT)?</regex> - <regexMessage>Remove `bnd-baseline-maven-plugin` config in `log4j-core`.</regexMessage> - </requireProperty> - </rules> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project> diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/package-info.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/package-info.java index 8c9e3bb49a..dd5eea7461 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/package-info.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/datetime/package-info.java @@ -18,8 +18,10 @@ * Log4j 2 date formatting classes. */ @Export -@Version("2.21.0") +@Version("2.21.1") +@BaselineIgnore("2.22.0") package org.apache.logging.log4j.core.util.datetime; +import aQute.bnd.annotation.baseline.BaselineIgnore; import org.osgi.annotation.bundle.Export; import org.osgi.annotation.versioning.Version;
