Merge pull request #162 from lasselindqvist/issue-161

Issue #161: ITs fail on Java 11

Author: lasselindqvist

src/it/simple/pom.xml

@@ -14,14 +14,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-          <compilerArgs>
-            <arg>-Xlint</arg>
-          </compilerArgs>
-        </configuration>
+        <version>3.8.0</version>
+		<configuration>
+			<release>11</release>
+		</configuration>
       </plugin>
       <plugin>
         <groupId>com.github.wvengen</groupId>
@@ -39,6 +35,14 @@
         <configuration>
           <attach>true</attach>
         </configuration>
+    <dependencies>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <version>2.14.1</version>
+      <scope>runtime</scope>
+    </dependency>
+    </dependencies>
       </plugin>
     </plugins>
   </build>

src/it/simple/proguard.conf

@@ -1,5 +1,3 @@
--libraryjars <java.home>/lib/rt.jar
-
 -dontnote
 -dontwarn
 

src/main/java/com/github/wvengen/maven/proguard/ProGuardMojo.java

@@ -866,6 +866,27 @@ private void attachTextFile(File theFile, String mainClassifier, String suffix)
 
 		}
 	}
+	
+	private Set<File> getAllPluginArtifactDependencies(ProGuardMojo mojo) throws MojoExecutionException {
+		Set<File> files = new HashSet<>(getProguardJars(mojo));
+		for (Artifact artifact : mojo.pluginArtifacts) {
+			files.add(artifact.getFile().getAbsoluteFile());
+			files.addAll(getChildArtifacts(artifact));
+		}
+		
+		return files;
+	}
+
+	private Set<File> getChildArtifacts(Artifact artifact) {
+		Set<File> files = new HashSet<>();
+		for (Object child : artifact.getDependencyTrail()) {
+			if (child instanceof Artifact) {
+				files.add(((Artifact) child).getFile().getAbsoluteFile());
+				files.addAll(getChildArtifacts((Artifact) child));
+			}
+		}
+		return files;
+	}
 
 	private List<File> getProguardJars(ProGuardMojo mojo) throws MojoExecutionException {
 
@@ -984,8 +1005,10 @@ private void proguardMain(Collection<File> proguardJars, List<String> argsList,
 		java.setTaskName("proguard");
 
 		mojo.getLog().info("proguard jar: " + proguardJars);
+		
+		Set<File> allDependencyFiles = getAllPluginArtifactDependencies(mojo);
 
-		for (File p : proguardJars)
+		for (File p : allDependencyFiles)
 			java.createClasspath().createPathElement().setLocation(p);
 		// java.createClasspath().setPath(System.getProperty("java.class.path"));
 		java.setClassname(mojo.proguardMainClass);