Merge pull request #78 from apache/deps

remove deprecated method
apache · Dec 1, 2020 · c6d6a8b · c6d6a8b
2 parents 09aee22 + 336efe0
commit c6d6a8b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -125,11 +125,6 @@
       <version>3.3.0</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-shared-utils</artifactId>
-      <version>3.3.3</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-artifact-transfer</artifactId>

diff --git a/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java b/src/test/java/org/apache/maven/plugins/shade/filter/MinijarFilterTest.java
@@ -35,7 +35,6 @@
 import org.apache.maven.artifact.DefaultArtifact;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.shared.utils.io.Java7Support;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -57,14 +56,13 @@ public void init()
     }
 
     /**
-     * This test will fail on JDK 7 cause the used jdependency needs at least 
-     * JDK 8.
+     * This test will fail on JDK 7 because jdependency needs at least JDK 8.
      */
     @Test
     public void testWithMockProject()
         throws IOException
     {
-        assumeFalse( "Expected to run under JDK8+", Java7Support.isJava7() );
+        assumeFalse( "Expected to run under JDK8+", System.getProperty("java.version").startsWith("1.7") );
 
         ArgumentCaptor<CharSequence> logCaptor = ArgumentCaptor.forClass( CharSequence.class );