[maven-jar-plugin] 01/01: Display a warning instead of failing the build if the plugin is misconfigured and attempts to attach twice the same artifact

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-jar-plugin.

commit f63937444e44aa70d070eb71cb3f366a11e19e00
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 27 14:28:49 2017 +0200

    Display a warning instead of failing the build if the plugin is misconfigured and attempts to attach twice the same artifact
---
 debian/changelog                                  |  9 +++++++++
 debian/patches/01-allow-replacing-artifacts.patch | 16 ++++++++++++++++
 debian/patches/series                             |  1 +
 3 files changed, 26 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f59c2b1..8332cee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+maven-jar-plugin (3.0.2-2) unstable; urgency=medium
+
+  * Team upload.
+  * Display a warning instead of failing the build if the plugin
+    is misconfigured and attempts to attach twice the same artifact.
+    This reverts the fix for MJAR-198 introduced in the version 3.0.0.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 27 Jul 2017 14:28:39 +0200
+
 maven-jar-plugin (3.0.2-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/01-allow-replacing-artifacts.patch b/debian/patches/01-allow-replacing-artifacts.patch
new file mode 100644
index 0000000..2382eb0
--- /dev/null
+++ b/debian/patches/01-allow-replacing-artifacts.patch
@@ -0,0 +1,16 @@
+Description: Display a warning instead of failing the build if the plugin
+ is misconfigured and attempts to attach twice the same artifact.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+Bug: https://issues.apache.org/jira/browse/MJAR-198
+--- a/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
++++ b/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
+@@ -262,7 +262,7 @@
+             {
+                 if ( projectHasAlreadySetAnArtifact() )
+                 {
+-                    throw new MojoExecutionException( "You have to use a classifier "
++                    getLog().warn( "You have to use a classifier "
+                         + "to attach supplemental artifacts to the project instead of replacing them." );
+                 }
+                 getProject().getArtifact().setFile( jarFile );
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b9aefda
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-allow-replacing-artifacts.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-jar-plugin.git