From f40e0bf52cc3eb2ada39841f88f3efbbbe46cdc7 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Sun, 22 Apr 2007 22:19:23 +0000 Subject: [PATCH] o unifying anythign to do with artifact resolution into one module o maven-artifact-test not used o maven-artifact-manager is not consumed separate anywhere as the ant tasks are now an uber jar o i'm fine with having a proper maven-artifact-api jar but it's leaking all over the place and the api is out of control git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@531291 13f79535-47bb-0310-9956-ffa450edef68 --- build.xml | 2 +- maven-artifact/pom.xml | 13 ++ .../deployer/DefaultArtifactDeployer.java | 0 .../installer/DefaultArtifactInstaller.java | 0 .../manager/ChecksumFailedException.java | 0 .../artifact/manager/DefaultWagonManager.java | 0 .../manager/WagonConfigurationException.java | 0 .../maven/artifact/manager/WagonManager.java | 0 .../repository/DefaultArtifactRepository.java | 0 .../DefaultArtifactRepositoryFactory.java | 0 .../metadata/AbstractRepositoryMetadata.java | 0 .../metadata/ArtifactRepositoryMetadata.java | 0 .../DefaultRepositoryMetadataManager.java | 0 .../metadata/GroupRepositoryMetadata.java | 0 .../metadata/RepositoryMetadata.java | 0 .../metadata/RepositoryMetadataManager.java | 0 .../SnapshotArtifactRepositoryMetadata.java | 0 .../resolver/DebugResolutionListener.java | 0 .../resolver/DefaultArtifactResolver.java | 0 .../resolver/WarningResolutionListener.java | 0 .../AbstractVersionTransformation.java | 0 .../DefaultArtifactTransformationManager.java | 0 .../LatestArtifactTransformation.java | 0 .../ReleaseArtifactTransformation.java | 0 .../transform/SnapshotTransformation.java | 0 .../src/main/mdo/metadata.mdo | 0 .../resources/META-INF/plexus/components.xml | 176 ++++++++++++++++++ .../AbstractArtifactComponentTestCase.java | 0 .../deployer/ArtifactDeployerTest.java | 0 .../installer/ArtifactInstallerTest.java | 0 .../manager/DefaultWagonManagerTest.java | 0 .../apache/maven/artifact/manager/WagonA.java | 0 .../apache/maven/artifact/manager/WagonB.java | 0 .../apache/maven/artifact/manager/WagonC.java | 0 .../maven/artifact/manager/WagonMock.java | 0 .../AbstractRepositoryMetadataTest.java | 0 .../resolver/ArtifactResolverTest.java | 0 .../maven/artifact/testutils/MockManager.java | 0 .../artifact/testutils/TestFileManager.java | 0 .../artifact-install/artifact-1.0.jar | 0 .../deployer/ArtifactDeployerTest.xml | 0 .../installer/ArtifactInstallerTest.xml | 0 .../manager/DefaultWagonManagerTest.xml | 0 .../resolver/ArtifactResolverTest.xml | 0 .../src/test/resources/pom.xml | 0 pom.xml | 2 - 46 files changed, 190 insertions(+), 3 deletions(-) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/manager/WagonManager.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java (100%) rename {maven-artifact-manager => maven-artifact}/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java (100%) rename {maven-repository-metadata => maven-artifact}/src/main/mdo/metadata.mdo (100%) rename {maven-artifact-manager => maven-artifact}/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java (100%) rename {maven-artifact-manager => maven-artifact}/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java (100%) rename {maven-artifact-manager => maven-artifact}/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java (100%) rename {maven-artifact-manager => maven-artifact}/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java (100%) rename {maven-artifact-manager => maven-artifact}/src/test/java/org/apache/maven/artifact/manager/WagonA.java (100%) rename {maven-artifact-manager => maven-artifact}/src/test/java/org/apache/maven/artifact/manager/WagonB.java (100%) rename {maven-artifact-manager => maven-artifact}/src/test/java/org/apache/maven/artifact/manager/WagonC.java (100%) rename {maven-artifact-manager => maven-artifact}/src/test/java/org/apache/maven/artifact/manager/WagonMock.java (100%) rename {maven-artifact-manager => maven-artifact}/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java (100%) rename {maven-artifact-manager => maven-artifact}/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java (100%) rename {maven-artifact-manager => maven-artifact}/src/test/java/org/apache/maven/artifact/testutils/MockManager.java (100%) rename {maven-artifact-manager => maven-artifact}/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java (100%) rename {maven-artifact-manager => maven-artifact}/src/test/resources/artifact-install/artifact-1.0.jar (100%) rename {maven-artifact-manager => maven-artifact}/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml (100%) rename {maven-artifact-manager => maven-artifact}/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml (100%) rename {maven-artifact-manager => maven-artifact}/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml (100%) rename {maven-artifact-manager => maven-artifact}/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml (100%) rename {maven-artifact-manager => maven-artifact}/src/test/resources/pom.xml (100%) diff --git a/build.xml b/build.xml index 5779cec9f9..cdea129607 100644 --- a/build.xml +++ b/build.xml @@ -232,7 +232,7 @@ under the License. - + diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml index c9a1dd200e..5e8ed8f0b5 100644 --- a/maven-artifact/pom.xml +++ b/maven-artifact/pom.xml @@ -40,4 +40,17 @@ under the License. test + + + + + org.codehaus.modello + modello-maven-plugin + + 1.0.0 + src/main/mdo/metadata.mdo + + + + diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java b/maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java b/maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/installer/DefaultArtifactInstaller.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/manager/ChecksumFailedException.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java b/maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java b/maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonConfigurationException.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java b/maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonManager.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/manager/WagonManager.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepository.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactory.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadata.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/ArtifactRepositoryMetadata.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadata.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/RepositoryMetadataManager.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java b/maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/repository/metadata/SnapshotArtifactRepositoryMetadata.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java b/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/resolver/WarningResolutionListener.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java b/maven-artifact/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java b/maven-artifact/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java b/maven-artifact/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java b/maven-artifact/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java diff --git a/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java b/maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java similarity index 100% rename from maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java rename to maven-artifact/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java diff --git a/maven-repository-metadata/src/main/mdo/metadata.mdo b/maven-artifact/src/main/mdo/metadata.mdo similarity index 100% rename from maven-repository-metadata/src/main/mdo/metadata.mdo rename to maven-artifact/src/main/mdo/metadata.mdo diff --git a/maven-artifact/src/main/resources/META-INF/plexus/components.xml b/maven-artifact/src/main/resources/META-INF/plexus/components.xml index 7e5dbfbf64..c7a6b0778b 100644 --- a/maven-artifact/src/main/resources/META-INF/plexus/components.xml +++ b/maven-artifact/src/main/resources/META-INF/plexus/components.xml @@ -205,5 +205,181 @@ under the License. org.apache.maven.artifact.resolver.ArtifactCollector org.apache.maven.artifact.resolver.DefaultArtifactCollector + + + + + + org.apache.maven.artifact.manager.WagonManager + org.apache.maven.artifact.manager.DefaultWagonManager + + + org.apache.maven.artifact.repository.ArtifactRepositoryFactory + + + + + + org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager + org.apache.maven.artifact.repository.metadata.DefaultRepositoryMetadataManager + + + org.apache.maven.artifact.manager.WagonManager + + + + + + + org.apache.maven.artifact.transform.ArtifactTransformation + snapshot + org.apache.maven.artifact.transform.SnapshotTransformation + + + org.apache.maven.artifact.manager.WagonManager + + + org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager + + + + + + org.apache.maven.artifact.transform.ArtifactTransformation + release + org.apache.maven.artifact.transform.ReleaseArtifactTransformation + + + org.apache.maven.artifact.manager.WagonManager + + + org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager + + + + + + org.apache.maven.artifact.transform.ArtifactTransformation + latest + org.apache.maven.artifact.transform.LatestArtifactTransformation + + + org.apache.maven.artifact.manager.WagonManager + + + org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager + + + + + + + org.apache.maven.artifact.transform.ArtifactTransformationManager + org.apache.maven.artifact.transform.DefaultArtifactTransformationManager + + + org.apache.maven.artifact.transform.ArtifactTransformation + artifactTransformations + + + + + + + org.apache.maven.artifact.resolver.ArtifactResolver + org.apache.maven.artifact.resolver.DefaultArtifactResolver + default + + + org.apache.maven.artifact.manager.WagonManager + + + org.apache.maven.artifact.transform.ArtifactTransformationManager + + + org.apache.maven.artifact.factory.ArtifactFactory + + + org.apache.maven.artifact.resolver.ArtifactCollector + + + + + + + org.apache.maven.artifact.installer.ArtifactInstaller + org.apache.maven.artifact.installer.DefaultArtifactInstaller + + + org.apache.maven.artifact.transform.ArtifactTransformationManager + + + org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager + + + + + + + org.apache.maven.artifact.deployer.ArtifactDeployer + org.apache.maven.artifact.deployer.DefaultArtifactDeployer + + + org.apache.maven.artifact.manager.WagonManager + + + org.apache.maven.artifact.transform.ArtifactTransformationManager + + + org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager + + + + + + org.apache.maven.artifact.repository.ArtifactRepositoryFactory + org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory + + + + org.apache.maven.artifact.repository.metadata.RepositoryMetadataBuilder + default + org.apache.maven.artifact.repository.metadata.DefaultRepositoryMetadataBuilder + + + org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager + + + + + + org.apache.maven.artifact.repository.ArtifactRepositoryFactory + org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory + + diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java b/maven-artifact/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java similarity index 100% rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java rename to maven-artifact/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java similarity index 100% rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java rename to maven-artifact/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java similarity index 100% rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java rename to maven-artifact/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java similarity index 100% rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java rename to maven-artifact/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonA.java b/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonA.java similarity index 100% rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonA.java rename to maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonA.java diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonB.java b/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonB.java similarity index 100% rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonB.java rename to maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonB.java diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonC.java b/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonC.java similarity index 100% rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonC.java rename to maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonC.java diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonMock.java b/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonMock.java similarity index 100% rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonMock.java rename to maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonMock.java diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java similarity index 100% rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java rename to maven-artifact/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java b/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java similarity index 100% rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java rename to maven-artifact/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/MockManager.java b/maven-artifact/src/test/java/org/apache/maven/artifact/testutils/MockManager.java similarity index 100% rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/MockManager.java rename to maven-artifact/src/test/java/org/apache/maven/artifact/testutils/MockManager.java diff --git a/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java b/maven-artifact/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java similarity index 100% rename from maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java rename to maven-artifact/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java diff --git a/maven-artifact-manager/src/test/resources/artifact-install/artifact-1.0.jar b/maven-artifact/src/test/resources/artifact-install/artifact-1.0.jar similarity index 100% rename from maven-artifact-manager/src/test/resources/artifact-install/artifact-1.0.jar rename to maven-artifact/src/test/resources/artifact-install/artifact-1.0.jar diff --git a/maven-artifact-manager/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml b/maven-artifact/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml similarity index 100% rename from maven-artifact-manager/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml rename to maven-artifact/src/test/resources/org/apache/maven/artifact/deployer/ArtifactDeployerTest.xml diff --git a/maven-artifact-manager/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml b/maven-artifact/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml similarity index 100% rename from maven-artifact-manager/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml rename to maven-artifact/src/test/resources/org/apache/maven/artifact/installer/ArtifactInstallerTest.xml diff --git a/maven-artifact-manager/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml b/maven-artifact/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml similarity index 100% rename from maven-artifact-manager/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml rename to maven-artifact/src/test/resources/org/apache/maven/artifact/manager/DefaultWagonManagerTest.xml diff --git a/maven-artifact-manager/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml b/maven-artifact/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml similarity index 100% rename from maven-artifact-manager/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml rename to maven-artifact/src/test/resources/org/apache/maven/artifact/resolver/ArtifactResolverTest.xml diff --git a/maven-artifact-manager/src/test/resources/pom.xml b/maven-artifact/src/test/resources/pom.xml similarity index 100% rename from maven-artifact-manager/src/test/resources/pom.xml rename to maven-artifact/src/test/resources/pom.xml diff --git a/pom.xml b/pom.xml index df1ae5a004..9c92433757 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,6 @@ under the License. maven-artifact - maven-artifact-manager maven-build-context maven-core maven-error-diagnostics @@ -130,7 +129,6 @@ under the License. maven-profile maven-project maven-reporting - maven-repository-metadata maven-script maven-settings maven-embedder