diff --git a/pom.xml b/pom.xml index bfbf8142..7b98ff9c 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ org.apache.maven.shared maven-artifact-transfer - 0.9.0 + 0.13.1 junit diff --git a/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java b/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java index 749e0511..4042f6cf 100644 --- a/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java +++ b/src/main/java/org/codehaus/mojo/flatten/FlattenMojo.java @@ -52,11 +52,11 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.MavenProject; -import org.apache.maven.shared.dependencies.resolve.DependencyResolver; import org.apache.maven.shared.dependency.tree.DependencyNode; import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder; import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException; import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor; +import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver; import org.codehaus.mojo.flatten.cifriendly.CiInterpolator; import org.codehaus.mojo.flatten.model.resolution.FlattenModelResolver; import org.codehaus.plexus.util.StringUtils; @@ -297,7 +297,7 @@ public class FlattenMojo * * * resolveCiFriendliesOnly - * Only resolves variables revision, sha1 and changelist. Keeps everything else. + * Only resolves variables revision, sha1 and changelist. Keeps everything else. * See Maven CI Friendly for further details. * * diff --git a/src/main/java/org/codehaus/mojo/flatten/model/resolution/FlattenModelResolver.java b/src/main/java/org/codehaus/mojo/flatten/model/resolution/FlattenModelResolver.java index 38bfd92e..b43f2fe1 100644 --- a/src/main/java/org/codehaus/mojo/flatten/model/resolution/FlattenModelResolver.java +++ b/src/main/java/org/codehaus/mojo/flatten/model/resolution/FlattenModelResolver.java @@ -33,9 +33,9 @@ import org.apache.maven.model.resolution.UnresolvableModelException; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingRequest; -import org.apache.maven.shared.artifact.resolve.ArtifactResult; -import org.apache.maven.shared.dependencies.resolve.DependencyResolver; -import org.apache.maven.shared.dependencies.resolve.DependencyResolverException; +import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult; +import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver; +import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException; import java.io.File; import java.util.List; diff --git a/src/test/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultTestDependencyResolver.java b/src/test/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultTestDependencyResolver.java new file mode 100644 index 00000000..ed88e13d --- /dev/null +++ b/src/test/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultTestDependencyResolver.java @@ -0,0 +1,5 @@ +package org.apache.maven.shared.transfer.dependencies.resolve.internal; + +public class DefaultTestDependencyResolver extends DefaultDependencyResolver +{ +} \ No newline at end of file diff --git a/src/test/java/org/codehaus/mojo/flatten/CreateEffectivePomTest.java b/src/test/java/org/codehaus/mojo/flatten/CreateEffectivePomTest.java index 69fc6db0..02446c1f 100644 --- a/src/test/java/org/codehaus/mojo/flatten/CreateEffectivePomTest.java +++ b/src/test/java/org/codehaus/mojo/flatten/CreateEffectivePomTest.java @@ -37,7 +37,8 @@ import org.apache.maven.model.profile.ProfileSelector; import org.apache.maven.project.DefaultProjectBuildingRequest; import org.apache.maven.project.MavenProject; -import org.apache.maven.shared.dependencies.resolve.internal.DefaultDependencyResolver; +import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver; +import org.apache.maven.shared.transfer.dependencies.resolve.internal.DefaultTestDependencyResolver; import org.codehaus.mojo.flatten.model.resolution.FlattenModelResolver; import org.junit.Test; @@ -82,7 +83,7 @@ public void testCreateEffectivePom() setDeclaredField( artifactFactory, "artifactHandlerManager", artifactHandlerManager ); Map artifactHandlers = new HashMap(); setDeclaredField( artifactHandlerManager, "artifactHandlers", artifactHandlers ); - DefaultDependencyResolver depencencyResolver = new DefaultDependencyResolver(); + DependencyResolver depencencyResolver = new DefaultTestDependencyResolver(); DefaultProjectBuildingRequest projectBuildingRequest = new DefaultProjectBuildingRequest(); FlattenModelResolver resolver = new FlattenModelResolver( localRepository, artifactFactory, depencencyResolver, projectBuildingRequest, Collections.emptyList() );