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 2018/08/19 09:32:05 UTC
[maven-shade-plugin] 01/01: [MSHADE-296] - Upgrade
maven-artifact-transfer 0.10.0
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHADE-296
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git
commit 0a54658a420e07da7207285d299003d48e2c32ed
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Aug 19 11:31:58 2018 +0200
[MSHADE-296] - Upgrade maven-artifact-transfer 0.10.0
---
pom.xml | 2 +-
src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java | 6 +++---
.../java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java | 9 +++++----
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index a386895..916a527 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>0.9.1</version>
+ <version>0.10.0</version>
</dependency>
<!-- Others -->
<dependency>
diff --git a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
index d7011f9..b7aa788 100644
--- a/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
@@ -65,12 +65,12 @@ import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingResult;
-import org.apache.maven.shared.artifact.DefaultArtifactCoordinate;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
import org.apache.maven.shared.dependency.graph.DependencyNode;
+import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
diff --git a/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java b/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java
index 3e45f9d..fa869c8 100644
--- a/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/shade/mojo/ShadeMojoTest.java
@@ -18,6 +18,7 @@ package org.apache.maven.plugins.shade.mojo;
* specific language governing permissions and limitations
* under the License.
*/
+
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -46,10 +47,10 @@ import org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer;
import org.apache.maven.plugins.shade.resource.ResourceTransformer;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.ArtifactCoordinate;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
-import org.apache.maven.shared.artifact.resolve.ArtifactResult;
+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult;
import org.codehaus.plexus.PlexusTestCase;
/**