[MSHADE-276] - Upgrade parent to 31

diff --git a/pom.xml b/pom.xml
index 498c090..d09249d 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 );
         }