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 2018/03/23 18:27:55 UTC
[maven-shade-plugin] branch MSHADE-276 updated (eecc803 -> e861b91)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MSHADE-276
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git.
discard eecc803 [MSHADE-276] - Upgrade parent to 31
add 36bb876 [MSHADE-273] Shading of paths starting with / ignores excludes
new e861b91 [MSHADE-276] - Upgrade parent to 31
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 (eecc803)
\
N -- N -- N refs/heads/MSHADE-276 (e861b91)
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:
.../pom.xml | 11 +++++++----
.../src/main/java/Main.java | 9 ++++++---
.../org/apache/maven/from/a}/test.properties | 0
.../org/apache/maven/from/b}/test.properties | 2 +-
.../plugins/shade/relocation/SimpleRelocator.java | 10 +++++-----
.../shade/relocation/SimpleRelocatorTest.java | 23 ++++++++++++++++++++--
6 files changed, 40 insertions(+), 15 deletions(-)
copy src/it/{reloc-abs-resource-path => reloc-abs-resource-path-exclude}/pom.xml (90%)
copy src/it/{reloc-abs-resource-path => reloc-abs-resource-path-exclude}/src/main/java/Main.java (76%)
copy src/it/{reloc-abs-resource-path/src/main/resources/org/apache/maven/from => reloc-abs-resource-path-exclude/src/main/resources/org/apache/maven/from/a}/test.properties (100%)
copy src/it/{reloc-abs-resource-path/src/main/resources/org/apache/maven/from => reloc-abs-resource-path-exclude/src/main/resources/org/apache/maven/from/b}/test.properties (97%)
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.
[maven-shade-plugin] 01/01: [MSHADE-276] - Upgrade parent to 31
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHADE-276
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit e861b91c62374e7dfc943544957f4fd1552c4042
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Fri Mar 23 17:56:31 2018 +0100
[MSHADE-276] - Upgrade parent to 31
---
pom.xml | 2 +-
src/main/java/org/apache/maven/plugins/shade/DefaultShader.java | 2 +-
src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactId.java | 8 ++++----
.../org/apache/maven/plugins/shade/mojo/ArtifactSelector.java | 4 ++--
.../maven/plugins/shade/resource/ServicesResourceTransformer.java | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 498c090..d09249d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>30</version>
+ <version>31</version>
<relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
</parent>
diff --git a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
index 3f7144a..ec1fb96 100644
--- a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
+++ b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
@@ -558,7 +558,7 @@ public class DefaultShader
List<Relocator> relocators;
- public RelocatorRemapper( List<Relocator> relocators )
+ RelocatorRemapper( List<Relocator> relocators )
{
this.relocators = relocators;
}
diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactId.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactId.java
index 502fddc..6e0da71 100644
--- a/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactId.java
+++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactId.java
@@ -37,17 +37,17 @@ class ArtifactId
private final String classifier;
- public ArtifactId( Dependency dependency )
+ ArtifactId( Dependency dependency )
{
this( dependency.getGroupId(), dependency.getArtifactId(), dependency.getType(), dependency.getClassifier() );
}
- public ArtifactId( Artifact artifact )
+ ArtifactId( Artifact artifact )
{
this( artifact.getGroupId(), artifact.getArtifactId(), artifact.getType(), artifact.getClassifier() );
}
- public ArtifactId( String groupId, String artifactId, String type, String classifier )
+ ArtifactId( String groupId, String artifactId, String type, String classifier )
{
this.groupId = ( groupId != null ) ? groupId : "";
this.artifactId = ( artifactId != null ) ? artifactId : "";
@@ -55,7 +55,7 @@ class ArtifactId
this.classifier = ( classifier != null ) ? classifier : "";
}
- public ArtifactId( String id )
+ ArtifactId( String id )
{
String[] tokens = new String[0];
if ( id != null && id.length() > 0 )
diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactSelector.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactSelector.java
index 93bbd32..fc3a6eb 100644
--- a/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactSelector.java
+++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ArtifactSelector.java
@@ -34,7 +34,7 @@ class ArtifactSelector
private Collection<ArtifactId> excludes;
- public ArtifactSelector( Artifact projectArtifact, ArtifactSet artifactSet, String groupPrefix )
+ ArtifactSelector( Artifact projectArtifact, ArtifactSet artifactSet, String groupPrefix )
{
this( ( artifactSet != null ) ? artifactSet.getIncludes() : null,
( artifactSet != null ) ? artifactSet.getExcludes() : null, groupPrefix );
@@ -45,7 +45,7 @@ class ArtifactSelector
}
}
- public ArtifactSelector( Collection<String> includes, Collection<String> excludes, String groupPrefix )
+ ArtifactSelector( Collection<String> includes, Collection<String> excludes, String groupPrefix )
{
this.includes = toIds( includes );
this.excludes = toIds( excludes );
diff --git a/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java b/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
index 63ba9ba..f1cb9d6 100644
--- a/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
+++ b/src/main/java/org/apache/maven/plugins/shade/resource/ServicesResourceTransformer.java
@@ -165,7 +165,7 @@ public class ServicesResourceTransformer
extends ByteArrayOutputStream
{
- public ServiceStream()
+ ServiceStream()
{
super( 1024 );
}
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.