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-log4j-jmx-gui.git
commit 01d91f496dbc5bdf44c0f59d78b01df36e680631 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Thu Oct 19 19:20:35 2023 +0200 Bump `logging-parent` to version 10.2.0 --- pom.xml | 24 ++++++++++++------------ src/changelog/.2.x.x/bump-logging-parent.xml | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 7e2f6ef..cd5b60d 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.logging</groupId> <artifactId>logging-parent</artifactId> - <version>10.1.1</version> + <version>10.2.0</version> </parent> <groupId>org.apache.logging.log4j</groupId> @@ -132,12 +132,10 @@ <properties> <!-- project version --> - <revision>2.22.0-SNAPSHOT</revision> + <revision>2.21.1-SNAPSHOT</revision> <!-- dependency versions --> <log4j.version>2.21.0</log4j.version> - <log4j-changelog-maven-plugin.version>0.5.0</log4j-changelog-maven-plugin.version> - <spotbugs-annotations.version>4.8.0</spotbugs-annotations.version> <!-- Additional manifest entries --> <Class-Path>log4j-api-2.21.0.jar log4j-core-2.21.0.jar</Class-Path> @@ -180,12 +178,14 @@ <build> <plugins> + <!-- + ~ Remove dummy JConsole stubs that are placed to enable compilation with Java 8+ versions. + --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-clean-plugin</artifactId> <executions> <execution> - <!-- Remove dummy JConsole stubs that are placed to enable compilation with Java 8+ versions. --> <id>remove-stubs</id> <goals> <goal>clean</goal> @@ -207,18 +207,18 @@ </plugin> <plugin> - <groupId>biz.aQute.bnd</groupId> - <artifactId>bnd-baseline-maven-plugin</artifactId> - <version>${bnd-maven-plugin.version}</version> + <groupId>org.codehaus.mojo</groupId> + <artifactId>flatten-maven-plugin</artifactId> + <version>${flatten-maven-plugin.version}</version> <executions> <execution> - <id>baseline</id> - <goals> - <goal>baseline</goal> - </goals> + <id>flatten-clean</id> + <!-- `logging-parent` 10.2.0 does not bind this execution --> + <phase>clean</phase> </execution> </executions> </plugin> + </plugins> </build> diff --git a/src/changelog/.2.x.x/bump-logging-parent.xml b/src/changelog/.2.x.x/bump-logging-parent.xml index cc6b7e9..fa23829 100644 --- a/src/changelog/.2.x.x/bump-logging-parent.xml +++ b/src/changelog/.2.x.x/bump-logging-parent.xml @@ -4,6 +4,6 @@ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.2.xsd"; type="changed"> <description format="asciidoc"> - Upgrade `logging-parent` to version 10.1.1, `log4j-core` to version 2.21.0 and `log4j-changelog` to version 0.5.0 + Upgrade `logging-parent` to version 10.2.0, `log4j-core` to version 2.21.0. </description> </entry>
