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 16:56:45 UTC
[maven-shade-plugin] 01/01: [MSHADE-276] - Upgrade parent to 31
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 eecc803ddf9610a9c707483fa3f350fcfede8eb1
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.