You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2020/03/14 21:49:35 UTC
[maven-artifact-transfer] branch MSHARED-863 updated: Fixed
Checkstyle issues.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHARED-863
in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git
The following commit(s) were added to refs/heads/MSHARED-863 by this push:
new ee5e88e Fixed Checkstyle issues.
ee5e88e is described below
commit ee5e88e91274989c16fc399e0322f5a0bdbe323a
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Mar 14 22:49:25 2020 +0100
Fixed Checkstyle issues.
---
.../resolve/internal/Maven30DependencyResolver.java | 16 +++++++++-------
.../resolve/internal/Maven31DependencyResolver.java | 20 ++++++++++----------
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
index b2eac62..b50cd56 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
@@ -19,12 +19,6 @@ package org.apache.maven.shared.transfer.dependencies.resolve.internal;
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -49,6 +43,12 @@ import org.sonatype.aether.resolution.ArtifactResult;
import org.sonatype.aether.util.artifact.DefaultArtifact;
import org.sonatype.aether.util.artifact.DefaultArtifactType;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
/**
*
*/
@@ -89,7 +89,9 @@ class Maven30DependencyResolver
return resolveDependencies( dependencyFilter, request );
}
- private static final Class<?>[] ARG_CLASSES = new Class<?>[] {org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class};
+ private static final Class<?>[] ARG_CLASSES = new Class<?>[] {
+ org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class
+ };
private ArtifactTypeRegistry createTypeRegistry() throws DependencyResolverException
{
diff --git a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
index 6ac0ff4..7a58765 100644
--- a/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
@@ -19,12 +19,6 @@ package org.apache.maven.shared.transfer.dependencies.resolve.internal;
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -49,7 +43,12 @@ import org.eclipse.aether.resolution.ArtifactResult;
import org.eclipse.aether.resolution.DependencyRequest;
import org.eclipse.aether.resolution.DependencyResolutionException;
import org.eclipse.aether.resolution.DependencyResult;
-import org.sonatype.aether.resolution.ArtifactResolutionException;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
/**
*
@@ -91,7 +90,9 @@ class Maven31DependencyResolver
return resolveDependencies( dependencyFilter, request );
}
- private static final Class<?>[] ARG_CLASSES = new Class<?>[] {org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class};
+ private static final Class<?>[] ARG_CLASSES = new Class<?>[] {
+ org.apache.maven.model.Dependency.class, ArtifactTypeRegistry.class
+ };
private ArtifactTypeRegistry createTypeRegistry() throws DependencyResolverException
{
@@ -138,8 +139,7 @@ class Maven31DependencyResolver
* @throws DependencyResolverException in case of a failure of the typeRegistry error.
*/
// CHECKSTYLE_OFF: LineLength
- private List<Dependency> resolveDependencies(Collection<org.apache.maven.model.Dependency> mavenDependencies) throws
- DependencyResolverException
+ private List<Dependency> resolveDependencies( Collection<org.apache.maven.model.Dependency> mavenDependencies ) throws DependencyResolverException
// CHECKSTYLE_ON: LineLength
{
if ( mavenDependencies == null )