You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/09/29 13:34:37 UTC
[maven-dependency-analyzer] 03/03: [MSHARED-996] Require Java 8
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MSHARED-996
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git
commit 5d382a0a0e44ff6716052c17afb3ceb5ebeca8eb
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Sep 29 15:27:56 2021 +0200
[MSHARED-996] Require Java 8
---
pom.xml | 2 +-
.../analyzer/DefaultProjectDependencyAnalyzer.java | 2 --
.../dependency/analyzer/ProjectDependencyAnalysis.java | 12 ++----------
.../shared/dependency/analyzer/asm/ResultCollector.java | 2 +-
.../analyzer/DefaultProjectDependencyAnalyzerTest.java | 16 ++++++++--------
.../dependency/analyzer/asm/DependencyVisitorTest.java | 2 +-
6 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/pom.xml b/pom.xml
index 98ddda4..83dee6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<properties>
<mavenVersion>3.1.1</mavenVersion>
<surefire.version>2.22.2</surefire.version>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-08-05T13:26:53Z</project.build.outputTimestamp>
</properties>
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
index cb44ddc..363b9f7 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
@@ -153,7 +153,6 @@ public class DefaultProjectDependencyAnalyzer
{
Map<Artifact, Set<String>> artifactClassMap = new LinkedHashMap<>();
- @SuppressWarnings( "unchecked" )
Set<Artifact> dependencyArtifacts = project.getArtifacts();
for ( Artifact artifact : dependencyArtifacts )
@@ -250,7 +249,6 @@ public class DefaultProjectDependencyAnalyzer
private Set<Artifact> buildDeclaredArtifacts( MavenProject project )
{
- @SuppressWarnings( "unchecked" )
Set<Artifact> declaredArtifacts = project.getDependencyArtifacts();
if ( declaredArtifacts == null )
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
index 3f3c1e0..d75ad4b 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
@@ -136,14 +136,7 @@ public class ProjectDependencyAnalysis
public ProjectDependencyAnalysis ignoreNonCompile()
{
Set<Artifact> filteredUnusedDeclared = new HashSet<>( unusedDeclaredArtifacts );
- for ( Iterator<Artifact> iter = filteredUnusedDeclared.iterator(); iter.hasNext(); )
- {
- Artifact artifact = iter.next();
- if ( !artifact.getScope().equals( Artifact.SCOPE_COMPILE ) )
- {
- iter.remove();
- }
- }
+ filteredUnusedDeclared.removeIf( artifact -> !artifact.getScope().equals( Artifact.SCOPE_COMPILE ) );
return new ProjectDependencyAnalysis( usedDeclaredArtifacts, usedUndeclaredArtifacts, filteredUnusedDeclared,
testArtifactsWithNonTestScope );
@@ -302,7 +295,6 @@ public class ProjectDependencyAnalysis
private Set<Artifact> safeCopy( Set<Artifact> set )
{
- return ( set == null ) ? Collections.<Artifact>emptySet()
- : Collections.unmodifiableSet( new LinkedHashSet<>( set ) );
+ return ( set == null ) ? Collections.emptySet() : Collections.unmodifiableSet( new LinkedHashSet<>( set ) );
}
}
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ResultCollector.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ResultCollector.java
index 5dce9a2..0cc5924 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ResultCollector.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ResultCollector.java
@@ -32,7 +32,7 @@ import java.util.Set;
public class ResultCollector
{
- private final Set<String> classes = new HashSet<String>();
+ private final Set<String> classes = new HashSet<>();
/**
* <p>getDependencies.</p>
diff --git a/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java b/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
index ebb85fa..bae0085 100644
--- a/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
+++ b/src/test/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzerTest.java
@@ -138,8 +138,8 @@ public class DefaultProjectDependencyAnalyzerTest
Set<Artifact> usedDeclaredArtifacts = new HashSet<>( Arrays.asList( project1, project2 ) );
ProjectDependencyAnalysis expectedAnalysis =
- new ProjectDependencyAnalysis( usedDeclaredArtifacts, new HashSet<Artifact>(), new HashSet<Artifact>(),
- new HashSet<Artifact>() );
+ new ProjectDependencyAnalysis( usedDeclaredArtifacts, new HashSet<>(), new HashSet<>(),
+ new HashSet<>() );
assertEquals( expectedAnalysis, actualAnalysis );
}
@@ -161,8 +161,8 @@ public class DefaultProjectDependencyAnalyzerTest
Set<Artifact> usedDeclaredArtifacts = Collections.singleton( project1 );
ProjectDependencyAnalysis expectedAnalysis =
- new ProjectDependencyAnalysis( usedDeclaredArtifacts, new HashSet<Artifact>(), new HashSet<Artifact>(),
- new HashSet<Artifact>() );
+ new ProjectDependencyAnalysis( usedDeclaredArtifacts, new HashSet<>(), new HashSet<>(),
+ new HashSet<>() );
assertEquals( expectedAnalysis, actualAnalysis );
}
@@ -450,8 +450,8 @@ public class DefaultProjectDependencyAnalyzerTest
Set<Artifact> unusedDeclaredArtifacts = Collections.singleton( dnsjava );
ProjectDependencyAnalysis expectedAnalysis =
- new ProjectDependencyAnalysis( new HashSet<Artifact>(), new HashSet<Artifact>(), unusedDeclaredArtifacts,
- new HashSet<Artifact>() );
+ new ProjectDependencyAnalysis( new HashSet<>(), new HashSet<>(), unusedDeclaredArtifacts,
+ new HashSet<>() );
assertEquals( expectedAnalysis, actualAnalysis );
}
@@ -487,8 +487,8 @@ public class DefaultProjectDependencyAnalyzerTest
if ( isJavaVersionAtLeast( JavaVersion.JAVA_9 )
&& !properties.containsKey( "maven.compiler.source" ) )
{
- properties.put( "maven.compiler.source", "1.7" );
- properties.put( "maven.compiler.target", "1.7" );
+ properties.put( "maven.compiler.source", "1.8" );
+ properties.put( "maven.compiler.target", "1.8" );
}
String httpsProtocols = System.getProperty( "https.protocols" );
diff --git a/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java b/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
index 64ea041..243bfda 100644
--- a/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
+++ b/src/test/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitorTest.java
@@ -758,7 +758,7 @@ public class DependencyVisitorTest
private void assertNoClasses()
{
- assertClasses( Collections.<String>emptySet() );
+ assertClasses( Collections.emptySet() );
}
private void assertClasses( String element )