You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2023/06/11 15:29:20 UTC
[maven-apache-parent] 01/01: [MPOM-423] Bump apache-jar-resource-bundle from 1.4 to 1.5
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MPOM-423
in repository https://gitbox.apache.org/repos/asf/maven-apache-parent.git
commit f18456ec2b74ccd3cf68f56001496bb7c02522d1
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sun Jun 11 17:28:47 2023 +0200
[MPOM-423] Bump apache-jar-resource-bundle from 1.4 to 1.5
---
pom.xml | 6 +++---
src/site-docs/apt/index.apt.vm | 6 ++++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index a8a63a1..4b0bf8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@ under the License.
<project.build.outputTimestamp>2022-12-11T19:18:25Z</project.build.outputTimestamp>
<version.apache-rat-plugin>0.15</version.apache-rat-plugin>
- <version.apache-source-release-assembly-descriptor>1.5</version.apache-source-release-assembly-descriptor>
+ <version.apache-resource-bundles>1.5</version.apache-resource-bundles>
<version.checksum-maven-plugin>1.11</version.checksum-maven-plugin>
<version.maven-antrun-plugin>3.1.0</version.maven-antrun-plugin>
<version.maven-assembly-plugin>3.6.0</version.maven-assembly-plugin>
@@ -357,7 +357,7 @@ under the License.
</goals>
<configuration>
<resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ <resourceBundle>org.apache.apache.resources:apache-jar-resource-bundle:${version.apache-resource-bundles}</resourceBundle>
</resourceBundles>
</configuration>
</execution>
@@ -426,7 +426,7 @@ under the License.
<dependency>
<groupId>org.apache.apache.resources</groupId>
<artifactId>apache-source-release-assembly-descriptor</artifactId>
- <version>${version.apache-source-release-assembly-descriptor}</version>
+ <version>${version.apache-resource-bundles}</version>
</dependency>
</dependencies>
<executions>
diff --git a/src/site-docs/apt/index.apt.vm b/src/site-docs/apt/index.apt.vm
index 0ce0636..cee7cbd 100644
--- a/src/site-docs/apt/index.apt.vm
+++ b/src/site-docs/apt/index.apt.vm
@@ -67,6 +67,8 @@ Apache Software Foundation Parent POM
** There are used properties <<<version.\<artifactId\>>>> for defining each version of plugin, except:
+ *** <<<version.apache-resource-bundles>>> is used for: <apache-jar-resource-bundle> and <apache-source-release-assembly-descriptor>
+
*** <<<version.maven-plugin-tools>>> is used for: <maven-plugin-annotations>, <maven-plugin-plugin> and <maven-plugin-report-plugin>
*** <<<version.maven-surefire>>> is used for: <maven-failsafe-plugin>, <maven-surefire-plugin> and <maven-surefire-report-plugin>
@@ -87,7 +89,7 @@ Apache Software Foundation Parent POM
* <<plugins>>: The plugins section configures three executions:
- ** maven-remote-resources-plugin for {{{/apache-resource-bundles/}org.apache:apache-jar-resource-bundle:1.4}}.
+ ** maven-remote-resources-plugin for {{{/apache-resource-bundles/jar/}org.apache.apache.resources:apache-jar-resource-bundle:$context.get("version.apache-resource-bundles")}}.
** maven-site-plugin:attach-descriptor
@@ -123,7 +125,7 @@ The <<<apache-release>>> Profile
The profile includes the following plugins:
* maven-assembly-plugin:
- {{{/apache-resource-bundles/}org.apache.apache.resources:apache-source-release-assembly-descriptor:1.0.6}}
+ {{{/apache-resource-bundles/source-release/}org.apache.apache.resources:apache-source-release-assembly-descriptor:$context.get("version.apache-resource-bundles")}}
is added as dependency, and an execution is configured with <<<source-release-assembly>>> id.\
The plugin is configured to take a <<<descriptorRef>>> name from the
<<sourceReleaseAssemblyDescriptor>> property, which by default is