From 8007a47a3aaa83dfa62fdc0e35d9841e3dd16e42 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Wed, 30 Jul 2014 11:37:49 +1000 Subject: [PATCH] merge artifact-converter into converter Large amount of duplicated information and an unnecessary split package caused duplicates in the produced bundle --- .../archiva-artifact-converter/pom.xml | 137 ------------------ .../resources/META-INF/spring-context.xml | 33 ----- .../expected-files/converted-artifact-one.pom | 6 - .../converted-artifact-three.pom | 6 - .../expected-files/converted-artifact-two.pom | 6 - .../expected-files/converted-v3-snapshot.pom | 29 ---- .../converted-v3-timestamped-snapshot.pom | 29 ---- .../expected-files/converted-v3-warnings.pom | 29 ---- .../src/test/expected-files/converted-v3.pom | 29 ---- .../expected-files/maven-foo-plugin-1.0.pom | 7 - .../newversion-artifact-metadata.xml | 10 -- .../1.0.0/maven-metadata.xml | 6 - .../1.0.0/relocated-v3artifact-1.0.0.jar | 1 - .../1.0.0/relocated-v3artifact-1.0.0.pom | 29 ---- .../relocated-v3artifact/maven-metadata.xml | 9 -- .../1.0.0/relocated-v3artifact-1.0.0.pom | 13 -- .../expected-files/v3-artifact-metadata.xml | 9 -- .../v3-snapshot-artifact-metadata.xml | 9 -- .../expected-files/v3-snapshot-metadata.xml | 6 - .../v3-timestamped-snapshot-metadata.xml | 11 -- .../expected-files/v3-version-metadata.xml | 6 - .../expected-files/v4-artifact-metadata.xml | 9 -- .../v4-snapshot-artifact-metadata.xml | 9 -- .../expected-files/v4-snapshot-metadata.xml | 6 - .../v4-timestamped-snapshot-metadata.xml | 11 -- .../expected-files/v4-version-metadata.xml | 6 - .../src/test/resources/spring-context.xml | 39 ----- .../1.0.0/incorrectArtifactMetadata-1.0.0.jar | 1 - .../1.0.0/incorrectArtifactMetadata-1.0.0.pom | 25 ---- .../maven-metadata.xml | 29 ---- ...apshotMetadata-1.0.0-20060102.030405-6.jar | 1 - ...apshotMetadata-1.0.0-20060102.030405-6.pom | 25 ---- .../1.0.0-SNAPSHOT/maven-metadata.xml | 31 ---- .../maven-metadata.xml | 29 ---- .../test/jars/artifact-one-1.0.0.jar | 1 - .../test/jars/artifact-three-1.0.0.jar | 1 - .../test/jars/artifact-two-1.0.0.jar | 1 - .../test/jars/dryrun-artifact-1.0.0.jar | 1 - .../test/jars/existing-artifact-1.0.0.jar | 1 - .../test/jars/incorrectMd5Artifact-1.0.0.jar | 1 - .../jars/incorrectMd5Artifact-1.0.0.jar.md5 | 1 - .../test/jars/incorrectSha1Artifact-1.0.0.jar | 1 - .../jars/incorrectSha1Artifact-1.0.0.jar.sha1 | 1 - .../test/jars/modified-artifact-1.0.0.jar | 1 - .../test/jars/newversion-artifact-1.0.1.jar | 1 - .../test/jars/noPomArtifact-1.0.0.jar | 1 - .../test/jars/relocated-v3artifact-1.0.0.jar | 1 - .../jars/rollback-created-artifact-1.0.0.jar | 1 - .../test/jars/unmodified-artifact-1.0.0.jar | 1 - .../test/jars/v3-warnings-artifact-1.0.0.jar | 1 - .../v3artifact-1.0.0-20060105.130101-3.jar | 1 - .../test/jars/v3artifact-1.0.0-SNAPSHOT.jar | 1 - .../test/jars/v3artifact-1.0.0.jar | 1 - .../v4artifact-1.0.0-20060111.120115-1.jar | 1 - .../test/jars/v4artifact-1.0.0-SNAPSHOT.jar | 1 - .../test/jars/v4artifact-1.0.0.jar | 1 - .../test/jars/v4artifact-1.0.0.jar.md5 | 1 - .../test/jars/v4artifact-1.0.0.jar.sha1 | 1 - .../test/plugins/maven-foo-plugin-1.0.jar | 1 - .../test/poms/artifact-one-1.0.0.pom | 6 - .../test/poms/artifact-three-1.0.0.pom | 6 - .../test/poms/artifact-two-1.0.0.pom | 6 - .../test/poms/dryrun-artifact-1.0.0.pom | 22 --- .../test/poms/incorrectMd5Artifact-1.0.0.pom | 6 - .../test/poms/incorrectSha1Artifact-1.0.0.pom | 6 - .../test/poms/maven-foo-plugin-1.0.pom | 6 - .../test/poms/modified-artifact-1.0.0.pom | 22 --- .../test/poms/newversion-artifact-1.0.1.pom | 22 --- .../test/poms/relocated-v3artifact-1.0.0.pom | 27 ---- .../poms/rollback-created-artifact-1.0.0.pom | 39 ----- .../test/poms/unmodified-artifact-1.0.0.pom | 25 ---- .../test/poms/v3-warnings-artifact-1.0.0.pom | 48 ------ .../v3artifact-1.0.0-20060105.130101-3.pom | 40 ----- .../test/poms/v3artifact-1.0.0-SNAPSHOT.pom | 40 ----- .../test/poms/v3artifact-1.0.0.pom | 24 --- .../v4artifact-1.0.0-20060111.120115-1.pom | 22 --- .../test/poms/v4artifact-1.0.0-SNAPSHOT.pom | 22 --- .../test/poms/v4artifact-1.0.0.pom | 6 - .../1.0.0/modified-artifact-1.0.0.jar | 1 - .../1.0.0/modified-artifact-1.0.0.pom | 25 ---- .../1.0.0/newversion-artifact-1.0.0.jar | 1 - .../1.0.0/newversion-artifact-1.0.0.pom | 25 ---- .../newversion-artifact/maven-metadata.xml | 29 ---- .../1.0.0/unmodified-artifact-1.0.0.jar | 1 - .../1.0.0/unmodified-artifact-1.0.0.pom | 25 ---- .../archiva-base/archiva-converter/pom.xml | 6 +- .../artifact/ArtifactConversionException.java | 0 .../converter/artifact/ArtifactConverter.java | 0 .../artifact/LegacyRepositoryLayout.java | 0 .../artifact/LegacyToDefaultConverter.java | 0 .../archiva/converter/artifact/Messages.java | 0 .../converter/artifact/messages.properties | 0 .../LegacyToDefaultConverterTest.java | 0 archiva-modules/archiva-base/pom.xml | 1 - pom.xml | 6 +- 95 files changed, 6 insertions(+), 1175 deletions(-) delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/pom.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/META-INF/spring-context.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-artifact-one.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-artifact-three.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-artifact-two.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3-snapshot.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3-warnings.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/maven-foo-plugin-1.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/newversion-artifact-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-artifact-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-snapshot-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-version-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-artifact-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-snapshot-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-version-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/resources/spring-context.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar delete mode 100644 archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom rename archiva-modules/archiva-base/{archiva-artifact-converter => archiva-converter}/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java (100%) rename archiva-modules/archiva-base/{archiva-artifact-converter => archiva-converter}/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java (100%) rename archiva-modules/archiva-base/{archiva-artifact-converter => archiva-converter}/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java (100%) rename archiva-modules/archiva-base/{archiva-artifact-converter => archiva-converter}/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java (100%) rename archiva-modules/archiva-base/{archiva-artifact-converter => archiva-converter}/src/main/java/org/apache/archiva/converter/artifact/Messages.java (100%) rename archiva-modules/archiva-base/{archiva-artifact-converter => archiva-converter}/src/main/resources/org/apache/archiva/converter/artifact/messages.properties (100%) rename archiva-modules/archiva-base/{archiva-artifact-converter => archiva-converter}/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java (100%) diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml deleted file mode 100644 index 2aeae8608..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - - 4.0.0 - - org.apache.archiva - archiva-base - 2.1.1-SNAPSHOT - - archiva-artifact-converter - bundle - Archiva Base :: Artifact Converter - Converts between Legacy and Modern Layout Artifacts. - - - org.apache.maven - maven-repository-metadata - - - commons-io - commons-io - - - org.apache.maven - maven-artifact - - - org.apache.maven - maven-artifact-manager - - - - org.apache.archiva - archiva-plexus-bridge - - - org.apache.archiva - archiva-transaction - - - org.springframework - spring-context - - - org.apache.maven.shared - maven-model-converter - - - org.slf4j - slf4j-simple - test - - - org.apache.archiva - archiva-test-utils - ${project.version} - test - - - - - - org.apache.felix - maven-bundle-plugin - - - org.apache.archiva.artifact.converter - ${project.version} - - org.apache.archiva.converter.artifact*;version=${project.version};-split-package:=merge-first - - - javax.annotation, - javax.inject, - org.apache.archiva.common.plexusbridge;version=${project.version}, - org.apache.archiva.transaction;version=${project.version}, - org.apache.commons.io;version="[1.4,2)", - org.springframework*;version="[3,4)", - org.apache.maven.artifact*, - org.apache.maven.model*, - org.codehaus.plexus.digest, - org.codehaus.plexus.util* - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - ${basedir} - - - - - - - - org.apache.rat - apache-rat-plugin - - - src/test/source-repository/** - src/test/expected-files/** - - - - - - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/META-INF/spring-context.xml deleted file mode 100644 index fcc10b5a3..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/META-INF/spring-context.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-artifact-one.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-artifact-one.pom deleted file mode 100644 index cd3862d35..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-artifact-one.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - test - artifact-one - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-artifact-three.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-artifact-three.pom deleted file mode 100644 index 343291037..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-artifact-three.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - test - artifact-three - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-artifact-two.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-artifact-two.pom deleted file mode 100644 index 227470167..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-artifact-two.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - test - artifact-two - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3-snapshot.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3-snapshot.pom deleted file mode 100644 index f03b5a53f..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3-snapshot.pom +++ /dev/null @@ -1,29 +0,0 @@ - - 4.0.0 - test - v3artifact - 1.0.0-SNAPSHOT - - scm:cvs:ext:${maven.username}@localhost:/home/cvs - - - - groupId - artifactId - version - - - groupId - test-artifactId - version - test - - - junit - junit - 3.8.2 - test - - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom deleted file mode 100644 index 1c56340b0..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom +++ /dev/null @@ -1,29 +0,0 @@ - - 4.0.0 - test - v3artifact - 1.0.0-20060105.130101-3 - - scm:cvs:ext:${maven.username}@localhost:/home/cvs - - - - groupId - artifactId - version - - - groupId - test-artifactId - version - test - - - junit - junit - 3.8.2 - test - - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3-warnings.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3-warnings.pom deleted file mode 100644 index bdd22765f..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3-warnings.pom +++ /dev/null @@ -1,29 +0,0 @@ - - 4.0.0 - test - v3-warnings-artifact - 1.0.0 - - scm:cvs:ext:${maven.username}@localhost:/home/cvs - - - - groupId - artifactId - version - - - groupId - test-artifactId - version - test - - - junit - junit - 3.8.2 - test - - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3.pom deleted file mode 100644 index df4700c04..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/converted-v3.pom +++ /dev/null @@ -1,29 +0,0 @@ - - 4.0.0 - test - v3artifact - 1.0.0 - - scm:cvs:ext:${maven.username}@localhost:/home/cvs - - - - groupId - artifactId - version - - - groupId - test-artifactId - version - test - - - junit - junit - 3.8.2 - test - - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/maven-foo-plugin-1.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/maven-foo-plugin-1.0.pom deleted file mode 100644 index 17095cc57..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/maven-foo-plugin-1.0.pom +++ /dev/null @@ -1,7 +0,0 @@ - - 4.0.0 - org.apache.maven.plugins - maven-foo-plugin - 1.0.0 - maven-plugin - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/newversion-artifact-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/newversion-artifact-metadata.xml deleted file mode 100644 index ecc7f09a0..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/newversion-artifact-metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - test - newversion-artifact - - - 1.0.0 - 1.0.1 - - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml deleted file mode 100644 index ebd9be970..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ - - relocated-test - relocated-v3artifact - 1.0.0 - - \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar deleted file mode 100644 index 29ef827e8..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -v3 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom deleted file mode 100644 index 3f5df2267..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom +++ /dev/null @@ -1,29 +0,0 @@ - - 4.0.0 - relocated-test - relocated-v3artifact - 1.0.0 - - scm:cvs:ext:${maven.username}@localhost:/home/cvs - - - - groupId - artifactId - version - - - groupId - test-artifactId - version - test - - - junit - junit - 3.8.2 - test - - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml deleted file mode 100644 index b4b1a864a..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - relocated-test - relocated-v3artifact - - - 1.0.0 - - - \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom deleted file mode 100644 index 4efefb741..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom +++ /dev/null @@ -1,13 +0,0 @@ - - test - relocated-v3artifact - 1.0.0 - - - relocated-test - relocated-v3artifact - 1.0.0 - - - \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-artifact-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-artifact-metadata.xml deleted file mode 100644 index a8a7f3748..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-artifact-metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - test - v3artifact - - - 1.0.0 - - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml deleted file mode 100644 index 24d25a0e0..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - test - v3artifact - - - 1.0.0-SNAPSHOT - - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-snapshot-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-snapshot-metadata.xml deleted file mode 100644 index b19c537b5..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-snapshot-metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ - - test - v3artifact - 1.0.0-SNAPSHOT - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml deleted file mode 100644 index 602c38ec8..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - test - v3artifact - 1.0.0-SNAPSHOT - - - 20060105.130101 - 3 - - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-version-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-version-metadata.xml deleted file mode 100644 index 3c8938984..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v3-version-metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ - - test - v3artifact - 1.0.0 - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-artifact-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-artifact-metadata.xml deleted file mode 100644 index c0cdbfdb4..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-artifact-metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - test - v4artifact - - - 1.0.0 - - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml deleted file mode 100644 index f8072b0df..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml +++ /dev/null @@ -1,9 +0,0 @@ - - test - v4artifact - - - 1.0.0-SNAPSHOT - - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-snapshot-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-snapshot-metadata.xml deleted file mode 100644 index d5ecb7d47..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-snapshot-metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ - - test - v4artifact - 1.0.0-SNAPSHOT - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml deleted file mode 100644 index 060a79cdd..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - test - v4artifact - 1.0.0-SNAPSHOT - - - 20060111.120115 - 1 - - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-version-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-version-metadata.xml deleted file mode 100644 index 7cbd8ad3d..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/expected-files/v4-version-metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ - - test - v4artifact - 1.0.0 - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/resources/spring-context.xml deleted file mode 100644 index 4d89642a8..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/resources/spring-context.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar deleted file mode 100644 index 72af4bc10..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -incorrectMd5 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom deleted file mode 100644 index b64e1d0f0..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - - 3 - incorrectArtifactMetadata - test - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml deleted file mode 100644 index b393bcd3d..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - test - incorrectArtifactMetadata - - - 0.9 - - - \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar deleted file mode 100644 index 72af4bc10..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar +++ /dev/null @@ -1 +0,0 @@ -incorrectMd5 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom deleted file mode 100644 index 929190af2..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - - 3 - incorrectSnapshotMetadata - test - 1.0.0-20060102.030405-6 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml deleted file mode 100644 index 5980278b3..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - test - incorrectSnapshotMetadata - 1.0.0-SNAPSHOT - - - 10 - 20060102.040506 - - - \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml deleted file mode 100644 index 3f9a0cef2..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - test - incorrectSnapshotMetadata - - - 1.0.0-SNAPSHOT - - - \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar deleted file mode 100644 index 5626abf0f..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -one diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar deleted file mode 100644 index 2bdf67abb..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -three diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar deleted file mode 100644 index f719efd43..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -two diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar deleted file mode 100644 index cbaf024e5..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -existing diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar deleted file mode 100644 index cbaf024e5..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -existing diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar deleted file mode 100644 index 72af4bc10..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -incorrectMd5 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 deleted file mode 100644 index 316d9a4eb..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -379dcfcd1e6312cc859111f696047eb4 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar deleted file mode 100644 index f5812f3e5..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -incorrectSha1 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 deleted file mode 100644 index cce322eb2..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -52e07b82d944741f66bba5896d4cd74e9879e289 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar deleted file mode 100644 index 2e0996000..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -modified diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar deleted file mode 100644 index c694117fd..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar +++ /dev/null @@ -1 +0,0 @@ -v4 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar deleted file mode 100644 index 3d27acdcc..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -noPom diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar deleted file mode 100644 index 29ef827e8..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -v3 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar deleted file mode 100644 index 29ef827e8..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -v3 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar deleted file mode 100644 index 27597bc21..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -unmodified diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar deleted file mode 100644 index 29ef827e8..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -v3 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar deleted file mode 100644 index 29ef827e8..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar +++ /dev/null @@ -1 +0,0 @@ -v3 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar deleted file mode 100644 index 29ef827e8..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar +++ /dev/null @@ -1 +0,0 @@ -v3 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar deleted file mode 100644 index 29ef827e8..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -v3 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar deleted file mode 100644 index 29ef827e8..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar +++ /dev/null @@ -1 +0,0 @@ -v3 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar deleted file mode 100644 index 29ef827e8..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar +++ /dev/null @@ -1 +0,0 @@ -v3 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar deleted file mode 100644 index c694117fd..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -v4 diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 deleted file mode 100644 index 1930bc6d3..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -4289bbdd6fba75013b317b2f9a540736 *v4artifact-1.0.0.jar diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 deleted file mode 100644 index 466f209a7..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e3e4159da65a4257f0bffb7cac8e3e78241a4dca *v4artifact-1.0.0.jar diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar deleted file mode 100644 index 5626abf0f..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar +++ /dev/null @@ -1 +0,0 @@ -one diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom deleted file mode 100644 index cd3862d35..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - test - artifact-one - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom deleted file mode 100644 index 343291037..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - test - artifact-three - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom deleted file mode 100644 index 227470167..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - test - artifact-two - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom deleted file mode 100644 index 1953c5523..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom +++ /dev/null @@ -1,22 +0,0 @@ - - - - 4.0.0 - dryrun-artifact - test - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom deleted file mode 100644 index 74d5e12b4..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 3 - incorrectMd5Artifact - test - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom deleted file mode 100644 index fe3c7fd91..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 3 - incorrectSha1Artifact - test - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom deleted file mode 100644 index a5a02c42d..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 3 - maven-foo-plugin - org.apache.maven.plugins - 1.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom deleted file mode 100644 index fcfdaacb4..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom +++ /dev/null @@ -1,22 +0,0 @@ - - - - 4.0.0 - modified-artifact - test - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom deleted file mode 100644 index f441c9a46..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom +++ /dev/null @@ -1,22 +0,0 @@ - - - - 4.0.0 - test - newversoin-artifact - 1.0.1 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom deleted file mode 100644 index ab112a296..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom +++ /dev/null @@ -1,27 +0,0 @@ - - 3 - relocated-v3artifact - test - 1.0.0 - - - groupId - artifactId - version - - - groupId - test-artifactId - version - - test - - - - - scm:cvs:ext:${maven.username}@localhost:/home/cvs - - - relocated-test - - \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom deleted file mode 100644 index 00692be72..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom +++ /dev/null @@ -1,39 +0,0 @@ - - - - 3 - v3artifact - test - 1.0.0 - - - groupId - artifactId - version - - - groupId - test-artifactId - version - - test - - - - - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom deleted file mode 100644 index a8428a8a4..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - - 4.0.0 - unmodified-artifact - test - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom deleted file mode 100644 index 5f347f371..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom +++ /dev/null @@ -1,48 +0,0 @@ - - - - 3 - ../project.xml - v3-warnings-artifact - test - 1.0.0 - - - 1.0 - 1.0 - 1_0 - - - - - groupId - artifactId - version - - - groupId - test-artifactId - version - - test - - - - - scm:cvs:ext:${maven.username}@localhost:/home/cvs - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom deleted file mode 100644 index d7ae8953b..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom +++ /dev/null @@ -1,40 +0,0 @@ - - - - 3 - v3artifact - test - 1.0.0-20060105.130101-3 - - - groupId - artifactId - version - - - groupId - test-artifactId - version - - test - - - - - scm:cvs:ext:${maven.username}@localhost:/home/cvs - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom deleted file mode 100644 index 3958a3358..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom +++ /dev/null @@ -1,40 +0,0 @@ - - - - 3 - v3artifact - test - 1.0.0-SNAPSHOT - - - groupId - artifactId - version - - - groupId - test-artifactId - version - - test - - - - - scm:cvs:ext:${maven.username}@localhost:/home/cvs - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom deleted file mode 100644 index 5aed3437a..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom +++ /dev/null @@ -1,24 +0,0 @@ - - 3 - v3artifact - test - 1.0.0 - - - groupId - artifactId - version - - - groupId - test-artifactId - version - - test - - - - - scm:cvs:ext:${maven.username}@localhost:/home/cvs - - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom deleted file mode 100644 index e4f36566a..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom +++ /dev/null @@ -1,22 +0,0 @@ - - - - 4.0.0 - test - v4artifact - 1.0.0-20060111.120115-1 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom deleted file mode 100644 index be5b8b7e2..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom +++ /dev/null @@ -1,22 +0,0 @@ - - - - 4.0.0 - test - v4artifact - 1.0.0-SNAPSHOT - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom deleted file mode 100644 index fa6e82b1e..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - test - v4artifact - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar deleted file mode 100644 index 27597bc21..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -unmodified diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom deleted file mode 100644 index d23afd027..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - - 4.0.0 - modified-artifact - test - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar deleted file mode 100644 index 27597bc21..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -unmodified diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom deleted file mode 100644 index e21492ebf..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - - 4.0.0 - newversion-artifact - test - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml deleted file mode 100644 index 42537e4c5..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - test - newversion-artifact - - - 1.0.0 - - - \ No newline at end of file diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar deleted file mode 100644 index 27597bc21..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar +++ /dev/null @@ -1 +0,0 @@ -unmodified diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom deleted file mode 100644 index a8428a8a4..000000000 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom +++ /dev/null @@ -1,25 +0,0 @@ - - - - 4.0.0 - unmodified-artifact - test - 1.0.0 - diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index b9871de33..99d8bc819 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -35,7 +35,11 @@ org.apache.archiva - archiva-artifact-converter + archiva-transaction + + + org.apache.maven.shared + maven-model-converter org.apache.archiva diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java similarity index 100% rename from archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java rename to archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java similarity index 100% rename from archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java rename to archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java similarity index 100% rename from archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java rename to archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java similarity index 100% rename from archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java rename to archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java b/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java similarity index 100% rename from archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java rename to archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/archiva/converter/artifact/messages.properties b/archiva-modules/archiva-base/archiva-converter/src/main/resources/org/apache/archiva/converter/artifact/messages.properties similarity index 100% rename from archiva-modules/archiva-base/archiva-artifact-converter/src/main/resources/org/apache/archiva/converter/artifact/messages.properties rename to archiva-modules/archiva-base/archiva-converter/src/main/resources/org/apache/archiva/converter/artifact/messages.properties diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java b/archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java similarity index 100% rename from archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java rename to archiva-modules/archiva-base/archiva-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml index 52c960cb2..40abd8f80 100644 --- a/archiva-modules/archiva-base/pom.xml +++ b/archiva-modules/archiva-base/pom.xml @@ -46,7 +46,6 @@ archiva-proxy-common archiva-proxy archiva-transaction - archiva-artifact-converter archiva-converter archiva-repository-scanner archiva-repository-admin diff --git a/pom.xml b/pom.xml index 9c7a6e9b5..a8b86041d 100644 --- a/pom.xml +++ b/pom.xml @@ -253,6 +253,7 @@ org.apache.archiva problem-reports ${project.version} + runtime org.apache.archiva @@ -269,11 +270,6 @@ generic-metadata-support ${project.version} - - org.apache.archiva - archiva-artifact-converter - ${project.version} - org.apache.archiva archiva-checksum -- 2.39.5