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 2020/06/25 19:48:25 UTC
[maven-resolver] branch master updated: Quick fix - Java 7
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-resolver.git
The following commit(s) were added to refs/heads/master by this push:
new a7b9ab4 Quick fix - Java 7
a7b9ab4 is described below
commit a7b9ab4f08a324bb93d05ab4e5428bea20178249
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Jun 25 21:43:51 2020 +0200
Quick fix - Java 7
---
.../src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java | 4 ++--
.../org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java | 2 +-
.../aether/internal/impl/collect/DefaultDependencyCollector.java | 4 ++--
.../aether/internal/impl/DefaultRemoteRepositoryManagerTest.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java b/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
index 234f442..a2c1c8b 100644
--- a/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
+++ b/maven-resolver-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
@@ -70,7 +70,7 @@ public final class DefaultDependencyNode
{
this.dependency = dependency;
artifact = ( dependency != null ) ? dependency.getArtifact() : null;
- children = new ArrayList<DependencyNode>( 0 );
+ children = new ArrayList<>( 0 );
aliases = Collections.emptyList();
relocations = Collections.emptyList();
repositories = Collections.emptyList();
@@ -88,7 +88,7 @@ public final class DefaultDependencyNode
public DefaultDependencyNode( Artifact artifact )
{
this.artifact = artifact;
- children = new ArrayList<DependencyNode>( 0 );
+ children = new ArrayList<>( 0 );
aliases = Collections.emptyList();
relocations = Collections.emptyList();
repositories = Collections.emptyList();
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java
index 3ef336c..61d4f62 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java
@@ -124,7 +124,7 @@ public class DefaultUpdatePolicyAnalyzer
try
{
String s = policy.substring( RepositoryPolicy.UPDATE_POLICY_INTERVAL.length() + 1 );
- minutes = Integer.valueOf( s );
+ minutes = Integer.parseInt( s );
}
catch ( RuntimeException e )
{
diff --git a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
index 117e93a..7b152a8 100644
--- a/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
+++ b/maven-resolver-impl/src/main/java/org/eclipse/aether/internal/impl/collect/DefaultDependencyCollector.java
@@ -157,7 +157,7 @@ public class DefaultDependencyCollector
List<Dependency> dependencies = request.getDependencies();
List<Dependency> managedDependencies = request.getManagedDependencies();
- Map<String, Object> stats = new LinkedHashMap<String, Object>();
+ Map<String, Object> stats = new LinkedHashMap<>();
long time1 = System.nanoTime();
DefaultDependencyNode node;
@@ -317,7 +317,7 @@ public class DefaultDependencyCollector
{
int initialCapacity = dominant.size() + recessive.size();
result = new ArrayList<>( initialCapacity );
- Collection<String> ids = new HashSet<String>( initialCapacity, 1.0f );
+ Collection<String> ids = new HashSet<>( initialCapacity, 1.0f );
for ( Dependency dependency : dominant )
{
ids.add( getId( dependency.getArtifact() ) );
diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
index b654f9b..ecf1ba1 100644
--- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
+++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
@@ -284,7 +284,7 @@ public class DefaultRemoteRepositoryManagerTest
else if ( policy != null && policy.startsWith( RepositoryPolicy.UPDATE_POLICY_INTERVAL ) )
{
String s = policy.substring( RepositoryPolicy.UPDATE_POLICY_INTERVAL.length() + 1 );
- return Integer.valueOf( s );
+ return Integer.parseInt( s );
}
else
{