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/14 12:26:03 UTC
[maven-shade-plugin] 01/01: [MSHADE-313] Minimize jar should
respect implementations under /META-INF/services/
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit 8278c9f28d94f8af6d98655b3db7bd295b9785aa
Author: rfscholte <rf...@apache.org>
AuthorDate: Sun Apr 14 14:25:51 2019 +0200
[MSHADE-313] Minimize jar should respect implementations under /META-INF/services/
---
pom.xml | 6 +-
.../dependency-service}/pom.xml | 2 +-
.../src/main/java/DependencyReferencedClass.java} | 6 +-
.../src/main/java/DependencyServiceClass.java} | 7 +-
.../src/main/java/DependencyServiceInterface.java} | 6 +-
.../main/java/DependencyUnreferencedClass.java} | 6 +-
.../META-INF/services/DependencyServiceInterface} | 2 +-
.../invoker.properties | 0
.../pom.xml | 4 +-
.../test/pom.xml | 8 +-
.../test/src/main/java/Main.java | 9 +-
.../unused-service}/pom.xml | 2 +-
.../src/main/java/UnusedServiceClass.java} | 2 +-
.../src/main/java/UnusedServiceInterface.java} | 2 +-
.../META-INF/services/UnusedServiceInterface} | 2 +-
.../used-service}/pom.xml | 10 +-
.../src/main/java/SomeReferencedClass.java | 9 +-
.../src/main/java/SomeServiceClass.java | 0
.../src/main/java/SomeServiceInterface.java | 0
.../src/main/java/SomeUnreferencedClass.java | 0
.../META-INF/services/SomeServiceInterface | 0
.../verify.bsh | 12 ++-
.../maven/plugins/shade/filter/MinijarFilter.java | 108 ++++++++++++---------
23 files changed, 124 insertions(+), 79 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/service/pom.xml b/src/it/MSHADE-313_minimized-services/dependency-service/pom.xml
similarity index 95%
copy from src/it/MSHADE-313/service/pom.xml
copy to src/it/MSHADE-313_minimized-services/dependency-service/pom.xml
index 3dc87e2..9c589d5 100644
--- a/src/it/MSHADE-313/service/pom.xml
+++ b/src/it/MSHADE-313_minimized-services/dependency-service/pom.xml
@@ -23,6 +23,6 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.shade.mj</groupId>
- <artifactId>service</artifactId>
+ <artifactId>dependency-service</artifactId>
<version>1.0</version>
</project>
diff --git a/src/it/MSHADE-313/test/src/main/java/Main.java b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyReferencedClass.java
similarity index 94%
copy from src/it/MSHADE-313/test/src/main/java/Main.java
copy to src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyReferencedClass.java
index 293e02c..4c0bc26 100644
--- a/src/it/MSHADE-313/test/src/main/java/Main.java
+++ b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyReferencedClass.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,6 +17,6 @@
* under the License.
*/
-public class Main
+public class DependencyReferencedClass
{
}
diff --git a/src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyServiceClass.java
similarity index 84%
copy from src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java
copy to src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyServiceClass.java
index afc0f5f..8820be7 100644
--- a/src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java
+++ b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyServiceClass.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,6 +17,7 @@
* under the License.
*/
-public class SomeReferencedClass
+public class DependencyServiceClass implements DependencyServiceInterface
{
+ private static DependencyReferencedClass anEssentialDependency;
}
diff --git a/src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyServiceInterface.java
similarity index 94%
copy from src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java
copy to src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyServiceInterface.java
index afc0f5f..b32026a 100644
--- a/src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java
+++ b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyServiceInterface.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,6 +17,6 @@
* under the License.
*/
-public class SomeReferencedClass
+public interface DependencyServiceInterface
{
}
diff --git a/src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyUnreferencedClass.java
similarity index 94%
copy from src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java
copy to src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyUnreferencedClass.java
index afc0f5f..20d838c 100644
--- a/src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java
+++ b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/java/DependencyUnreferencedClass.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,6 +17,6 @@
* under the License.
*/
-public class SomeReferencedClass
+public class DependencyUnreferencedClass
{
}
diff --git a/src/it/MSHADE-313/service/src/main/resources/META-INF/services/SomeServiceInterface b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/resources/META-INF/services/DependencyServiceInterface
similarity index 88%
copy from src/it/MSHADE-313/service/src/main/resources/META-INF/services/SomeServiceInterface
copy to src/it/MSHADE-313_minimized-services/dependency-service/src/main/resources/META-INF/services/DependencyServiceInterface
index 5af3e8e..2b68806 100644
--- a/src/it/MSHADE-313/service/src/main/resources/META-INF/services/SomeServiceInterface
+++ b/src/it/MSHADE-313_minimized-services/dependency-service/src/main/resources/META-INF/services/DependencyServiceInterface
@@ -16,5 +16,5 @@
# specific language governing permissions and limitations
# under the License.
#
- SomeServiceClass # Please do not remove comments or whitespace; they are part of the IT test.
+ DependencyServiceClass # Please do not remove comments or whitespace; they are part of the IT test.
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 91%
rename from src/it/MSHADE-313/pom.xml
rename to src/it/MSHADE-313_minimized-services/pom.xml
index 0eab97c..543e162 100644
--- a/src/it/MSHADE-313/pom.xml
+++ b/src/it/MSHADE-313_minimized-services/pom.xml
@@ -33,7 +33,9 @@ under the License.
</description>
<modules>
- <module>service</module>
+ <module>unused-service</module>
+ <module>used-service</module>
+ <module>dependency-service</module>
<module>test</module>
</modules>
</project>
diff --git a/src/it/MSHADE-313/test/pom.xml b/src/it/MSHADE-313_minimized-services/test/pom.xml
similarity index 90%
rename from src/it/MSHADE-313/test/pom.xml
rename to src/it/MSHADE-313_minimized-services/test/pom.xml
index b0ecdaa..cb51ef6 100644
--- a/src/it/MSHADE-313/test/pom.xml
+++ b/src/it/MSHADE-313_minimized-services/test/pom.xml
@@ -29,7 +29,13 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven.its.shade.mj</groupId>
- <artifactId>service</artifactId>
+ <artifactId>unused-service</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.its.shade.mj</groupId>
+ <artifactId>used-service</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
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 84%
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
index 293e02c..3f22717 100644
--- a/src/it/MSHADE-313/test/src/main/java/Main.java
+++ b/src/it/MSHADE-313_minimized-services/test/src/main/java/Main.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,6 +17,11 @@
* under the License.
*/
+import java.util.ServiceLoader;
+
public class Main
{
+ public static void main( String[] args ) {
+ ServiceLoader.load( SomeServiceInterface.class );
+ }
}
diff --git a/src/it/MSHADE-313/service/pom.xml b/src/it/MSHADE-313_minimized-services/unused-service/pom.xml
similarity index 95%
copy from src/it/MSHADE-313/service/pom.xml
copy to src/it/MSHADE-313_minimized-services/unused-service/pom.xml
index 3dc87e2..3058161 100644
--- a/src/it/MSHADE-313/service/pom.xml
+++ b/src/it/MSHADE-313_minimized-services/unused-service/pom.xml
@@ -23,6 +23,6 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.shade.mj</groupId>
- <artifactId>service</artifactId>
+ <artifactId>unused-service</artifactId>
<version>1.0</version>
</project>
diff --git a/src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java b/src/it/MSHADE-313_minimized-services/unused-service/src/main/java/UnusedServiceClass.java
similarity index 92%
copy from src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java
copy to src/it/MSHADE-313_minimized-services/unused-service/src/main/java/UnusedServiceClass.java
index afc0f5f..893d019 100644
--- a/src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java
+++ b/src/it/MSHADE-313_minimized-services/unused-service/src/main/java/UnusedServiceClass.java
@@ -17,6 +17,6 @@
* under the License.
*/
-public class SomeReferencedClass
+public class UnusedServiceClass implements UnusedServiceInterface
{
}
diff --git a/src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java b/src/it/MSHADE-313_minimized-services/unused-service/src/main/java/UnusedServiceInterface.java
similarity index 95%
copy from src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java
copy to src/it/MSHADE-313_minimized-services/unused-service/src/main/java/UnusedServiceInterface.java
index afc0f5f..f1654b6 100644
--- a/src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java
+++ b/src/it/MSHADE-313_minimized-services/unused-service/src/main/java/UnusedServiceInterface.java
@@ -17,6 +17,6 @@
* under the License.
*/
-public class SomeReferencedClass
+public interface UnusedServiceInterface
{
}
diff --git a/src/it/MSHADE-313/service/src/main/resources/META-INF/services/SomeServiceInterface b/src/it/MSHADE-313_minimized-services/unused-service/src/main/resources/META-INF/services/UnusedServiceInterface
similarity index 89%
copy from src/it/MSHADE-313/service/src/main/resources/META-INF/services/SomeServiceInterface
copy to src/it/MSHADE-313_minimized-services/unused-service/src/main/resources/META-INF/services/UnusedServiceInterface
index 5af3e8e..1dd5c84 100644
--- a/src/it/MSHADE-313/service/src/main/resources/META-INF/services/SomeServiceInterface
+++ b/src/it/MSHADE-313_minimized-services/unused-service/src/main/resources/META-INF/services/UnusedServiceInterface
@@ -16,5 +16,5 @@
# specific language governing permissions and limitations
# under the License.
#
- SomeServiceClass # Please do not remove comments or whitespace; they are part of the IT test.
+ UnusedServiceClass # Please do not remove comments or whitespace; they are part of the IT test.
diff --git a/src/it/MSHADE-313/service/pom.xml b/src/it/MSHADE-313_minimized-services/used-service/pom.xml
similarity index 79%
rename from src/it/MSHADE-313/service/pom.xml
rename to src/it/MSHADE-313_minimized-services/used-service/pom.xml
index 3dc87e2..342cf2d 100644
--- a/src/it/MSHADE-313/service/pom.xml
+++ b/src/it/MSHADE-313_minimized-services/used-service/pom.xml
@@ -23,6 +23,14 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.shade.mj</groupId>
- <artifactId>service</artifactId>
+ <artifactId>used-service</artifactId>
<version>1.0</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.shade.mj</groupId>
+ <artifactId>dependency-service</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
</project>
diff --git a/src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java b/src/it/MSHADE-313_minimized-services/used-service/src/main/java/SomeReferencedClass.java
similarity index 87%
rename from src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java
rename to src/it/MSHADE-313_minimized-services/used-service/src/main/java/SomeReferencedClass.java
index afc0f5f..6430d7f 100644
--- a/src/it/MSHADE-313/service/src/main/java/SomeReferencedClass.java
+++ b/src/it/MSHADE-313_minimized-services/used-service/src/main/java/SomeReferencedClass.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -17,6 +17,11 @@
* under the License.
*/
+import java.util.ServiceLoader;
+
public class SomeReferencedClass
{
+ {
+ ServiceLoader.load( DependencyServiceInterface.class );
+ }
}
diff --git a/src/it/MSHADE-313/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/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/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/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/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/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/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/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 78%
rename from src/it/MSHADE-313/verify.bsh
rename to src/it/MSHADE-313_minimized-services/verify.bsh
index e3c5d32..2a58a84 100644
--- a/src/it/MSHADE-313/verify.bsh
+++ b/src/it/MSHADE-313_minimized-services/verify.bsh
@@ -22,14 +22,22 @@ import java.util.jar.*;
String[] wanted =
{
"Main.class",
+ "META-INF/services/SomeServiceInterface",
"SomeServiceInterface.class",
"SomeServiceClass.class",
- "SomeReferencedClass.class"
+ "SomeReferencedClass.class",
+ "META-INF/services/DependencyServiceInterface",
+ "DependencyServiceInterface.class",
+ "DependencyServiceClass.class",
+ "DependencyReferencedClass.class"
};
String[] unwanted =
{
- "SomeUnreferencedClass.class"
+ "UnusedServiceInterface.class",
+ "UnusedServiceClass.class",
+ "SomeUnreferencedClass.class",
+ "DependencyUnreferencedClass.class"
};
JarFile jarFile = new JarFile( new File( basedir, "test/target/test-1.0.jar" ) );
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 528caa8..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;
@@ -125,62 +124,79 @@ public class MinijarFilter
private void removeServices( final MavenProject project, final Clazzpath cp )
{
- try
+ boolean repeatScan;
+ do
{
- for ( final String fileName : project.getRuntimeClasspathElements() )
+ repeatScan = false;
+ final Set<Clazz> neededClasses = cp.getClazzes();
+ neededClasses.removeAll( removable );
+ try
{
- try ( final JarFile jar = new JarFile( fileName ) )
+ for ( final String fileName : project.getRuntimeClasspathElements() )
{
- for ( final Enumeration<JarEntry> entries = jar.entries(); entries.hasMoreElements(); )
+ try ( final JarFile jar = new JarFile( fileName ) )
{
- final JarEntry jarEntry = entries.nextElement();
- if ( !jarEntry.getName().startsWith( "META-INF/services/" ) )
+ for ( final Enumeration<JarEntry> entries = jar.entries(); entries.hasMoreElements(); )
{
- continue;
- }
+ final JarEntry jarEntry = entries.nextElement();
+ if ( jarEntry.isDirectory() || !jarEntry.getName().startsWith( "META-INF/services/" ) )
+ {
+ continue;
+ }
- try ( final BufferedReader bufferedReader =
- new BufferedReader( new InputStreamReader( jar.getInputStream( jarEntry ), UTF_8 ) ) )
- {
- for ( String line = bufferedReader.readLine(); line != null;
- line = bufferedReader.readLine() )
+ final String serviceClassName =
+ jarEntry.getName().substring( "META-INF/services/".length() );
+ final boolean isNeededClass = neededClasses.contains( cp.getClazz( serviceClassName ) );
+ if ( !isNeededClass )
+ {
+ continue;
+ }
+
+ try ( final BufferedReader bufferedReader =
+ new BufferedReader( new InputStreamReader( jar.getInputStream( jarEntry ), UTF_8 ) ) )
{
- final String className = line.split( "#", 2 )[0].trim();
- if ( className.isEmpty() )
+ for ( String line = bufferedReader.readLine(); line != null;
+ line = bufferedReader.readLine() )
{
- continue;
+ final String className = line.split( "#", 2 )[0].trim();
+ if ( className.isEmpty() )
+ {
+ continue;
+ }
+
+ final Clazz clazz = cp.getClazz( className );
+ if ( clazz == null || !removable.contains( clazz ) )
+ {
+ continue;
+ }
+
+ 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
}
-
- log.info( className + " was not removed because it is a service" );
- removeClass( cp, className );
}
- }
- catch ( final IOException e )
- {
- log.warn( e.getMessage() );
+ catch ( final IOException e )
+ {
+ log.warn( e.getMessage() );
+ }
}
}
- }
- catch ( final IOException e )
- {
- log.warn( e.getMessage() );
+ catch ( final IOException e )
+ {
+ log.warn( e.getMessage() );
+ }
}
}
+ catch ( final DependencyResolutionRequiredException e )
+ {
+ log.warn( e.getMessage() );
+ }
}
- catch ( final DependencyResolutionRequiredException e )
- {
- log.warn( e.getMessage() );
- }
+ while ( repeatScan );
}
- private void removeClass( final Clazzpath clazzPath, final String className )
+ private void removeClass( final Clazzpath clazzPath, final Clazz clazz )
{
- final Clazz clazz = clazzPath.getClazz( className );
- if ( clazz == null )
- {
- return;
- }
-
removable.remove( clazz );
removable.removeAll( clazz.getTransitiveDependencies() );
}
@@ -218,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( "." ) )
{
@@ -261,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();
}
}
@@ -271,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$", "" );
@@ -294,7 +308,7 @@ public class MinijarFilter
return false;
}
- /** {@inheritDoc} */
+ @Override
public void finished()
{
int classesTotal = classesRemoved + classesKept;