* 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