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/12/04 12:59:31 UTC
[maven-dependency-analyzer] branch MSHARED-996 updated (b84544f -> 969fa1a)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MSHARED-996
in repository https://gitbox.apache.org/repos/asf/maven-dependency-analyzer.git.
omit b84544f [MSHARED-996] Require Java 8
new 969fa1a [MSHARED-996] Require Java 8
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b84544f)
\
N -- N -- N refs/heads/MSHARED-996 (969fa1a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[maven-dependency-analyzer] 01/01: [MSHARED-996] Require Java 8
Posted by sl...@apache.org.
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 969fa1a132fe815978a9529820d206732d4f45d3
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Wed Sep 29 15:27:56 2021 +0200
[MSHARED-996] Require Java 8
---
pom.xml | 6 +++---
.../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, 15 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index d5d7c76..9b92d9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<properties>
<mavenVersion>2.0.5</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>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.8.1</version>
+ <version>3.12.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -110,7 +110,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
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 )