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-parent.git
The following commit(s) were added to refs/heads/main by this push:
new 25df2e8 Change plugin version props naming convention
25df2e8 is described below
commit 25df2e8322f1dd36b11aac4ca8e67215a7a8de3a
Author: Piotr P. Karwasz <[email protected]>
AuthorDate: Fri Nov 3 10:55:42 2023 +0100
Change plugin version props naming convention
---
pom.xml | 63 +++++++++++-----------
.../.10.x.x/change-plugin-version-props.xml | 9 ++++
src/site/_release-notes/_10.x.x.adoc | 1 +
3 files changed, 43 insertions(+), 30 deletions(-)
diff --git a/pom.xml b/pom.xml
index 553821c..f949081 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,20 +207,23 @@
<spotbugs-annotations.version>4.8.0</spotbugs-annotations.version>
<!-- plugin versions -->
- <asciidoctor-maven-plugin.version>2.2.4</asciidoctor-maven-plugin.version>
- <beanshell-maven-plugin.version>1.4</beanshell-maven-plugin.version>
- <bnd-maven-plugin.version>6.4.0</bnd-maven-plugin.version>
-
<build-helper-maven-plugin.version>3.4.0</build-helper-maven-plugin.version>
- <cyclonedx-maven-plugin.version>2.7.10</cyclonedx-maven-plugin.version>
+ <version.asciidoctor-maven-plugin>2.2.4</version.asciidoctor-maven-plugin>
+ <version.beanshell-maven-plugin>1.4</version.beanshell-maven-plugin>
+ <version.bnd-maven-plugin>6.4.0</version.bnd-maven-plugin>
+
<version.bnd-baseline-maven-plugin>${version.bnd-maven-plugin}</version.bnd-baseline-maven-plugin>
+
<version.build-helper-maven-plugin>3.4.0</version.build-helper-maven-plugin>
+ <version.cyclonedx-maven-plugin>2.7.10</version.cyclonedx-maven-plugin>
+ <version.flatten-maven-plugin>1.5.0</version.flatten-maven-plugin>
+
<version.log4j-changelog-maven-plugin>0.5.0</version.log4j-changelog-maven-plugin>
+ <version.maven-artifact-plugin>3.4.1</version.maven-artifact-plugin>
+ <version.sign-maven-plugin>1.0.1</version.sign-maven-plugin>
+ <version.spotbugs-maven-plugin>4.7.3.6</version.spotbugs-maven-plugin>
+ <version.spotless-maven-plugin>2.40.0</version.spotless-maven-plugin>
+ <version.xml-maven-plugin>1.1.0</version.xml-maven-plugin>
+
+ <!-- plugin dependencies versions -->
<error-prone.version>2.23.0</error-prone.version>
<findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
- <flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
-
<log4j-changelog-maven-plugin.version>0.5.0</log4j-changelog-maven-plugin.version>
- <maven-artifact-plugin.version>3.4.1</maven-artifact-plugin.version>
- <sign-maven-plugin.version>1.0.1</sign-maven-plugin.version>
- <spotbugs-maven-plugin.version>4.7.3.6</spotbugs-maven-plugin.version>
- <spotless-maven-plugin.version>2.40.0</spotless-maven-plugin.version>
- <xml-maven-plugin.version>1.1.0</xml-maven-plugin.version>
</properties>
@@ -267,50 +270,56 @@
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
- <version>${asciidoctor-maven-plugin.version}</version>
+ <version>${version.asciidoctor-maven-plugin}</version>
</plugin>
<!-- `artifact:compare` is used in
`.github/workflows/build-reusable.yaml` -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-artifact-plugin</artifactId>
- <version>${maven-artifact-plugin.version}</version>
+ <version>${version.maven-artifact-plugin}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
- <version>${flatten-maven-plugin.version}</version>
+ <version>${version.flatten-maven-plugin}</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.simplify4u.plugins</groupId>
+ <artifactId>sign-maven-plugin</artifactId>
+ <version>${sign-maven-plugin.version}</version>
</plugin>
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>${spotbugs-maven-plugin.version}</version>
+ <version>${version.spotbugs-maven-plugin}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xml-maven-plugin</artifactId>
- <version>${xml-maven-plugin.version}</version>
+ <version>${version.xml-maven-plugin}</version>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
- <version>${spotless-maven-plugin.version}</version>
+ <version>${version.spotless-maven-plugin}</version>
</plugin>
<plugin>
<groupId>com.github.genthaler</groupId>
<artifactId>beanshell-maven-plugin</artifactId>
- <version>${beanshell-maven-plugin.version}</version>
+ <version>${version.beanshell-maven-plugin}</version>
</plugin>
<plugin>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-changelog-maven-plugin</artifactId>
- <version>${log4j-changelog-maven-plugin.version}</version>
+ <version>${version.log4j-changelog-maven-plugin}</version>
<!-- `log4j-tools` release `0.5.0` has an invalid POM, where the
parent is missing.
This will be fixed by `<parent>keep` modification to the
`flatten-bom` execution we have below.
Until then (that is, the next `log4j-tools` release) we need
this temporary dependency fix. -->
@@ -326,25 +335,25 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-baseline-maven-plugin</artifactId>
- <version>${bnd-maven-plugin.version}</version>
+ <version>${version.bnd-baseline-maven-plugin}</version>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
- <version>${bnd-maven-plugin.version}</version>
+ <version>${version.bnd-maven-plugin}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>${build-helper-maven-plugin.version}</version>
+ <version>${version.build-helper-maven-plugin}</version>
</plugin>
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
- <version>${cyclonedx-maven-plugin.version}</version>
+ <version>${version.cyclonedx-maven-plugin}</version>
</plugin>
</plugins>
@@ -355,7 +364,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
- <version>${flatten-maven-plugin.version}</version>
<executions>
<!-- Resolves `revision` property prior to deployment.
@@ -946,7 +954,6 @@
<plugin>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-changelog-maven-plugin</artifactId>
- <version>${log4j-changelog-maven-plugin.version}</version>
<executions>
<execution>
<id>release-changelog</id>
@@ -1181,7 +1188,6 @@
<plugin>
<groupId>org.simplify4u.plugins</groupId>
<artifactId>sign-maven-plugin</artifactId>
- <version>${sign-maven-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -1331,9 +1337,6 @@
<maven.site.skip>true</maven.site.skip>
<maven.site.deploy.skip>true</maven.site.deploy.skip>
- <!-- plugin versions -->
-
<asciidoctor-maven-plugin.version>2.2.4</asciidoctor-maven-plugin.version>
-
</properties>
<build>
diff --git a/src/changelog/.10.x.x/change-plugin-version-props.xml
b/src/changelog/.10.x.x/change-plugin-version-props.xml
new file mode 100644
index 0000000..886d9da
--- /dev/null
+++ b/src/changelog/.10.x.x/change-plugin-version-props.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns="http://logging.apache.org/log4j/changelog";
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog
https://logging.apache.org/log4j/changelog-0.1.2.xsd";
+ type="changed">
+ <description format="asciidoc">
+ Change plugin version properties from `<artifactId>.version` to
`version.<artifactId>` to align with ASF parent convention.
+ </description>
+</entry>
diff --git a/src/site/_release-notes/_10.x.x.adoc
b/src/site/_release-notes/_10.x.x.adoc
index 1328a35..27406e7 100644
--- a/src/site/_release-notes/_10.x.x.adoc
+++ b/src/site/_release-notes/_10.x.x.adoc
@@ -50,6 +50,7 @@ This minor release contains several small improvements.
* `deploy-release-reusable.yaml` is improved to automatically derive deployed
artifacts as attachments. This renders both
`distribution-attachment-filepath-pattern` and `distribution-attachment-count`
input arguments redundant for almost all cases.
* Disable the usage of `<distributionManagement>` and alpha releases in the
`bnd-baseline-maven-plugin`.
+* Change plugin version properties from `<artifactId>.version` to
`version.<artifactId>` to align with ASF parent convention.
* Convert `bnd-maven-plugin` API leakage warnings to errors
(https://github.com/apache/logging-log4j2/issues/1895[apache/logging-log4j2#1895])
* Update `com.google.errorprone:error_prone_core` to version `2.23.0`
(https://github.com/apache/logging-parent/pull/49[49])
* Update `org.cyclonedx:cyclonedx-maven-plugin` to version `2.7.10`
(https://github.com/apache/logging-parent/pull/54[54])
