You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2020/01/25 13:22:23 UTC

[maven-shade-plugin] branch MSHADE-339 updated (f6d44ed -> a105d79)

This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a change to branch MSHADE-339
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.


 discard f6d44ed  [MSHADE-339] - Shaded test jar has wrong type "jar"
 discard e45e37c  [MSHADE-340] - Shaded test jar artifact is not attached to the project
 discard dc9dfa3  [MSHADE-311] - Don't add exclusions for provided dep
 discard 03b159e  Fixed several JavaDoc issues Removed useless method separator comments. Removed SVN legacy information.
 discard f3669a1  Revert "[maven-release-plugin] prepare release maven-shade-plugin-3.2.2"
     add 80de6cc  Revert "[maven-release-plugin] prepare release maven-shade-plugin-3.2.2"
     add fb313f5  Fixed several JavaDoc issues Removed useless method separator comments. Removed SVN legacy information.
     add 04a8f65  [MSHADE-311] - Don't add exclusions for provided dep
     add 62efa68  [MSHADE-340] - Shaded test jar artifact is not attached to the project
     add 24827d6  Update hyperlinks
     add 1da558e  fix typo
     new a105d79  [MSHADE-339] - Shaded test jar has wrong type "jar"

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (f6d44ed)
            \
             N -- N -- N   refs/heads/MSHADE-339 (a105d79)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CONTRIBUTING.md                                | 4 ++--
 src/site/apt/examples/includes-excludes.apt.vm | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


[maven-shade-plugin] 01/01: [MSHADE-339] - Shaded test jar has wrong type "jar"

Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

khmarbaise pushed a commit to branch MSHADE-339
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git

commit a105d79368da1eb0d4a872288e6c6f8da6c58b09
Author: Peter De Maeyer <pe...@gmail.com>
AuthorDate: Sun Dec 22 20:37:02 2019 +0100

    [MSHADE-339] - Shaded test jar has wrong type "jar"
---
 src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
index 9427923..61c5cdb 100644
--- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
@@ -579,7 +579,7 @@ public class ShadeMojo
 
                             replaceFile( shadedTests, testJar );
 
-                            projectHelper.attachArtifact( project, "jar", "tests", shadedTests );
+                            projectHelper.attachArtifact( project, "test-jar", "tests", shadedTests );
                         }
 
                         if ( createTestSourcesJar )