This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-parent.git
The following commit(s) were added to refs/heads/master by this push:
new 95dfe32 Workaround MSOURCES-143 by using version.maven-source-plugin
3.2.1 on Java 8
95dfe32 is described below
commit 95dfe32a3a0cee9587f4e4c4658f2b48bd545e8d
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Aug 18 08:17:24 2023 -0400
Workaround MSOURCES-143 by using version.maven-source-plugin 3.2.1 on
Java 8
Remove property commons.source-plugin.version and reuse the parent POM's
version.maven-source-plugin
---
pom.xml | 25 ++++++++++---------------
src/changes/changes.xml | 3 +++
2 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index d5be416..e6cc877 100644
--- a/pom.xml
+++ b/pom.xml
@@ -195,7 +195,6 @@
Warning: maven-site-plugin 4.0.0-M3 requires an update to commons-skin
site.vm for new variable names.
-->
<commons.site-plugin.version>3.12.1</commons.site-plugin.version>
- <commons.source-plugin.version>3.3.0</commons.source-plugin.version>
<commons.spotbugs.plugin.version>4.7.3.5</commons.spotbugs.plugin.version>
<commons.spotbugs.impl.version>4.7.3</commons.spotbugs.impl.version>
<commons.surefire-report.version>3.1.2</commons.surefire-report.version>
@@ -575,19 +574,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>${commons.source-plugin.version}</version>
- <configuration>
- <archive>
- <manifest>
-
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
- </manifest>
- </archive>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -882,7 +868,6 @@
</plugins>
</pluginManagement>
<plugins>
- <!-- org.apache.maven.plugins, alpha order by artifact id -->
<plugin>
<!-- Parent POM is released, so needs source archive for ASF mirrors
-->
<artifactId>maven-assembly-plugin</artifactId>
@@ -989,6 +974,14 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
<executions>
<execution>
<id>create-source-jar</id>
@@ -1854,6 +1847,8 @@
</activation>
<properties>
<commons.spdx.version>0.6.3</commons.spdx.version>
+ <!--
https://issues.apache.org/jira/projects/MSOURCES/issues/MSOURCES-143 -->
+ <version.maven-source-plugin>3.2.1</version.maven-source-plugin>
</properties>
</profile>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5a61514..a38cedc 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -61,6 +61,9 @@ The <action> type attribute can be add,update,fix,remove.
<body>
<release version="60" date="2023-MM-DD" description="Version 60:
Maintenance and update dependencies">
+ <!-- FIX -->
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">Workaround
MSOURCES-143 by using version.maven-source-plugin 3.2.1 on Java 8.</action>
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">Remove
property commons.source-plugin.version and reuse the parent POM's
version.maven-source-plugin.</action>
<!-- ADD -->
<action type="add" dev="ggregory" due-to="Gary Gregory">Add SPDX
SBOM in the package phase.</action>
<!-- UPDATE -->
