This commit is contained in:
parent
24ab634d22
commit
bfdb89ab5a
@ -1,16 +1,11 @@
|
||||
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@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
|
||||
@@ -300,7 +300,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 );
|
||||
--- maven-jar-plugin-3.2.2/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java 2022-03-29 15:50:36.249589766 +0200
|
||||
+++ maven-jar-plugin-3.2.2/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java 2022-03-29 15:51:59.054148728 +0200
|
||||
@@ -317,7 +317,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 );
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:66917a5481217a0d0bd89db60e0566c8aa02bdfd5cfe6562481865d6e30e4a12
|
||||
size 199407
|
3
maven-jar-plugin-3.2.2-source-release.zip
Normal file
3
maven-jar-plugin-3.2.2-source-release.zip
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:35d28d828096fd6181f6ed3a8267f05cd21ae072972382b8abe029c69ffaf768
|
||||
size 198485
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 29 13:53:45 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Update to upstream version 3.2.2
|
||||
- Modified patch:
|
||||
* 01-allow-replacing-artifacts.patch
|
||||
+ rediff to different line endings
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 22 13:18:12 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
@ -23,7 +23,7 @@
|
||||
%bcond_with bootstrap
|
||||
%endif
|
||||
%global base_name maven-jar-plugin
|
||||
Version: 3.2.0
|
||||
Version: 3.2.2
|
||||
Release: 0
|
||||
Summary: Maven JAR Plugin
|
||||
License: Apache-2.0
|
||||
|
Loading…
Reference in New Issue
Block a user