You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/04/13 09:37:35 UTC
[maven-shade-plugin] 11/11: [MSHADE-313] Rename IT Remove unused
import Adjust logging (to keep info as clean as possible) Clean up pom
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch MSHADE-313
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit e4321c5c9c3986a1911a75ad91170d6c6a493bad
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Apr 13 11:37:10 2019 +0200
[MSHADE-313] Rename IT
Remove unused import
Adjust logging (to keep info as clean as possible)
Clean up pom
---
pom.xml | 6 +-----
.../dependency-service/pom.xml | 0
.../src/main/java/DependencyReferencedClass.java | 0
.../src/main/java/DependencyServiceClass.java | 0
.../src/main/java/DependencyServiceInterface.java | 0
.../src/main/java/DependencyUnreferencedClass.java | 0
.../META-INF/services/DependencyServiceInterface | 0
.../invoker.properties | 0
.../pom.xml | 0
.../test/pom.xml | 0
.../test/src/main/java/Main.java | 0
.../unused-service/pom.xml | 0
.../src/main/java/UnusedServiceClass.java | 0
.../src/main/java/UnusedServiceInterface.java | 0
.../resources/META-INF/services/UnusedServiceInterface | 0
.../used-service/pom.xml | 0
.../used-service/src/main/java/SomeReferencedClass.java | 0
.../used-service/src/main/java/SomeServiceClass.java | 0
.../src/main/java/SomeServiceInterface.java | 0
.../src/main/java/SomeUnreferencedClass.java | 0
.../resources/META-INF/services/SomeServiceInterface | 0
.../verify.bsh | 0
.../maven/plugins/shade/filter/MinijarFilter.java | 17 +++++++----------
23 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/pom.xml b/pom.xml
index a960b8a..0cd2884 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,12 +208,8 @@
<exclude>src/it/rerun-with-reloc/src/main/resources/some-ordinary-resource.txt</exclude>
<exclude>src/it/rerun-without-reloc/src/main/resources/some-ordinary-resource.txt</exclude>
<exclude>src/it/MSHADE-182/src/main/resources/META-INF/services/relocateme.Service</exclude>
- <exclude>src/it/MSHADE-182/target/classes/META-INF/services/relocateme.Service</exclude>
- <exclude>src/it/MSHADE-182/build.log</exclude>
- <exclude>src/it/MSHADE-313/service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst</exclude>
- <exclude>src/it/MSHADE-313/service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst</exclude>
</excludes>
- </configuration>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/it/MSHADE-313/dependency-service/pom.xml b/src/it/MSHADE-313_minimized-services/dependency-service/pom.xml
similarity index 100%
rename from src/it/MSHADE-313/dependency-service/pom.xml
rename to src/it/MSHADE-313_minimized-services/dependency-service/pom.xml
diff --git a/src/it/MSHADE-313/dependency-service/src/main/java/DependencyReferencedClass.java b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyReferencedClass.java
similarity index 100%
rename from src/it/MSHADE-313/dependency-service/src/main/java/DependencyReferencedClass.java
rename to src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyReferencedClass.java
diff --git a/src/it/MSHADE-313/dependency-service/src/main/java/DependencyServiceClass.java b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyServiceClass.java
similarity index 100%
rename from src/it/MSHADE-313/dependency-service/src/main/java/DependencyServiceClass.java
rename to src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyServiceClass.java
diff --git a/src/it/MSHADE-313/dependency-service/src/main/java/DependencyServiceInterface.java b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyServiceInterface.java
similarity index 100%
rename from src/it/MSHADE-313/dependency-service/src/main/java/DependencyServiceInterface.java
rename to src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyServiceInterface.java
diff --git a/src/it/MSHADE-313/dependency-service/src/main/java/DependencyUnreferencedClass.java b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyUnreferencedClass.java
similarity index 100%
rename from src/it/MSHADE-313/dependency-service/src/main/java/DependencyUnreferencedClass.java
rename to src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyUnreferencedClass.java
diff --git a/src/it/MSHADE-313/dependency-service/src/main/resources/META-INF/services/DependencyServiceInterface b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/resources/META-INF/services/DependencyServiceInterface
similarity index 100%
rename from src/it/MSHADE-313/dependency-service/src/main/resources/META-INF/services/DependencyServiceInterface
rename to src/it/MSHADE-313_minimized-services/dependency-service/src/main/resources/META-INF/services/DependencyServiceInterface
diff --git a/src/it/MSHADE-313/invoker.properties b/src/it/MSHADE-313_minimized-services/invoker.properties
similarity index 100%
rename from src/it/MSHADE-313/invoker.properties
rename to src/it/MSHADE-313_minimized-services/invoker.properties
diff --git a/src/it/MSHADE-313/pom.xml b/src/it/MSHADE-313_minimized-services/pom.xml
similarity index 100%
rename from src/it/MSHADE-313/pom.xml
rename to src/it/MSHADE-313_minimized-services/pom.xml
diff --git a/src/it/MSHADE-313/test/pom.xml b/src/it/MSHADE-313_minimized-services/test/pom.xml
similarity index 100%
rename from src/it/MSHADE-313/test/pom.xml
rename to src/it/MSHADE-313_minimized-services/test/pom.xml
diff --git a/src/it/MSHADE-313/test/src/main/java/Main.java b/src/it/MSHADE-313_minimized-services/test/src/main/java/Main.java
similarity index 100%
rename from src/it/MSHADE-313/test/src/main/java/Main.java
rename to src/it/MSHADE-313_minimized-services/test/src/main/java/Main.java
diff --git a/src/it/MSHADE-313/unused-service/pom.xml b/src/it/MSHADE-313_minimized-services/unused-service/pom.xml
similarity index 100%
rename from src/it/MSHADE-313/unused-service/pom.xml
rename to src/it/MSHADE-313_minimized-services/unused-service/pom.xml
diff --git a/src/it/MSHADE-313/unused-service/src/main/java/UnusedServiceClass.java b/src/it/MSHADE-313_minimized-services/unused-service/src/main/java/UnusedServiceClass.java
similarity index 100%
rename from src/it/MSHADE-313/unused-service/src/main/java/UnusedServiceClass.java
rename to src/it/MSHADE-313_minimized-services/unused-service/src/main/java/UnusedServiceClass.java
diff --git a/src/it/MSHADE-313/unused-service/src/main/java/UnusedServiceInterface.java b/src/it/MSHADE-313_minimized-services/unused-service/src/main/java/UnusedServiceInterface.java
similarity index 100%
rename from src/it/MSHADE-313/unused-service/src/main/java/UnusedServiceInterface.java
rename to src/it/MSHADE-313_minimized-services/unused-service/src/main/java/UnusedServiceInterface.java
diff --git a/src/it/MSHADE-313/unused-service/src/main/resources/META-INF/services/UnusedServiceInterface b/src/it/MSHADE-313_minimized-services/unused-service/src/main/resources/META-INF/services/UnusedServiceInterface
similarity index 100%
rename from src/it/MSHADE-313/unused-service/src/main/resources/META-INF/services/UnusedServiceInterface
rename to src/it/MSHADE-313_minimized-services/unused-service/src/main/resources/META-INF/services/UnusedServiceInterface
diff --git a/src/it/MSHADE-313/used-service/pom.xml b/src/it/MSHADE-313_minimized-services/used-service/pom.xml
similarity index 100%
rename from src/it/MSHADE-313/used-service/pom.xml
rename to src/it/MSHADE-313_minimized-services/used-service/pom.xml
diff --git a/src/it/MSHADE-313/used-service/src/main/java/SomeReferencedClass.java b/src/it/MSHADE-313_minimized-services/used-service/src/main/java/SomeReferencedClass.java
similarity index 100%
rename from src/it/MSHADE-313/used-service/src/main/java/SomeReferencedClass.java
rename to src/it/MSHADE-313_minimized-services/used-service/src/main/java/SomeReferencedClass.java
diff --git a/src/it/MSHADE-313/used-service/src/main/java/SomeServiceClass.java b/src/it/MSHADE-313_minimized-services/used-service/src/main/java/SomeServiceClass.java
similarity index 100%
rename from src/it/MSHADE-313/used-service/src/main/java/SomeServiceClass.java
rename to src/it/MSHADE-313_minimized-services/used-service/src/main/java/SomeServiceClass.java
diff --git a/src/it/MSHADE-313/used-service/src/main/java/SomeServiceInterface.java b/src/it/MSHADE-313_minimized-services/used-service/src/main/java/SomeServiceInterface.java
similarity index 100%
rename from src/it/MSHADE-313/used-service/src/main/java/SomeServiceInterface.java
rename to src/it/MSHADE-313_minimized-services/used-service/src/main/java/SomeServiceInterface.java
diff --git a/src/it/MSHADE-313/used-service/src/main/java/SomeUnreferencedClass.java b/src/it/MSHADE-313_minimized-services/used-service/src/main/java/SomeUnreferencedClass.java
similarity index 100%
rename from src/it/MSHADE-313/used-service/src/main/java/SomeUnreferencedClass.java
rename to src/it/MSHADE-313_minimized-services/used-service/src/main/java/SomeUnreferencedClass.java
diff --git a/src/it/MSHADE-313/used-service/src/main/resources/META-INF/services/SomeServiceInterface b/src/it/MSHADE-313_minimized-services/used-service/src/main/resources/META-INF/services/SomeServiceInterface
similarity index 100%
rename from src/it/MSHADE-313/used-service/src/main/resources/META-INF/services/SomeServiceInterface
rename to src/it/MSHADE-313_minimized-services/used-service/src/main/resources/META-INF/services/SomeServiceInterface
diff --git a/src/it/MSHADE-313/verify.bsh b/src/it/MSHADE-313_minimized-services/verify.bsh
similarity index 100%
rename from src/it/MSHADE-313/verify.bsh
rename to src/it/MSHADE-313_minimized-services/verify.bsh
diff --git a/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java b/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
index e0a8e85..10606d2 100644
--- a/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
+++ b/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
@@ -23,7 +23,6 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.util.IOUtil;
import org.vafer.jdependency.Clazz;
import org.vafer.jdependency.Clazzpath;
import org.vafer.jdependency.ClazzpathUnit;
@@ -171,7 +170,7 @@ public class MinijarFilter
continue;
}
- log.info( className + " was not removed because it is a service" );
+ log.debug( className + " was not removed because it is a service" );
removeClass( cp, clazz );
repeatScan = true; // check whether the found classes use services in turn
}
@@ -235,12 +234,10 @@ public class MinijarFilter
removePackages( artifactUnit.getTransitiveDependencies(), packageNames );
}
- @SuppressWarnings( "rawtypes" )
- private void removePackages( Set clazzes, Set<String> packageNames )
+ private void removePackages( Set<Clazz> clazzes, Set<String> packageNames )
{
- for ( Object clazze : clazzes )
+ for ( Clazz clazz : clazzes )
{
- Clazz clazz = (Clazz) clazze;
String name = clazz.getName();
while ( name.contains( "." ) )
{
@@ -278,7 +275,7 @@ public class MinijarFilter
if ( clazzes.contains( clazz ) //
&& simpleFilter.isSpecificallyIncluded( clazz.getName().replace( '.', '/' ) ) )
{
- log.info( clazz.getName() + " not removed because it was specifically included" );
+ log.debug( clazz.getName() + " not removed because it was specifically included" );
j.remove();
}
}
@@ -288,13 +285,13 @@ public class MinijarFilter
}
}
- /** {@inheritDoc} */
+ @Override
public boolean canFilter( File jar )
{
return true;
}
- /** {@inheritDoc} */
+ @Override
public boolean isFiltered( String classFile )
{
String className = classFile.replace( '/', '.' ).replaceFirst( "\\.class$", "" );
@@ -311,7 +308,7 @@ public class MinijarFilter
return false;
}
- /** {@inheritDoc} */
+ @Override
public void finished()
{
int classesTotal = classesRemoved + classesKept;