[Git][java-team/maven-source-plugin][upstream] New upstream version 3.4.0
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Wed Mar 18 07:38:38 GMT 2026
Emmanuel Bourg pushed to branch upstream at Debian Java Maintainers / maven-source-plugin
Commits:
1df13cf7 by Emmanuel Bourg at 2026-03-18T08:35:07+01:00
New upstream version 3.4.0
- - - - -
15 changed files:
- .asf.yaml
- README.md
- pom.xml
- src/it/MSOURCES-121/pom.xml
- + src/it/MSOURCES-121/verify.groovy
- + src/it/MSOURCES-140/invoker.properties
- + src/it/MSOURCES-140/pom.xml
- + src/it/MSOURCES-140/src/main/java/MyClass.java
- + src/it/MSOURCES-140/src/main/resources/main.properties
- + src/it/MSOURCES-140/src/test/java/MyTest.java
- + src/it/MSOURCES-140/src/test/resources/test.properties
- + src/it/MSOURCES-140/verify.groovy
- src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
- src/site/site.xml
- src/test/java/org/apache/maven/plugins/source/SourceJarMojoTest.java
Changes:
=====================================
.asf.yaml
=====================================
@@ -30,6 +30,9 @@ github:
rebase: true
autolink_jira:
- MSOURCES
+ del_branch_on_merge: true
+ features:
+ issues: true
notifications:
commits: commits at maven.apache.org
issues: issues at maven.apache.org
=====================================
README.md
=====================================
@@ -17,14 +17,13 @@
Contributing to [Apache Maven Source Plugin](https://maven.apache.org/plugins/maven-source-plugin/)
======================
-[][jira]
[][license]
[](https://search.maven.org/artifact/org.apache.maven.plugins/maven-source-plugin)
[][build]
[][test-results]
-You have found a bug or you have an idea for a cool new feature? Contributing
+You have found a bug, or you have an idea for a cool new feature? Contributing
code is a great way to give something back to the open source community. Before
you dig right into the code, there are a few guidelines that we need
contributors to follow so that we can have a chance of keeping on top of
@@ -33,7 +32,6 @@ things.
Getting Started
---------------
-+ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
+ Make sure you have a [GitHub account](https://github.com/signup/free).
+ If you're planning to implement a new feature, it makes sense to discuss your changes
on the [dev list][ml-list] first.
@@ -59,37 +57,23 @@ There are some guidelines which will make applying PRs easier for us:
+ Create minimal diffs - disable on save actions like reformat source code or organize imports.
If you feel the source code should be reformatted, create a separate PR for this change.
+ Check for unnecessary whitespace with `git diff --check` before committing.
-+ Make sure your commit messages are in the proper format. Your commit message should contain the key of the JIRA issue.
-```
-[MJAR-XXX] - Subject of the JIRA Ticket
- Optional supplemental description.
-```
+ Make sure you have added the necessary tests (JUnit/IT) for your changes.
+ Run all the tests with `mvn -Prun-its verify` to assure nothing else was accidentally broken.
+ Submit a pull request to the repository in the Apache organization.
-+ Update your JIRA ticket and include a link to the pull request in the ticket.
If you plan to contribute on a regular basis, please consider filing a [contributor license agreement][cla].
-Making Trivial Changes
-----------------------
-
-For changes of a trivial nature to comments and documentation, it is not always
-necessary to create a new ticket in JIRA. In this case, it is appropriate to
-start the first line of a commit with '(doc)' instead of a ticket number.
-
Additional Resources
--------------------
+ [Contributing patches](https://maven.apache.org/guides/development/guide-maven-development.html#Creating_and_submitting_a_patch)
-+ [Apache Maven Source Plugin JIRA project page][jira]
+ [Contributor License Agreement][cla]
+ [General GitHub documentation](https://help.github.com/)
+ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
-+ [Apache Maven Twitter Account](https://twitter.com/ASFMavenProject)
-+ #Maven IRC channel on freenode.org
++ [Apache Maven X Account](https://x.com/ASFMavenProject)
++ [Apache Maven Bluesky Account](https://bsky.app/profile/maven.apache.org)
++ [Apache Maven Mastodon Account](https://mastodon.social/deck/@ASFMavenProject@fosstodon.org)
-[jira]: https://issues.apache.org/jira/projects/MSOURCES/
[license]: https://www.apache.org/licenses/LICENSE-2.0
[ml-list]: https://maven.apache.org/mailing-lists.html
[code-style]: https://maven.apache.org/developers/conventions/code.html
=====================================
pom.xml
=====================================
@@ -23,12 +23,12 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>41</version>
+ <version>45</version>
<relativePath />
</parent>
<artifactId>maven-source-plugin</artifactId>
- <version>3.3.1</version>
+ <version>3.4.0</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Source Plugin</name>
@@ -52,18 +52,18 @@ under the License.
</contributors>
<prerequisites>
- <maven>${mavenVersion}</maven>
+ <maven>3.6.3</maven>
</prerequisites>
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-source-plugin.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-source-plugin.git</developerConnection>
- <tag>maven-source-plugin-3.3.1</tag>
+ <tag>maven-source-plugin-3.4.0</tag>
<url>https://github.com/apache/maven-source-plugin/tree/${project.scm.tag}</url>
</scm>
<issueManagement>
- <system>JIRA</system>
- <url>https://issues.apache.org/jira/browse/MSOURCES</url>
+ <system>GitHub Issues</system>
+ <url>https://github.com/apache/maven-source-plugin/issues</url>
</issueManagement>
<ciManagement>
<system>Jenkins</system>
@@ -78,8 +78,10 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
- <mavenVersion>3.2.5</mavenVersion>
- <project.build.outputTimestamp>2024-03-30T01:48:50Z</project.build.outputTimestamp>
+ <mavenVersion>3.9.11</mavenVersion>
+ <project.build.outputTimestamp>2025-11-22T22:27:03Z</project.build.outputTimestamp>
+
+ <version.maven-invoker-plugin>3.9.1</version.maven-invoker-plugin>
</properties>
<dependencyManagement>
@@ -87,7 +89,7 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.11.0</version>
+ <version>2.21.0</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -122,29 +124,29 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
+ <version>${version.maven-plugin-tools}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>3.6.1</version>
+ <version>3.6.5</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>4.9.1</version>
+ <version>4.10.4</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>3.3.0</version>
+ <version>3.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
=====================================
src/it/MSOURCES-121/pom.xml
=====================================
@@ -29,9 +29,10 @@
<name>Test for multiple attachments of files</name>
<description>This build should fail based on the duplicate
- execution with the same configuration. This will errornously
- add the classifier/file twice times.
+ execution with the same configuration. This will erroneously
+ add the classifier/file twice.
MSOURCES-121.
+ update with MSOURCES-141: do not fail but detect and not add twice
</description>
<properties>
@@ -56,6 +57,9 @@
<goals>
<goal>jar-no-fork</goal>
</goals>
+ <configuration>
+ <finalName>${project.build.finalName}-secondary</finalName>
+ </configuration>
</execution>
</executions>
</plugin>
=====================================
src/it/MSOURCES-121/verify.groovy
=====================================
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+File buildLog = new File( basedir, 'build.log' )
+
+assert buildLog.text =~ /\[ERROR\] Artifact org.apache.maven.its.sources:jar-no-fork:java-source:sources:1.0-SNAPSHOT already attached to a file target.jar-no-fork-1.0-SNAPSHOT-sources.jar: attach to target.jar-no-fork-1.0-SNAPSHOT-secondary-sources.jar should be done with another classifier/
=====================================
src/it/MSOURCES-140/invoker.properties
=====================================
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+invoker.buildResult = success
+invoker.goals = package clean install
=====================================
src/it/MSOURCES-140/pom.xml
=====================================
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.sources</groupId>
+ <artifactId>jar-no-fork</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>Test for multiple attachments of one file caused by multiple runs in one session</name>
+ <description>mvn package clean install should not fail</description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar-no-fork</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
=====================================
src/it/MSOURCES-140/src/main/java/MyClass.java
=====================================
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class MyClass
+{
+
+}
=====================================
src/it/MSOURCES-140/src/main/resources/main.properties
=====================================
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
=====================================
src/it/MSOURCES-140/src/test/java/MyTest.java
=====================================
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+public class MyTest
+{
+
+}
=====================================
src/it/MSOURCES-140/src/test/resources/test.properties
=====================================
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
=====================================
src/it/MSOURCES-140/verify.groovy
=====================================
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+File buildLog = new File( basedir, 'build.log' )
+
+assert buildLog.text =~ /\[INFO\] Artifact org.apache.maven.its.sources:jar-no-fork:java-source:sources:1.0-SNAPSHOT already attached to target.jar-no-fork-1.0-SNAPSHOT-sources.jar: ignoring same re-attach \(same artifact, same file\)/
=====================================
src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java
=====================================
@@ -20,10 +20,12 @@ package org.apache.maven.plugins.source;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Objects;
import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.archiver.MavenArchiver;
@@ -303,15 +305,29 @@ public abstract class AbstractSourceJarMojo extends AbstractMojo {
}
if (attach) {
+ boolean requiresAttach = true;
for (Artifact attachedArtifact : project.getAttachedArtifacts()) {
- if (isAlreadyAttached(attachedArtifact, project, getClassifier())) {
- getLog().error("We have duplicated artifacts attached.");
- throw new MojoExecutionException("Presumably you have configured maven-source-plugin "
- + "to execute twice in your build. You have to configure a classifier "
- + "for at least one of them.");
+ Artifact previouslyAttachedArtifact =
+ getPreviouslyAttached(attachedArtifact, project, getClassifier());
+ if (previouslyAttachedArtifact != null) {
+ File previouslyAttachedFile = previouslyAttachedArtifact.getFile();
+ // trying to attache the same file/path or not?
+ if (!outputFile.equals(previouslyAttachedFile)) {
+ getLog().error("Artifact " + previouslyAttachedArtifact.getId()
+ + " already attached to a file " + relative(previouslyAttachedFile) + ": attach to "
+ + relative(outputFile) + " should be done with another classifier");
+ throw new MojoExecutionException("Presumably you have configured maven-source-plugin "
+ + "to execute twice in your build to different output files. "
+ + "You have to configure a classifier for at least one of them.");
+ }
+ requiresAttach = false;
+ getLog().info("Artifact " + previouslyAttachedArtifact.getId() + " already attached to "
+ + relative(outputFile) + ": ignoring same re-attach (same artifact, same file)");
}
}
- projectHelper.attachArtifact(project, getType(), getClassifier(), outputFile);
+ if (requiresAttach) {
+ projectHelper.attachArtifact(project, getType(), getClassifier(), outputFile);
+ }
} else {
getLog().info("NOT adding java-sources to attached artifacts list.");
}
@@ -320,12 +336,19 @@ public abstract class AbstractSourceJarMojo extends AbstractMojo {
}
}
- private boolean isAlreadyAttached(Artifact artifact, MavenProject checkProject, String classifier) {
+ private String relative(File to) {
+ Path basedir = project.getBasedir().getAbsoluteFile().toPath();
+ return basedir.relativize(to.getAbsoluteFile().toPath()).toString();
+ }
+
+ private Artifact getPreviouslyAttached(Artifact artifact, MavenProject checkProject, String classifier) {
return artifact.getType().equals(getType())
- && artifact.getGroupId().equals(checkProject.getGroupId())
- && artifact.getArtifactId().equals(checkProject.getArtifactId())
- && artifact.getVersion().equals(checkProject.getVersion())
- && (artifact.getClassifier() != null ? artifact.getClassifier().equals(classifier) : false);
+ && artifact.getGroupId().equals(checkProject.getGroupId())
+ && artifact.getArtifactId().equals(checkProject.getArtifactId())
+ && artifact.getVersion().equals(checkProject.getVersion())
+ && Objects.equals(artifact.getClassifier(), classifier)
+ ? artifact
+ : null;
}
/**
=====================================
src/site/site.xml
=====================================
@@ -25,7 +25,7 @@ under the License.
<body>
<menu name="Overview">
<item name="Introduction" href="index.html"/>
- <item name="Goals" href="plugin-info.html"/>
+ <item name="Plugin Documentation" href="plugin-info.html"/>
<item name="Usage" href="usage.html"/>
<item name="FAQ" href="faq.html"/>
<!-- According to https://issues.apache.org/jira/browse/MNGSITE-152 -->
=====================================
src/test/java/org/apache/maven/plugins/source/SourceJarMojoTest.java
=====================================
@@ -29,15 +29,16 @@ public class SourceJarMojoTest extends AbstractSourcePluginTestCase {
}
private String[] addMavenDescriptor(String project, String[] listOfElements) {
- final String METAINF = "META-INF/";
- final String MAVENSOURCE = "maven/source/maven-source-plugin-test-";
- String[] result = new String[listOfElements.length + 5];
- System.arraycopy(listOfElements, 0, result, 0, listOfElements.length);
- result[listOfElements.length] = METAINF + "maven/";
- result[listOfElements.length + 1] = METAINF + "maven/source/";
- result[listOfElements.length + 2] = METAINF + MAVENSOURCE + project + "/";
- result[listOfElements.length + 3] = METAINF + MAVENSOURCE + project + "/pom.properties";
- result[listOfElements.length + 4] = METAINF + MAVENSOURCE + project + "/pom.xml";
+ final String metainf = "META-INF/";
+ final String mavensource = "maven/source/maven-source-plugin-test-";
+ int length = listOfElements.length;
+ String[] result = new String[length + 5];
+ System.arraycopy(listOfElements, 0, result, 0, length);
+ result[length] = metainf + "maven/";
+ result[length + 1] = metainf + "maven/source/";
+ result[length + 2] = metainf + mavensource + project + "/";
+ result[length + 3] = metainf + mavensource + project + "/pom.properties";
+ result[length + 4] = metainf + mavensource + project + "/pom.xml";
return result;
}
View it on GitLab: https://salsa.debian.org/java-team/maven-source-plugin/-/commit/1df13cf76e08753de4d41d9d180894a3accb233c
--
View it on GitLab: https://salsa.debian.org/java-team/maven-source-plugin/-/commit/1df13cf76e08753de4d41d9d180894a3accb233c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20260318/78db1802/attachment.htm>
More information about the pkg-java-commits
mailing list