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/06/30 20:03:54 UTC
[maven-artifact-transfer] branch MSHARED-698 created (now 3a01c3d)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MSHARED-698
in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git.
at 3a01c3d [MSHARED-698] - Change the package to org.apache.maven.shared.transfer.*
This branch includes the following new commits:
new 3a01c3d [MSHARED-698] - Change the package to org.apache.maven.shared.transfer.*
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-artifact-transfer] 01/01: [MSHARED-698] - Change the package
to org.apache.maven.shared.transfer.*
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHARED-698
in repository https://gitbox.apache.org/repos/asf/maven-artifact-transfer.git
commit 3a01c3d5dec38f6a24051fc80f5c639190d32f9f
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Jun 30 22:03:28 2018 +0200
[MSHARED-698] - Change the package to org.apache.maven.shared.transfer.*
---
src/it/maven-artifact-deployer-plugin/pom.xml | 2 +-
.../artifact/deployer/ArtifactDeployerMojo.java | 6 +++---
src/it/maven-artifact-installer-plugin/pom.xml | 9 ++++----
.../artifact/installer/ArtifactInstallerMojo.java | 6 +++---
src/it/maven-project-deployer-plugin/pom.xml | 2 +-
.../plugin/project/deploy/ProjectDeployerMojo.java | 12 +++++------
src/it/maven-project-installer-plugin/pom.xml | 2 +-
.../project/install/ProjectInstallerMojo.java | 10 ++++-----
.../artifact/ArtifactCoordinate.java | 2 +-
.../artifact/DefaultArtifactCoordinate.java | 2 +-
.../{ => transfer}/artifact/TransferUtils.java | 2 +-
.../artifact/deploy/ArtifactDeployer.java | 2 +-
.../artifact/deploy/ArtifactDeployerException.java | 2 +-
.../deploy/internal/DefaultArtifactDeployer.java | 6 +++---
.../artifact/deploy/internal/Invoker.java | 4 ++--
.../deploy/internal/Maven30ArtifactDeployer.java | 6 +++---
.../deploy/internal/Maven31ArtifactDeployer.java | 6 +++---
.../artifact/install/ArtifactInstaller.java | 2 +-
.../install/ArtifactInstallerException.java | 2 +-
.../install/internal/DefaultArtifactInstaller.java | 6 +++---
.../artifact/install/internal/Invoker.java | 4 ++--
.../install/internal/Maven30ArtifactInstaller.java | 8 ++++----
.../install/internal/Maven31ArtifactInstaller.java | 8 ++++----
.../artifact/resolve/ArtifactResolver.java | 4 ++--
.../resolve/ArtifactResolverException.java | 2 +-
.../artifact/resolve/ArtifactResult.java | 2 +-
.../resolve/internal/DefaultArtifactResolver.java | 10 ++++-----
.../artifact/resolve/internal/Invoker.java | 4 ++--
.../resolve/internal/Maven30ArtifactResolver.java | 14 ++++++-------
.../resolve/internal/Maven30ArtifactResult.java | 8 ++++----
.../resolve/internal/Maven31ArtifactResolver.java | 14 ++++++-------
.../resolve/internal/Maven31ArtifactResult.java | 8 ++++----
.../dependencies/DefaultDependableCoordinate.java | 2 +-
.../dependencies/DependableCoordinate.java | 2 +-
.../{ => transfer}/dependencies/TransferUtils.java | 2 +-
.../dependencies/collect/CollectorResult.java | 2 +-
.../dependencies/collect/DependencyCollector.java | 4 ++--
.../collect/DependencyCollectorException.java | 2 +-
.../internal/DefaultDependencyCollector.java | 10 ++++-----
.../dependencies/collect/internal/Invoker.java | 4 ++--
.../internal/Maven30ArtifactRepositoryAdapter.java | 2 +-
.../collect/internal/Maven30CollectorResult.java | 4 ++--
.../internal/Maven30DependencyCollector.java | 10 ++++-----
.../internal/Maven31ArtifactRepositoryAdapter.java | 2 +-
.../collect/internal/Maven31CollectorResult.java | 4 ++--
.../internal/Maven31DependencyCollector.java | 10 ++++-----
.../dependencies/resolve/DependencyResolver.java | 6 +++---
.../resolve/DependencyResolverException.java | 2 +-
.../dependencies/resolve/DependencyResult.java | 2 +-
.../internal/DefaultDependencyResolver.java | 10 ++++-----
.../dependencies/resolve/internal/Invoker.java | 4 ++--
.../resolve/internal/Maven30ArtifactResult.java | 8 ++++----
.../internal/Maven30DependencyResolver.java | 24 +++++++++++-----------
.../Maven30DependencyResolverException.java | 6 +++---
.../resolve/internal/Maven31ArtifactResult.java | 8 ++++----
.../internal/Maven31DependencyResolver.java | 24 +++++++++++-----------
.../Maven31DependencyResolverException.java | 6 +++---
.../project/NoFileAssignedException.java | 2 +-
.../project/deploy/ProjectDeployer.java | 6 +++---
.../project/deploy/ProjectDeployerRequest.java | 2 +-
.../deploy/internal/DefaultProjectDeployer.java | 14 ++++++-------
.../project/deploy/internal/DualDigester.java | 2 +-
.../project/install/ProjectInstaller.java | 6 +++---
.../project/install/ProjectInstallerRequest.java | 2 +-
.../install/internal/DefaultProjectInstaller.java | 14 ++++++-------
.../repository/RepositoryManager.java | 4 ++--
.../repository/RepositoryManagerException.java | 2 +-
.../internal/DefaultRepositoryManager.java | 8 ++++----
.../repository/internal/Invoker.java | 4 ++--
.../internal/Maven302RepositoryManager.java | 4 ++--
.../internal/Maven30RepositoryManager.java | 8 ++++----
.../internal/Maven31RepositoryManager.java | 8 ++++----
.../artifact/DefaultArtifactCoordinateTest.java | 3 ++-
.../internal/DefaultArtifactDeployerTest.java | 8 ++++----
.../internal/DefaultArtifactInstallerTest.java | 7 ++++---
.../internal/Maven30ArtifactInstallerTest.java | 5 +++--
.../internal/DefaultArtifactResolverTest.java | 11 +++++-----
.../DefaultDependableCoordinateTest.java | 4 ++--
.../internal/DefaultDependencyCollectorTest.java | 14 ++++++-------
.../internal/DefaultDependencyResolverTest.java | 9 ++++----
.../internal/DefaultProjectDeployerTest.java | 11 +++++-----
.../internal/DefaultProjectInstallerTest.java | 9 ++++----
.../internal/Maven30RepositoryManagerTest.java | 6 +++---
83 files changed, 259 insertions(+), 251 deletions(-)
diff --git a/src/it/maven-artifact-deployer-plugin/pom.xml b/src/it/maven-artifact-deployer-plugin/pom.xml
index 42f5672..8c60ed9 100644
--- a/src/it/maven-artifact-deployer-plugin/pom.xml
+++ b/src/it/maven-artifact-deployer-plugin/pom.xml
@@ -63,7 +63,7 @@
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
<version>@project.version@</version>
-<!-- <version>0.9.2-SNAPSHOT</version> -->
+<!-- <version>0.10.0-SNAPSHOT</version> -->
</dependency>
<!-- dependencies to annotations -->
diff --git a/src/it/maven-artifact-deployer-plugin/src/main/java/org/apache/maven/plugin/artifact/deployer/ArtifactDeployerMojo.java b/src/it/maven-artifact-deployer-plugin/src/main/java/org/apache/maven/plugin/artifact/deployer/ArtifactDeployerMojo.java
index d5bf396..039f6f8 100644
--- a/src/it/maven-artifact-deployer-plugin/src/main/java/org/apache/maven/plugin/artifact/deployer/ArtifactDeployerMojo.java
+++ b/src/it/maven-artifact-deployer-plugin/src/main/java/org/apache/maven/plugin/artifact/deployer/ArtifactDeployerMojo.java
@@ -40,9 +40,9 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployer;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
-import org.apache.maven.shared.repository.RepositoryManager;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployer;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerException;
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
/**
* This mojo is implemented to test the ArtifactDeployer part of the maven-artifact-transfer shared component.
diff --git a/src/it/maven-artifact-installer-plugin/pom.xml b/src/it/maven-artifact-installer-plugin/pom.xml
index 308d34f..37320d8 100644
--- a/src/it/maven-artifact-installer-plugin/pom.xml
+++ b/src/it/maven-artifact-installer-plugin/pom.xml
@@ -19,9 +19,10 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
->
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -63,7 +64,7 @@
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
<version>@project.version@</version>
-<!-- <version>0.9.2-SNAPSHOT</version> -->
+<!-- <version>0.10.0-SNAPSHOT</version> -->
</dependency>
<!-- dependencies to annotations -->
diff --git a/src/it/maven-artifact-installer-plugin/src/main/java/org/apache/maven/plugin/artifact/installer/ArtifactInstallerMojo.java b/src/it/maven-artifact-installer-plugin/src/main/java/org/apache/maven/plugin/artifact/installer/ArtifactInstallerMojo.java
index 8bc83ad..2a0bf73 100644
--- a/src/it/maven-artifact-installer-plugin/src/main/java/org/apache/maven/plugin/artifact/installer/ArtifactInstallerMojo.java
+++ b/src/it/maven-artifact-installer-plugin/src/main/java/org/apache/maven/plugin/artifact/installer/ArtifactInstallerMojo.java
@@ -40,9 +40,9 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.install.ArtifactInstaller;
-import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
-import org.apache.maven.shared.repository.RepositoryManager;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstaller;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException;
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
/**
* This mojo is implemented to test the ArtifactInstaller part of the maven-artifact-transfer shared component.
diff --git a/src/it/maven-project-deployer-plugin/pom.xml b/src/it/maven-project-deployer-plugin/pom.xml
index e66bd7a..8252268 100644
--- a/src/it/maven-project-deployer-plugin/pom.xml
+++ b/src/it/maven-project-deployer-plugin/pom.xml
@@ -63,7 +63,7 @@
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
<version>@project.version@</version>
-<!-- <version>0.10.0.MSHARED695-SNAPSHOT</version> -->
+<!-- <version>0.10.0-SNAPSHOT</version> -->
</dependency>
<!-- dependencies to annotations -->
diff --git a/src/it/maven-project-deployer-plugin/src/main/java/org/apache/maven/plugin/project/deploy/ProjectDeployerMojo.java b/src/it/maven-project-deployer-plugin/src/main/java/org/apache/maven/plugin/project/deploy/ProjectDeployerMojo.java
index 17c0934..26c794e 100644
--- a/src/it/maven-project-deployer-plugin/src/main/java/org/apache/maven/plugin/project/deploy/ProjectDeployerMojo.java
+++ b/src/it/maven-project-deployer-plugin/src/main/java/org/apache/maven/plugin/project/deploy/ProjectDeployerMojo.java
@@ -38,12 +38,12 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
-import org.apache.maven.shared.project.NoFileAssignedException;
-import org.apache.maven.shared.project.deploy.ProjectDeployer;
-import org.apache.maven.shared.project.deploy.ProjectDeployerRequest;
-import org.apache.maven.shared.project.install.ProjectInstaller;
-import org.apache.maven.shared.repository.RepositoryManager;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerException;
+import org.apache.maven.shared.transfer.project.NoFileAssignedException;
+import org.apache.maven.shared.transfer.project.deploy.ProjectDeployer;
+import org.apache.maven.shared.transfer.project.deploy.ProjectDeployerRequest;
+import org.apache.maven.shared.transfer.project.install.ProjectInstaller;
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
/**
* This mojo is implemented to test the {@link ProjectInstaller} part of the maven-artifact-transfer shared component.
diff --git a/src/it/maven-project-installer-plugin/pom.xml b/src/it/maven-project-installer-plugin/pom.xml
index 360a954..89b9e27 100644
--- a/src/it/maven-project-installer-plugin/pom.xml
+++ b/src/it/maven-project-installer-plugin/pom.xml
@@ -63,7 +63,7 @@
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
<version>@project.version@</version>
-<!-- <version>0.10.0.MSHARED695-SNAPSHOT</version> -->
+<!-- <version>0.10.0-SNAPSHOT</version> -->
</dependency>
<!-- dependencies to annotations -->
diff --git a/src/it/maven-project-installer-plugin/src/main/java/org/apache/maven/plugin/project/install/ProjectInstallerMojo.java b/src/it/maven-project-installer-plugin/src/main/java/org/apache/maven/plugin/project/install/ProjectInstallerMojo.java
index 706dfd0..2e6a878 100644
--- a/src/it/maven-project-installer-plugin/src/main/java/org/apache/maven/plugin/project/install/ProjectInstallerMojo.java
+++ b/src/it/maven-project-installer-plugin/src/main/java/org/apache/maven/plugin/project/install/ProjectInstallerMojo.java
@@ -37,11 +37,11 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProjectHelper;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
-import org.apache.maven.shared.project.NoFileAssignedException;
-import org.apache.maven.shared.project.install.ProjectInstaller;
-import org.apache.maven.shared.project.install.ProjectInstallerRequest;
-import org.apache.maven.shared.repository.RepositoryManager;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException;
+import org.apache.maven.shared.transfer.project.NoFileAssignedException;
+import org.apache.maven.shared.transfer.project.install.ProjectInstaller;
+import org.apache.maven.shared.transfer.project.install.ProjectInstallerRequest;
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
/**
* This mojo is implemented to test the {@link ProjectInstaller} part of the maven-artifact-transfer shared component.
diff --git a/src/main/java/org/apache/maven/shared/artifact/ArtifactCoordinate.java b/src/main/java/org/apache/maven/shared/transfer/artifact/ArtifactCoordinate.java
similarity index 93%
rename from src/main/java/org/apache/maven/shared/artifact/ArtifactCoordinate.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/ArtifactCoordinate.java
index c854852..eed2eca 100644
--- a/src/main/java/org/apache/maven/shared/artifact/ArtifactCoordinate.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/ArtifactCoordinate.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact;
+package org.apache.maven.shared.transfer.artifact;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinate.java b/src/main/java/org/apache/maven/shared/transfer/artifact/DefaultArtifactCoordinate.java
similarity index 94%
rename from src/main/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinate.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/DefaultArtifactCoordinate.java
index 59438ec..070607d 100644
--- a/src/main/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinate.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/DefaultArtifactCoordinate.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact;
+package org.apache.maven.shared.transfer.artifact;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/artifact/TransferUtils.java b/src/main/java/org/apache/maven/shared/transfer/artifact/TransferUtils.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/artifact/TransferUtils.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/TransferUtils.java
index 5308386..83fa7e1 100644
--- a/src/main/java/org/apache/maven/shared/artifact/TransferUtils.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/TransferUtils.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact;
+package org.apache.maven.shared.transfer.artifact;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/ArtifactDeployer.java
similarity index 97%
rename from src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/deploy/ArtifactDeployer.java
index a7d26c7..768b091 100644
--- a/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployer.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/ArtifactDeployer.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.deploy;
+package org.apache.maven.shared.transfer.artifact.deploy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployerException.java b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/ArtifactDeployerException.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployerException.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/deploy/ArtifactDeployerException.java
index a66f6f0..e9095e2 100644
--- a/src/main/java/org/apache/maven/shared/artifact/deploy/ArtifactDeployerException.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/ArtifactDeployerException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.deploy;
+package org.apache.maven.shared.transfer.artifact.deploy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java
index b0958c6..dd886d8 100644
--- a/src/main/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployer.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployer.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.deploy.internal;
+package org.apache.maven.shared.transfer.artifact.deploy.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ import java.util.Collection;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployer;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployer;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerException;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
diff --git a/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Invoker.java b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Invoker.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/artifact/deploy/internal/Invoker.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Invoker.java
index 6803282..1102163 100644
--- a/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Invoker.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Invoker.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.deploy.internal;
+package org.apache.maven.shared.transfer.artifact.deploy.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package org.apache.maven.shared.artifact.deploy.internal;
import java.lang.reflect.InvocationTargetException;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerException;
/**
* Invokes method on objects using reflection.
diff --git a/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven30ArtifactDeployer.java
similarity index 96%
rename from src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven30ArtifactDeployer.java
index a5ac4ed..64d9249 100644
--- a/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven30ArtifactDeployer.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven30ArtifactDeployer.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.deploy.internal;
+package org.apache.maven.shared.transfer.artifact.deploy.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,8 +27,8 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployer;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployer;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.sonatype.aether.RepositorySystem;
diff --git a/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven31ArtifactDeployer.java
similarity index 96%
rename from src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven31ArtifactDeployer.java
index 84c8620..82dbf8f 100644
--- a/src/main/java/org/apache/maven/shared/artifact/deploy/internal/Maven31ArtifactDeployer.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/deploy/internal/Maven31ArtifactDeployer.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.deploy.internal;
+package org.apache.maven.shared.transfer.artifact.deploy.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,8 +27,8 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployer;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployer;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.eclipse.aether.RepositorySystem;
diff --git a/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java b/src/main/java/org/apache/maven/shared/transfer/artifact/install/ArtifactInstaller.java
similarity index 97%
rename from src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/install/ArtifactInstaller.java
index 92c2973..5ca2f7c 100644
--- a/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstaller.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/install/ArtifactInstaller.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.install;
+package org.apache.maven.shared.transfer.artifact.install;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstallerException.java b/src/main/java/org/apache/maven/shared/transfer/artifact/install/ArtifactInstallerException.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstallerException.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/install/ArtifactInstallerException.java
index a976328..c829443 100644
--- a/src/main/java/org/apache/maven/shared/artifact/install/ArtifactInstallerException.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/install/ArtifactInstallerException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.install;
+package org.apache.maven.shared.transfer.artifact.install;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java
index 06ba7a8..61ee226 100644
--- a/src/main/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstaller.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstaller.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.install.internal;
+package org.apache.maven.shared.transfer.artifact.install.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ import java.util.Collection;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.install.ArtifactInstaller;
-import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstaller;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
diff --git a/src/main/java/org/apache/maven/shared/artifact/install/internal/Invoker.java b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Invoker.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/artifact/install/internal/Invoker.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Invoker.java
index 252942e..f748e04 100644
--- a/src/main/java/org/apache/maven/shared/artifact/install/internal/Invoker.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Invoker.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.install.internal;
+package org.apache.maven.shared.transfer.artifact.install.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package org.apache.maven.shared.artifact.install.internal;
import java.lang.reflect.InvocationTargetException;
-import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException;
/**
* Invokes method on objects using reflection.
diff --git a/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven30ArtifactInstaller.java
similarity index 93%
rename from src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven30ArtifactInstaller.java
index 9994050..013568c 100644
--- a/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstaller.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven30ArtifactInstaller.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.install.internal;
+package org.apache.maven.shared.transfer.artifact.install.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,9 +27,9 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.shared.artifact.install.ArtifactInstaller;
-import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
-import org.apache.maven.shared.repository.RepositoryManager;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstaller;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException;
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.sonatype.aether.RepositorySystem;
diff --git a/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven31ArtifactInstaller.java
similarity index 93%
rename from src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven31ArtifactInstaller.java
index 090a8a6..236c0cf 100644
--- a/src/main/java/org/apache/maven/shared/artifact/install/internal/Maven31ArtifactInstaller.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven31ArtifactInstaller.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.install.internal;
+package org.apache.maven.shared.transfer.artifact.install.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,9 +27,9 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.shared.artifact.install.ArtifactInstaller;
-import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
-import org.apache.maven.shared.repository.RepositoryManager;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstaller;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException;
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.eclipse.aether.RepositorySystem;
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/ArtifactResolver.java
similarity index 96%
rename from src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/resolve/ArtifactResolver.java
index 65fb591..0491023 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/ArtifactResolver.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.resolve;
+package org.apache.maven.shared.transfer.artifact.resolve;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package org.apache.maven.shared.artifact.resolve;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate;
/**
* Resolves the artifact, i.e download the file when required and attach it to the artifact
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolverException.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/ArtifactResolverException.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolverException.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/resolve/ArtifactResolverException.java
index dbcf74a..68eeb14 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResolverException.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/ArtifactResolverException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.resolve;
+package org.apache.maven.shared.transfer.artifact.resolve;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResult.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/ArtifactResult.java
similarity index 91%
rename from src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResult.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/resolve/ArtifactResult.java
index d567b89..bc89ff0 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/ArtifactResult.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.resolve;
+package org.apache.maven.shared.transfer.artifact.resolve;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java
similarity index 94%
rename from src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java
index 5c5cd61..e778630 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolver.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.resolve.internal;
+package org.apache.maven.shared.transfer.artifact.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,10 +21,10 @@ package org.apache.maven.shared.artifact.resolve.internal;
import org.apache.maven.artifact.Artifact;
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.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Invoker.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Invoker.java
similarity index 96%
rename from src/main/java/org/apache/maven/shared/artifact/resolve/internal/Invoker.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Invoker.java
index e08f72d..d3ff34e 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Invoker.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Invoker.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.resolve.internal;
+package org.apache.maven.shared.transfer.artifact.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package org.apache.maven.shared.artifact.resolve.internal;
import java.lang.reflect.InvocationTargetException;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
/**
* Invokes method on objects using reflection.
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResolver.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResolver.java
index bfbb525..fa9f7b3 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResolver.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.resolve.internal;
+package org.apache.maven.shared.transfer.artifact.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,9 +24,9 @@ import java.util.List;
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
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.transfer.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.sonatype.aether.RepositorySystem;
@@ -55,7 +55,7 @@ class Maven30ArtifactResolver
@Override
// CHECKSTYLE_OFF: LineLength
- public org.apache.maven.shared.artifact.resolve.ArtifactResult resolveArtifact( ProjectBuildingRequest buildingRequest,
+ public org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult resolveArtifact( ProjectBuildingRequest buildingRequest,
org.apache.maven.artifact.Artifact mavenArtifact )
throws ArtifactResolverException
// CHECKSTYLE_ON: LineLength
@@ -68,7 +68,7 @@ class Maven30ArtifactResolver
@Override
// CHECKSTYLE_OFF: LineLength
- public org.apache.maven.shared.artifact.resolve.ArtifactResult resolveArtifact( ProjectBuildingRequest buildingRequest,
+ public org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult resolveArtifact( ProjectBuildingRequest buildingRequest,
ArtifactCoordinate coordinate )
throws ArtifactResolverException
// CHECKSTYLE_ON: LineLength
@@ -81,7 +81,7 @@ class Maven30ArtifactResolver
}
// CHECKSTYLE_OFF: LineLength
- private org.apache.maven.shared.artifact.resolve.ArtifactResult resolveArtifact( ProjectBuildingRequest buildingRequest,
+ private org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult resolveArtifact( ProjectBuildingRequest buildingRequest,
Artifact aetherArtifact )
throws ArtifactResolverException
// CHECKSTYLE_ON: LineLength
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResult.java
similarity index 81%
rename from src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResult.java
index 8c4594b..8358096 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven30ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven30ArtifactResult.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.resolve.internal;
+package org.apache.maven.shared.transfer.artifact.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,18 +20,18 @@ package org.apache.maven.shared.artifact.resolve.internal;
*/
import org.apache.maven.RepositoryUtils;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
import org.sonatype.aether.artifact.Artifact;
import org.sonatype.aether.resolution.ArtifactResult;
/**
- * {@link org.apache.maven.shared.artifact.resolve.ArtifactResult} wrapper for {@link ArtifactResult}
+ * {@link org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult} wrapper for {@link ArtifactResult}
*
* @author Robert Scholte
* @since 3.0
*/
class Maven30ArtifactResult
- implements org.apache.maven.shared.artifact.resolve.ArtifactResult
+ implements org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult
{
private final ArtifactResult artifactResult;
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven31ArtifactResolver.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven31ArtifactResolver.java
index 351e732..b326e53 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven31ArtifactResolver.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.resolve.internal;
+package org.apache.maven.shared.transfer.artifact.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,9 +24,9 @@ import java.util.List;
import org.apache.maven.RepositoryUtils;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
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.transfer.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.eclipse.aether.RepositorySystem;
@@ -55,7 +55,7 @@ class Maven31ArtifactResolver
@Override
// CHECKSTYLE_OFF: LineLength
- public org.apache.maven.shared.artifact.resolve.ArtifactResult resolveArtifact( ProjectBuildingRequest buildingRequest,
+ public org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult resolveArtifact( ProjectBuildingRequest buildingRequest,
org.apache.maven.artifact.Artifact mavenArtifact )
throws ArtifactResolverException
// CHECKSTYLE_ON: LineLength
@@ -68,7 +68,7 @@ class Maven31ArtifactResolver
@Override
// CHECKSTYLE_OFF: LineLength
- public org.apache.maven.shared.artifact.resolve.ArtifactResult resolveArtifact( ProjectBuildingRequest buildingRequest,
+ public org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult resolveArtifact( ProjectBuildingRequest buildingRequest,
ArtifactCoordinate coordinate )
throws ArtifactResolverException
// CHECKSTYLE_ON: LineLength
@@ -81,7 +81,7 @@ class Maven31ArtifactResolver
}
// CHECKSTYLE_OFF: LineLength
- private org.apache.maven.shared.artifact.resolve.ArtifactResult resolveArtifact( ProjectBuildingRequest buildingRequest,
+ private org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult resolveArtifact( ProjectBuildingRequest buildingRequest,
Artifact aetherArtifact )
throws ArtifactResolverException
// CHECKSTYLE_ON: LineLength
diff --git a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResult.java b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven31ArtifactResult.java
similarity index 81%
rename from src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResult.java
rename to src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven31ArtifactResult.java
index 447849d..055ee22 100644
--- a/src/main/java/org/apache/maven/shared/artifact/resolve/internal/Maven31ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/transfer/artifact/resolve/internal/Maven31ArtifactResult.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.resolve.internal;
+package org.apache.maven.shared.transfer.artifact.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,18 +20,18 @@ package org.apache.maven.shared.artifact.resolve.internal;
*/
import org.apache.maven.RepositoryUtils;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
import org.eclipse.aether.resolution.ArtifactResult;
import org.eclipse.aether.artifact.Artifact;
/**
- * {@link org.apache.maven.shared.artifact.resolve.ArtifactResult} wrapper for {@link ArtifactResult}
+ * {@link org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult} wrapper for {@link ArtifactResult}
*
* @author Robert Scholte
* @since 3.0
*/
class Maven31ArtifactResult
- implements org.apache.maven.shared.artifact.resolve.ArtifactResult
+ implements org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult
{
private final ArtifactResult artifactResult;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/DefaultDependableCoordinate.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/DefaultDependableCoordinate.java
similarity index 94%
rename from src/main/java/org/apache/maven/shared/dependencies/DefaultDependableCoordinate.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/DefaultDependableCoordinate.java
index c32cea4..1619586 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/DefaultDependableCoordinate.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/DefaultDependableCoordinate.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies;
+package org.apache.maven.shared.transfer.dependencies;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/dependencies/DependableCoordinate.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/DependableCoordinate.java
similarity index 94%
rename from src/main/java/org/apache/maven/shared/dependencies/DependableCoordinate.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/DependableCoordinate.java
index 8411af4..e8b7285 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/DependableCoordinate.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/DependableCoordinate.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies;
+package org.apache.maven.shared.transfer.dependencies;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/dependencies/TransferUtils.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/TransferUtils.java
similarity index 96%
rename from src/main/java/org/apache/maven/shared/dependencies/TransferUtils.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/TransferUtils.java
index bf0bb4c..aa87f81 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/TransferUtils.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/TransferUtils.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies;
+package org.apache.maven.shared.transfer.dependencies;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/CollectorResult.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/CollectorResult.java
similarity index 91%
rename from src/main/java/org/apache/maven/shared/dependencies/collect/CollectorResult.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/collect/CollectorResult.java
index ffb8126..f7b8809 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/CollectorResult.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/CollectorResult.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.collect;
+package org.apache.maven.shared.transfer.dependencies.collect;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/DependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/DependencyCollector.java
similarity index 93%
rename from src/main/java/org/apache/maven/shared/dependencies/collect/DependencyCollector.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/collect/DependencyCollector.java
index ce996ed..2134776 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/DependencyCollector.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/DependencyCollector.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.collect;
+package org.apache.maven.shared.transfer.dependencies.collect;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@ package org.apache.maven.shared.dependencies.collect;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.dependencies.DependableCoordinate;
+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
/**
* Will only download the pom files when not available, never the artifact.
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/DependencyCollectorException.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/DependencyCollectorException.java
similarity index 92%
rename from src/main/java/org/apache/maven/shared/dependencies/collect/DependencyCollectorException.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/collect/DependencyCollectorException.java
index 700d1cb..c959b05 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/DependencyCollectorException.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/DependencyCollectorException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.collect;
+package org.apache.maven.shared.transfer.dependencies.collect;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/DefaultDependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
similarity index 90%
rename from src/main/java/org/apache/maven/shared/dependencies/collect/internal/DefaultDependencyCollector.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
index 26c7010..6e5ecc7 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/DefaultDependencyCollector.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollector.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.collect.internal;
+package org.apache.maven.shared.transfer.dependencies.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,10 +22,10 @@ package org.apache.maven.shared.dependencies.collect.internal;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.dependencies.DependableCoordinate;
-import org.apache.maven.shared.dependencies.collect.CollectorResult;
-import org.apache.maven.shared.dependencies.collect.DependencyCollector;
-import org.apache.maven.shared.dependencies.collect.DependencyCollectorException;
+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
+import org.apache.maven.shared.transfer.dependencies.collect.CollectorResult;
+import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollector;
+import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollectorException;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Invoker.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Invoker.java
similarity index 94%
rename from src/main/java/org/apache/maven/shared/dependencies/collect/internal/Invoker.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Invoker.java
index f07d5a9..01a8410 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Invoker.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Invoker.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.collect.internal;
+package org.apache.maven.shared.transfer.dependencies.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package org.apache.maven.shared.dependencies.collect.internal;
import java.lang.reflect.InvocationTargetException;
-import org.apache.maven.shared.dependencies.collect.DependencyCollectorException;
+import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollectorException;
/**
* Invokes method on objects using reflection.
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30ArtifactRepositoryAdapter.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30ArtifactRepositoryAdapter.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30ArtifactRepositoryAdapter.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30ArtifactRepositoryAdapter.java
index bab6023..b09ccd4 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30ArtifactRepositoryAdapter.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30ArtifactRepositoryAdapter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.collect.internal;
+package org.apache.maven.shared.transfer.dependencies.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30CollectorResult.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30CollectorResult.java
similarity index 91%
rename from src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30CollectorResult.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30CollectorResult.java
index 0c38e91..f07c10f 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30CollectorResult.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30CollectorResult.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.collect.internal;
+package org.apache.maven.shared.transfer.dependencies.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Set;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.shared.dependencies.collect.CollectorResult;
+import org.apache.maven.shared.transfer.dependencies.collect.CollectorResult;
import org.sonatype.aether.collection.CollectResult;
import org.sonatype.aether.graph.DependencyNode;
import org.sonatype.aether.graph.DependencyVisitor;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30DependencyCollector.java
similarity index 92%
rename from src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30DependencyCollector.java
index 30cbd88..a1abb8c 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven30DependencyCollector.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven30DependencyCollector.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.collect.internal;
+package org.apache.maven.shared.transfer.dependencies.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,10 +27,10 @@ import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.dependencies.DependableCoordinate;
-import org.apache.maven.shared.dependencies.collect.CollectorResult;
-import org.apache.maven.shared.dependencies.collect.DependencyCollector;
-import org.apache.maven.shared.dependencies.collect.DependencyCollectorException;
+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
+import org.apache.maven.shared.transfer.dependencies.collect.CollectorResult;
+import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollector;
+import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollectorException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.sonatype.aether.RepositorySystem;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
index f5b482b..854cf4a 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.collect.internal;
+package org.apache.maven.shared.transfer.dependencies.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31CollectorResult.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31CollectorResult.java
similarity index 91%
rename from src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31CollectorResult.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31CollectorResult.java
index 1686a18..8d46390 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31CollectorResult.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31CollectorResult.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.collect.internal;
+package org.apache.maven.shared.transfer.dependencies.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Set;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.shared.dependencies.collect.CollectorResult;
+import org.apache.maven.shared.transfer.dependencies.collect.CollectorResult;
import org.eclipse.aether.collection.CollectResult;
import org.eclipse.aether.graph.DependencyNode;
import org.eclipse.aether.graph.DependencyVisitor;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31DependencyCollector.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31DependencyCollector.java
similarity index 92%
rename from src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31DependencyCollector.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31DependencyCollector.java
index 4624ed9..cc4430d 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/collect/internal/Maven31DependencyCollector.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31DependencyCollector.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.collect.internal;
+package org.apache.maven.shared.transfer.dependencies.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,10 +27,10 @@ import org.apache.maven.artifact.handler.ArtifactHandler;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.dependencies.DependableCoordinate;
-import org.apache.maven.shared.dependencies.collect.CollectorResult;
-import org.apache.maven.shared.dependencies.collect.DependencyCollector;
-import org.apache.maven.shared.dependencies.collect.DependencyCollectorException;
+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
+import org.apache.maven.shared.transfer.dependencies.collect.CollectorResult;
+import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollector;
+import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollectorException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.eclipse.aether.RepositorySystem;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/DependencyResolver.java
similarity index 92%
rename from src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResolver.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/DependencyResolver.java
index 9182d33..7a066a6 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/DependencyResolver.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.resolve;
+package org.apache.maven.shared.transfer.dependencies.resolve;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,8 +25,8 @@ import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
-import org.apache.maven.shared.artifact.resolve.ArtifactResult;
-import org.apache.maven.shared.dependencies.DependableCoordinate;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult;
+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
/**
* @author Robert Scholte
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResolverException.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/DependencyResolverException.java
similarity index 92%
rename from src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResolverException.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/DependencyResolverException.java
index 816861e..0235cdf 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResolverException.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/DependencyResolverException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.resolve;
+package org.apache.maven.shared.transfer.dependencies.resolve;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/DependencyResult.java
similarity index 91%
rename from src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/DependencyResult.java
index 4fed91d..f839b05 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/DependencyResult.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/DependencyResult.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.resolve;
+package org.apache.maven.shared.transfer.dependencies.resolve;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/DefaultDependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java
similarity index 91%
rename from src/main/java/org/apache/maven/shared/dependencies/resolve/internal/DefaultDependencyResolver.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java
index 1730637..6c8fff6 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/DefaultDependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolver.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.resolve.internal;
+package org.apache.maven.shared.transfer.dependencies.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,10 +25,10 @@ import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
-import org.apache.maven.shared.artifact.resolve.ArtifactResult;
-import org.apache.maven.shared.dependencies.DependableCoordinate;
-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.DependableCoordinate;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Invoker.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Invoker.java
similarity index 93%
rename from src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Invoker.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Invoker.java
index a14619e..75bd3f5 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Invoker.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Invoker.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.resolve.internal;
+package org.apache.maven.shared.transfer.dependencies.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package org.apache.maven.shared.dependencies.resolve.internal;
import java.lang.reflect.InvocationTargetException;
-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
/**
* Invokes method on objects using reflection.
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30ArtifactResult.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30ArtifactResult.java
similarity index 80%
rename from src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30ArtifactResult.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30ArtifactResult.java
index f3274f9..ce1f497 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30ArtifactResult.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.resolve.internal;
+package org.apache.maven.shared.transfer.dependencies.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,18 +20,18 @@ package org.apache.maven.shared.dependencies.resolve.internal;
*/
import org.apache.maven.RepositoryUtils;
-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
import org.sonatype.aether.artifact.Artifact;
import org.sonatype.aether.resolution.ArtifactResult;
/**
- * {@link org.apache.maven.shared.artifact.resolve.ArtifactResult} wrapper for {@link ArtifactResult}
+ * {@link org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult} wrapper for {@link ArtifactResult}
*
* @author Robert Scholte
* @since 3.0
*/
class Maven30ArtifactResult
- implements org.apache.maven.shared.artifact.resolve.ArtifactResult
+ implements org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult
{
private final ArtifactResult artifactResult;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
similarity index 88%
rename from src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
index 8497cbc..9182330 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolver.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.resolve.internal;
+package org.apache.maven.shared.transfer.dependencies.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -32,9 +32,9 @@ import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
import org.apache.maven.shared.artifact.filter.resolve.transform.SonatypeAetherFilterTransformer;
-import org.apache.maven.shared.dependencies.DependableCoordinate;
-import org.apache.maven.shared.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
@@ -68,7 +68,7 @@ class Maven30DependencyResolver
@Override
// CHECKSTYLE_OFF: LineLength
- public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
+ public Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
DependableCoordinate coordinate,
TransformableFilter dependencyFilter )
// CHECKSTYLE_ON: LineLength
@@ -92,7 +92,7 @@ class Maven30DependencyResolver
@Override
// CHECKSTYLE_OFF: LineLength
- public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
+ public Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
Model model,
TransformableFilter dependencyFilter )
// CHECKSTYLE_ON: LineLength
@@ -145,7 +145,7 @@ class Maven30DependencyResolver
@Override
// CHECKSTYLE_OFF: LineLength
- public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
+ public Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
Collection<org.apache.maven.model.Dependency> mavenDependencies,
Collection<org.apache.maven.model.Dependency> managedMavenDependencies,
TransformableFilter filter )
@@ -205,7 +205,7 @@ class Maven30DependencyResolver
}
// CHECKSTYLE_OFF: LineLength
- private Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
+ private Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
List<RemoteRepository> aetherRepositories,
TransformableFilter dependencyFilter,
CollectRequest request )
@@ -227,14 +227,14 @@ class Maven30DependencyResolver
repositorySystem.resolveDependencies( session, request, depFilter );
// Keep it lazy! Often artifactsResults aren't used, so transforming up front is too expensive
- return new Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>()
+ return new Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult>()
{
@Override
- public Iterator<org.apache.maven.shared.artifact.resolve.ArtifactResult> iterator()
+ public Iterator<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> iterator()
{
// CHECKSTYLE_OFF: LineLength
- Collection<org.apache.maven.shared.artifact.resolve.ArtifactResult> artResults =
- new ArrayList<org.apache.maven.shared.artifact.resolve.ArtifactResult>( dependencyResults.size() );
+ Collection<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> artResults =
+ new ArrayList<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult>( dependencyResults.size() );
// CHECKSTYLE_ON: LineLength
for ( ArtifactResult artifactResult : dependencyResults )
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolverException.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolverException.java
similarity index 85%
rename from src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolverException.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolverException.java
index 23145e4..aa77d3d 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven30DependencyResolverException.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven30DependencyResolverException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.resolve.internal;
+package org.apache.maven.shared.transfer.dependencies.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@ package org.apache.maven.shared.dependencies.resolve.internal;
import java.util.List;
-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
-import org.apache.maven.shared.dependencies.resolve.DependencyResult;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResult;
import org.sonatype.aether.collection.DependencyCollectionException;
import org.sonatype.aether.resolution.ArtifactResolutionException;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31ArtifactResult.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31ArtifactResult.java
similarity index 80%
rename from src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31ArtifactResult.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31ArtifactResult.java
index b3d887f..dba4e8e 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31ArtifactResult.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31ArtifactResult.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.resolve.internal;
+package org.apache.maven.shared.transfer.dependencies.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,18 +20,18 @@ package org.apache.maven.shared.dependencies.resolve.internal;
*/
import org.apache.maven.RepositoryUtils;
-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
import org.eclipse.aether.resolution.ArtifactResult;
import org.eclipse.aether.artifact.Artifact;
/**
- * {@link org.apache.maven.shared.artifact.resolve.ArtifactResult} wrapper for {@link ArtifactResult}
+ * {@link org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult} wrapper for {@link ArtifactResult}
*
* @author Robert Scholte
* @since 3.0
*/
class Maven31ArtifactResult
- implements org.apache.maven.shared.artifact.resolve.ArtifactResult
+ implements org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult
{
private final ArtifactResult artifactResult;
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
similarity index 88%
rename from src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
index 047cfe4..c4f53cf 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolver.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolver.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.resolve.internal;
+package org.apache.maven.shared.transfer.dependencies.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -32,9 +32,9 @@ import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.filter.resolve.TransformableFilter;
import org.apache.maven.shared.artifact.filter.resolve.transform.EclipseAetherFilterTransformer;
-import org.apache.maven.shared.dependencies.DependableCoordinate;
-import org.apache.maven.shared.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.eclipse.aether.RepositorySystem;
@@ -68,7 +68,7 @@ class Maven31DependencyResolver
@Override
// CHECKSTYLE_OFF: LineLength
- public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
+ public Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
DependableCoordinate coordinate,
TransformableFilter dependencyFilter )
throws DependencyResolverException
@@ -92,7 +92,7 @@ class Maven31DependencyResolver
@Override
// CHECKSTYLE_OFF: LineLength
- public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
+ public Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
Model model,
TransformableFilter dependencyFilter )
// CHECKSTYLE_ON: LineLength
@@ -145,7 +145,7 @@ class Maven31DependencyResolver
@Override
// CHECKSTYLE_OFF: LineLength
- public Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
+ public Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
Collection<org.apache.maven.model.Dependency> mavenDependencies,
Collection<org.apache.maven.model.Dependency> managedMavenDependencies,
TransformableFilter filter )
@@ -204,7 +204,7 @@ class Maven31DependencyResolver
}
// CHECKSTYLE_OFF: LineLength
- private Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
+ private Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> resolveDependencies( ProjectBuildingRequest buildingRequest,
List<RemoteRepository> aetherRepositories,
TransformableFilter dependencyFilter,
CollectRequest request )
@@ -227,14 +227,14 @@ class Maven31DependencyResolver
final DependencyResult dependencyResults = repositorySystem.resolveDependencies( session, depRequest );
// Keep it lazy! Often artifactsResults aren't used, so transforming up front is too expensive
- return new Iterable<org.apache.maven.shared.artifact.resolve.ArtifactResult>()
+ return new Iterable<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult>()
{
@Override
- public Iterator<org.apache.maven.shared.artifact.resolve.ArtifactResult> iterator()
+ public Iterator<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> iterator()
{
// CHECKSTYLE_OFF: LineLength
- Collection<org.apache.maven.shared.artifact.resolve.ArtifactResult> artResults =
- new ArrayList<org.apache.maven.shared.artifact.resolve.ArtifactResult>( dependencyResults.getArtifactResults().size() );
+ Collection<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult> artResults =
+ new ArrayList<org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult>( dependencyResults.getArtifactResults().size() );
// CHECKSTYLE_ON: LineLength
for ( ArtifactResult artifactResult : dependencyResults.getArtifactResults() )
diff --git a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolverException.java b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolverException.java
similarity index 83%
rename from src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolverException.java
rename to src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolverException.java
index 833f2a1..c892033 100644
--- a/src/main/java/org/apache/maven/shared/dependencies/resolve/internal/Maven31DependencyResolverException.java
+++ b/src/main/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/Maven31DependencyResolverException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.resolve.internal;
+package org.apache.maven.shared.transfer.dependencies.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@ package org.apache.maven.shared.dependencies.resolve.internal;
import java.util.List;
-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
-import org.apache.maven.shared.dependencies.resolve.DependencyResult;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResult;
import org.eclipse.aether.resolution.DependencyResolutionException;
/**
diff --git a/src/main/java/org/apache/maven/shared/project/NoFileAssignedException.java b/src/main/java/org/apache/maven/shared/transfer/project/NoFileAssignedException.java
similarity index 96%
rename from src/main/java/org/apache/maven/shared/project/NoFileAssignedException.java
rename to src/main/java/org/apache/maven/shared/transfer/project/NoFileAssignedException.java
index 4070cc9..12ecbed 100644
--- a/src/main/java/org/apache/maven/shared/project/NoFileAssignedException.java
+++ b/src/main/java/org/apache/maven/shared/transfer/project/NoFileAssignedException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.project;
+package org.apache.maven.shared.transfer.project;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java b/src/main/java/org/apache/maven/shared/transfer/project/deploy/ProjectDeployer.java
similarity index 92%
rename from src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java
rename to src/main/java/org/apache/maven/shared/transfer/project/deploy/ProjectDeployer.java
index b09adeb..c22d6c8 100644
--- a/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployer.java
+++ b/src/main/java/org/apache/maven/shared/transfer/project/deploy/ProjectDeployer.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.project.deploy;
+package org.apache.maven.shared.transfer.project.deploy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@ package org.apache.maven.shared.project.deploy;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
-import org.apache.maven.shared.project.NoFileAssignedException;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerException;
+import org.apache.maven.shared.transfer.project.NoFileAssignedException;
/**
* This defines the interface to deploy a single Maven Project.
diff --git a/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployerRequest.java b/src/main/java/org/apache/maven/shared/transfer/project/deploy/ProjectDeployerRequest.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployerRequest.java
rename to src/main/java/org/apache/maven/shared/transfer/project/deploy/ProjectDeployerRequest.java
index 3a50c18..206606a 100644
--- a/src/main/java/org/apache/maven/shared/project/deploy/ProjectDeployerRequest.java
+++ b/src/main/java/org/apache/maven/shared/transfer/project/deploy/ProjectDeployerRequest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.project.deploy;
+package org.apache.maven.shared.transfer.project.deploy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java b/src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployer.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
rename to src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployer.java
index 01bc1a0..d01c2d5 100644
--- a/src/main/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployer.java
+++ b/src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployer.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.project.deploy.internal;
+package org.apache.maven.shared.transfer.project.deploy.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -30,12 +30,12 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployer;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
-import org.apache.maven.shared.project.NoFileAssignedException;
-import org.apache.maven.shared.project.deploy.ProjectDeployer;
-import org.apache.maven.shared.project.deploy.ProjectDeployerRequest;
-import org.apache.maven.shared.repository.RepositoryManager;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployer;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerException;
+import org.apache.maven.shared.transfer.project.NoFileAssignedException;
+import org.apache.maven.shared.transfer.project.deploy.ProjectDeployer;
+import org.apache.maven.shared.transfer.project.deploy.ProjectDeployerRequest;
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.FileUtils;
diff --git a/src/main/java/org/apache/maven/shared/project/deploy/internal/DualDigester.java b/src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DualDigester.java
similarity index 97%
rename from src/main/java/org/apache/maven/shared/project/deploy/internal/DualDigester.java
rename to src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DualDigester.java
index a2b8c34..60100dd 100644
--- a/src/main/java/org/apache/maven/shared/project/deploy/internal/DualDigester.java
+++ b/src/main/java/org/apache/maven/shared/transfer/project/deploy/internal/DualDigester.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.project.deploy.internal;
+package org.apache.maven.shared.transfer.project.deploy.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java b/src/main/java/org/apache/maven/shared/transfer/project/install/ProjectInstaller.java
similarity index 93%
rename from src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
rename to src/main/java/org/apache/maven/shared/transfer/project/install/ProjectInstaller.java
index 0b2376c..9ad0d02 100644
--- a/src/main/java/org/apache/maven/shared/project/install/ProjectInstaller.java
+++ b/src/main/java/org/apache/maven/shared/transfer/project/install/ProjectInstaller.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.project.install;
+package org.apache.maven.shared.transfer.project.install;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,8 +22,8 @@ package org.apache.maven.shared.project.install;
import java.io.IOException;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
-import org.apache.maven.shared.project.NoFileAssignedException;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException;
+import org.apache.maven.shared.transfer.project.NoFileAssignedException;
/**
* This defines the interface to install a single Maven Project.
diff --git a/src/main/java/org/apache/maven/shared/project/install/ProjectInstallerRequest.java b/src/main/java/org/apache/maven/shared/transfer/project/install/ProjectInstallerRequest.java
similarity index 92%
rename from src/main/java/org/apache/maven/shared/project/install/ProjectInstallerRequest.java
rename to src/main/java/org/apache/maven/shared/transfer/project/install/ProjectInstallerRequest.java
index d33abbb..1cc4b9e 100644
--- a/src/main/java/org/apache/maven/shared/project/install/ProjectInstallerRequest.java
+++ b/src/main/java/org/apache/maven/shared/transfer/project/install/ProjectInstallerRequest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.project.install;
+package org.apache.maven.shared.transfer.project.install;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java b/src/main/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstaller.java
similarity index 92%
rename from src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
rename to src/main/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstaller.java
index 6cb5ad8..8804ee3 100644
--- a/src/main/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstaller.java
+++ b/src/main/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstaller.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.project.install.internal;
+package org.apache.maven.shared.transfer.project.install.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -32,12 +32,12 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.artifact.ProjectArtifact;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.shared.artifact.install.ArtifactInstaller;
-import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
-import org.apache.maven.shared.project.NoFileAssignedException;
-import org.apache.maven.shared.project.install.ProjectInstaller;
-import org.apache.maven.shared.project.install.ProjectInstallerRequest;
-import org.apache.maven.shared.repository.RepositoryManager;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstaller;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException;
+import org.apache.maven.shared.transfer.project.NoFileAssignedException;
+import org.apache.maven.shared.transfer.project.install.ProjectInstaller;
+import org.apache.maven.shared.transfer.project.install.ProjectInstallerRequest;
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.slf4j.Logger;
diff --git a/src/main/java/org/apache/maven/shared/repository/RepositoryManager.java b/src/main/java/org/apache/maven/shared/transfer/repository/RepositoryManager.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/repository/RepositoryManager.java
rename to src/main/java/org/apache/maven/shared/transfer/repository/RepositoryManager.java
index 5fcb9f1..a6588c2 100644
--- a/src/main/java/org/apache/maven/shared/repository/RepositoryManager.java
+++ b/src/main/java/org/apache/maven/shared/transfer/repository/RepositoryManager.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.repository;
+package org.apache.maven.shared.transfer.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,7 @@ import java.io.File;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate;
/**
*
diff --git a/src/main/java/org/apache/maven/shared/repository/RepositoryManagerException.java b/src/main/java/org/apache/maven/shared/transfer/repository/RepositoryManagerException.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/repository/RepositoryManagerException.java
rename to src/main/java/org/apache/maven/shared/transfer/repository/RepositoryManagerException.java
index 81975d5..ef5286c 100644
--- a/src/main/java/org/apache/maven/shared/repository/RepositoryManagerException.java
+++ b/src/main/java/org/apache/maven/shared/transfer/repository/RepositoryManagerException.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.repository;
+package org.apache.maven.shared.transfer.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java b/src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java
rename to src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java
index 4dcdecf..0bc3ffa 100644
--- a/src/main/java/org/apache/maven/shared/repository/internal/DefaultRepositoryManager.java
+++ b/src/main/java/org/apache/maven/shared/transfer/repository/internal/DefaultRepositoryManager.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.repository.internal;
+package org.apache.maven.shared.transfer.repository.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,9 +25,9 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.shared.artifact.ArtifactCoordinate;
-import org.apache.maven.shared.artifact.DefaultArtifactCoordinate;
-import org.apache.maven.shared.repository.RepositoryManager;
+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate;
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.annotations.Component;
diff --git a/src/main/java/org/apache/maven/shared/repository/internal/Invoker.java b/src/main/java/org/apache/maven/shared/transfer/repository/internal/Invoker.java
similarity index 95%
rename from src/main/java/org/apache/maven/shared/repository/internal/Invoker.java
rename to src/main/java/org/apache/maven/shared/transfer/repository/internal/Invoker.java
index 8f42a07..2da84bc 100644
--- a/src/main/java/org/apache/maven/shared/repository/internal/Invoker.java
+++ b/src/main/java/org/apache/maven/shared/transfer/repository/internal/Invoker.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.repository.internal;
+package org.apache.maven.shared.transfer.repository.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package org.apache.maven.shared.repository.internal;
import java.lang.reflect.InvocationTargetException;
-import org.apache.maven.shared.repository.RepositoryManagerException;
+import org.apache.maven.shared.transfer.repository.RepositoryManagerException;
/**
* Invokes method on objects using reflection.
diff --git a/src/main/java/org/apache/maven/shared/repository/internal/Maven302RepositoryManager.java b/src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven302RepositoryManager.java
similarity index 92%
rename from src/main/java/org/apache/maven/shared/repository/internal/Maven302RepositoryManager.java
rename to src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven302RepositoryManager.java
index 8832c32..0bd1bab 100644
--- a/src/main/java/org/apache/maven/shared/repository/internal/Maven302RepositoryManager.java
+++ b/src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven302RepositoryManager.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.repository.internal;
+package org.apache.maven.shared.transfer.repository.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.shared.repository.internal;
* under the License.
*/
-import org.apache.maven.shared.repository.RepositoryManager;
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.codehaus.plexus.component.annotations.Component;
import org.sonatype.aether.repository.LocalRepository;
diff --git a/src/main/java/org/apache/maven/shared/repository/internal/Maven30RepositoryManager.java b/src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven30RepositoryManager.java
similarity index 96%
rename from src/main/java/org/apache/maven/shared/repository/internal/Maven30RepositoryManager.java
rename to src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven30RepositoryManager.java
index e32517c..9fbaea9 100644
--- a/src/main/java/org/apache/maven/shared/repository/internal/Maven30RepositoryManager.java
+++ b/src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven30RepositoryManager.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.repository.internal;
+package org.apache.maven.shared.transfer.repository.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,9 +26,9 @@ import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.ArtifactCoordinate;
-import org.apache.maven.shared.repository.RepositoryManager;
-import org.apache.maven.shared.repository.RepositoryManagerException;
+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
+import org.apache.maven.shared.transfer.repository.RepositoryManagerException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.sonatype.aether.RepositorySystem;
diff --git a/src/main/java/org/apache/maven/shared/repository/internal/Maven31RepositoryManager.java b/src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven31RepositoryManager.java
similarity index 96%
rename from src/main/java/org/apache/maven/shared/repository/internal/Maven31RepositoryManager.java
rename to src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven31RepositoryManager.java
index 2596615..d7f4d6e 100644
--- a/src/main/java/org/apache/maven/shared/repository/internal/Maven31RepositoryManager.java
+++ b/src/main/java/org/apache/maven/shared/transfer/repository/internal/Maven31RepositoryManager.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.repository.internal;
+package org.apache.maven.shared.transfer.repository.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,9 +26,9 @@ import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.ArtifactCoordinate;
-import org.apache.maven.shared.repository.RepositoryManager;
-import org.apache.maven.shared.repository.RepositoryManagerException;
+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
+import org.apache.maven.shared.transfer.repository.RepositoryManagerException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.eclipse.aether.DefaultRepositoryCache;
diff --git a/src/test/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinateTest.java b/src/test/java/org/apache/maven/shared/transfer/artifact/DefaultArtifactCoordinateTest.java
similarity index 90%
rename from src/test/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinateTest.java
rename to src/test/java/org/apache/maven/shared/transfer/artifact/DefaultArtifactCoordinateTest.java
index fbbbb8e..155cfc2 100644
--- a/src/test/java/org/apache/maven/shared/artifact/DefaultArtifactCoordinateTest.java
+++ b/src/test/java/org/apache/maven/shared/transfer/artifact/DefaultArtifactCoordinateTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact;
+package org.apache.maven.shared.transfer.artifact;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,6 +21,7 @@ package org.apache.maven.shared.artifact;
import static org.junit.Assert.*;
+import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate;
import org.junit.Test;
public class DefaultArtifactCoordinateTest
diff --git a/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java b/src/test/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployerTest.java
similarity index 92%
rename from src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java
rename to src/test/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployerTest.java
index 5e17f60..14ce5c4 100644
--- a/src/test/java/org/apache/maven/shared/artifact/deploy/internal/DefaultArtifactDeployerTest.java
+++ b/src/test/java/org/apache/maven/shared/transfer/artifact/deploy/internal/DefaultArtifactDeployerTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.deploy.internal;
+package org.apache.maven.shared.transfer.artifact.deploy.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,9 +25,9 @@ import java.util.Collections;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployer;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
-import org.apache.maven.shared.artifact.deploy.internal.DefaultArtifactDeployer;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployer;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerException;
+import org.apache.maven.shared.transfer.artifact.deploy.internal.DefaultArtifactDeployer;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java b/src/test/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstallerTest.java
similarity index 94%
rename from src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java
rename to src/test/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstallerTest.java
index d26ed01..2980330 100644
--- a/src/test/java/org/apache/maven/shared/artifact/install/internal/DefaultArtifactInstallerTest.java
+++ b/src/test/java/org/apache/maven/shared/transfer/artifact/install/internal/DefaultArtifactInstallerTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.install.internal;
+package org.apache.maven.shared.transfer.artifact.install.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,8 +28,9 @@ import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.install.ArtifactInstaller;
-import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstaller;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException;
+import org.apache.maven.shared.transfer.artifact.install.internal.DefaultArtifactInstaller;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
diff --git a/src/test/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstallerTest.java b/src/test/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven30ArtifactInstallerTest.java
similarity index 93%
rename from src/test/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstallerTest.java
rename to src/test/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven30ArtifactInstallerTest.java
index 05c561c..b5693f1 100644
--- a/src/test/java/org/apache/maven/shared/artifact/install/internal/Maven30ArtifactInstallerTest.java
+++ b/src/test/java/org/apache/maven/shared/transfer/artifact/install/internal/Maven30ArtifactInstallerTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.install.internal;
+package org.apache.maven.shared.transfer.artifact.install.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,7 +28,8 @@ import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.repository.internal.MavenRepositorySystemSession;
-import org.apache.maven.shared.artifact.install.ArtifactInstaller;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstaller;
+import org.apache.maven.shared.transfer.artifact.install.internal.Maven30ArtifactInstaller;
import org.codehaus.plexus.PlexusTestCase;
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
diff --git a/src/test/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolverTest.java b/src/test/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolverTest.java
similarity index 87%
rename from src/test/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolverTest.java
rename to src/test/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolverTest.java
index 094ee71..d36340b 100644
--- a/src/test/java/org/apache/maven/shared/artifact/resolve/internal/DefaultArtifactResolverTest.java
+++ b/src/test/java/org/apache/maven/shared/transfer/artifact/resolve/internal/DefaultArtifactResolverTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.artifact.resolve.internal;
+package org.apache.maven.shared.transfer.artifact.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,10 +23,11 @@ import static org.mockito.Mockito.mock;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.ArtifactCoordinate;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerException;
+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.internal.DefaultArtifactResolver;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/src/test/java/org/apache/maven/shared/dependencies/DefaultDependableCoordinateTest.java b/src/test/java/org/apache/maven/shared/transfer/dependencies/DefaultDependableCoordinateTest.java
similarity index 90%
rename from src/test/java/org/apache/maven/shared/dependencies/DefaultDependableCoordinateTest.java
rename to src/test/java/org/apache/maven/shared/transfer/dependencies/DefaultDependableCoordinateTest.java
index 961ded9..6172247 100644
--- a/src/test/java/org/apache/maven/shared/dependencies/DefaultDependableCoordinateTest.java
+++ b/src/test/java/org/apache/maven/shared/transfer/dependencies/DefaultDependableCoordinateTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies;
+package org.apache.maven.shared.transfer.dependencies;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package org.apache.maven.shared.dependencies;
import static org.junit.Assert.assertEquals;
-import org.apache.maven.shared.dependencies.DefaultDependableCoordinate;
+import org.apache.maven.shared.transfer.dependencies.DefaultDependableCoordinate;
import org.junit.Test;
public class DefaultDependableCoordinateTest
diff --git a/src/test/java/org/apache/maven/shared/dependencies/collect/internal/DefaultDependencyCollectorTest.java b/src/test/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollectorTest.java
similarity index 87%
rename from src/test/java/org/apache/maven/shared/dependencies/collect/internal/DefaultDependencyCollectorTest.java
rename to src/test/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollectorTest.java
index 5e48299..4d2f05e 100644
--- a/src/test/java/org/apache/maven/shared/dependencies/collect/internal/DefaultDependencyCollectorTest.java
+++ b/src/test/java/org/apache/maven/shared/transfer/dependencies/collect/internal/DefaultDependencyCollectorTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.collect.internal;
+package org.apache.maven.shared.transfer.dependencies.collect.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,12 +24,12 @@ import static org.mockito.Mockito.mock;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
-import org.apache.maven.shared.dependencies.DependableCoordinate;
-import org.apache.maven.shared.dependencies.collect.DependencyCollector;
-import org.apache.maven.shared.dependencies.collect.DependencyCollectorException;
-import org.apache.maven.shared.dependencies.collect.internal.DefaultDependencyCollector;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerException;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
+import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollector;
+import org.apache.maven.shared.transfer.dependencies.collect.DependencyCollectorException;
+import org.apache.maven.shared.transfer.dependencies.collect.internal.DefaultDependencyCollector;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/src/test/java/org/apache/maven/shared/dependencies/resolve/internal/DefaultDependencyResolverTest.java b/src/test/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolverTest.java
similarity index 90%
rename from src/test/java/org/apache/maven/shared/dependencies/resolve/internal/DefaultDependencyResolverTest.java
rename to src/test/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolverTest.java
index 2a512ac..7f042f0 100644
--- a/src/test/java/org/apache/maven/shared/dependencies/resolve/internal/DefaultDependencyResolverTest.java
+++ b/src/test/java/org/apache/maven/shared/transfer/dependencies/resolve/internal/DefaultDependencyResolverTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.dependencies.resolve.internal;
+package org.apache.maven.shared.transfer.dependencies.resolve.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,9 +23,10 @@ import static org.mockito.Mockito.mock;
import org.apache.maven.model.Model;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.dependencies.DependableCoordinate;
-import org.apache.maven.shared.dependencies.resolve.DependencyResolver;
-import org.apache.maven.shared.dependencies.resolve.DependencyResolverException;
+import org.apache.maven.shared.transfer.dependencies.DependableCoordinate;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver;
+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException;
+import org.apache.maven.shared.transfer.dependencies.resolve.internal.DefaultDependencyResolver;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
diff --git a/src/test/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployerTest.java b/src/test/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployerTest.java
similarity index 86%
rename from src/test/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployerTest.java
rename to src/test/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployerTest.java
index 2d54a24..a1ee052 100644
--- a/src/test/java/org/apache/maven/shared/project/deploy/internal/DefaultProjectDeployerTest.java
+++ b/src/test/java/org/apache/maven/shared/transfer/project/deploy/internal/DefaultProjectDeployerTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.project.deploy.internal;
+package org.apache.maven.shared.transfer.project.deploy.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,10 +22,11 @@ package org.apache.maven.shared.project.deploy.internal;
import static org.mockito.Mockito.mock;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
-import org.apache.maven.shared.project.NoFileAssignedException;
-import org.apache.maven.shared.project.deploy.ProjectDeployer;
-import org.apache.maven.shared.project.deploy.ProjectDeployerRequest;
+import org.apache.maven.shared.transfer.artifact.deploy.ArtifactDeployerException;
+import org.apache.maven.shared.transfer.project.NoFileAssignedException;
+import org.apache.maven.shared.transfer.project.deploy.ProjectDeployer;
+import org.apache.maven.shared.transfer.project.deploy.ProjectDeployerRequest;
+import org.apache.maven.shared.transfer.project.deploy.internal.DefaultProjectDeployer;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
diff --git a/src/test/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstallerTest.java b/src/test/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstallerTest.java
similarity index 85%
rename from src/test/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstallerTest.java
rename to src/test/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstallerTest.java
index f5d65a3..5c6d968 100644
--- a/src/test/java/org/apache/maven/shared/project/install/internal/DefaultProjectInstallerTest.java
+++ b/src/test/java/org/apache/maven/shared/transfer/project/install/internal/DefaultProjectInstallerTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.project.install.internal;
+package org.apache.maven.shared.transfer.project.install.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,9 +24,10 @@ import static org.mockito.Mockito.mock;
import java.io.IOException;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.install.ArtifactInstallerException;
-import org.apache.maven.shared.project.NoFileAssignedException;
-import org.apache.maven.shared.project.install.ProjectInstaller;
+import org.apache.maven.shared.transfer.artifact.install.ArtifactInstallerException;
+import org.apache.maven.shared.transfer.project.NoFileAssignedException;
+import org.apache.maven.shared.transfer.project.install.ProjectInstaller;
+import org.apache.maven.shared.transfer.project.install.internal.DefaultProjectInstaller;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
diff --git a/src/test/java/org/apache/maven/shared/repository/internal/Maven30RepositoryManagerTest.java b/src/test/java/org/apache/maven/shared/transfer/repository/internal/Maven30RepositoryManagerTest.java
similarity index 93%
rename from src/test/java/org/apache/maven/shared/repository/internal/Maven30RepositoryManagerTest.java
rename to src/test/java/org/apache/maven/shared/transfer/repository/internal/Maven30RepositoryManagerTest.java
index 8ac70a8..faa9e1a 100644
--- a/src/test/java/org/apache/maven/shared/repository/internal/Maven30RepositoryManagerTest.java
+++ b/src/test/java/org/apache/maven/shared/transfer/repository/internal/Maven30RepositoryManagerTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.shared.repository.internal;
+package org.apache.maven.shared.transfer.repository.internal;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ import java.io.File;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.repository.internal.MavenRepositorySystemSession;
-import org.apache.maven.shared.repository.RepositoryManager;
-import org.apache.maven.shared.repository.internal.Maven30RepositoryManager;
+import org.apache.maven.shared.transfer.repository.RepositoryManager;
+import org.apache.maven.shared.transfer.repository.internal.Maven30RepositoryManager;
import org.codehaus.plexus.PlexusTestCase;
import org.sonatype.aether.impl.internal.EnhancedLocalRepositoryManager;
import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;