diff options
95 files changed, 6 insertions, 1175 deletions
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 @@ -<?xml version="1.0"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-base</artifactId> - <version>2.1.1-SNAPSHOT</version> - </parent> - <artifactId>archiva-artifact-converter</artifactId> - <packaging>bundle</packaging> - <name>Archiva Base :: Artifact Converter</name> - <description>Converts between Legacy and Modern Layout Artifacts.</description> - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-repository-metadata</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact-manager</artifactId> - <!-- olamy : weird enforcer doesn't have it but failed IMHO issue in enforcer plugin !! - <exclusions> - <exclusion> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-provider-api</artifactId> - </exclusion> - </exclusions> - --> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-plexus-bridge</artifactId> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-transaction</artifactId> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-model-converter</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> - <artifactId>archiva-test-utils</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.archiva.artifact.converter</Bundle-SymbolicName> - <Bundle-Version>${project.version}</Bundle-Version> - <Export-Package> - org.apache.archiva.converter.artifact*;version=${project.version};-split-package:=merge-first - </Export-Package> - <Import-Package> - 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* - </Import-Package> - </instructions> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemPropertyVariables> - <basedir>${basedir}</basedir> - </systemPropertyVariables> - </configuration> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>src/test/source-repository/**</exclude> - <exclude>src/test/expected-files/**</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> -</project> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd" - default-lazy-init="true"> - - <context:annotation-config/> - <context:component-scan base-package="org.apache.archiva.converter.artifact"/> - -</beans>
\ 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 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>artifact-one</artifactId> - <version>1.0.0</version> -</project> 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 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>artifact-three</artifactId> - <version>1.0.0</version> -</project> 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 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>artifact-two</artifactId> - <version>1.0.0</version> -</project> 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 @@ -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>v3artifact</artifactId> - <version>1.0.0-SNAPSHOT</version> - <scm> - <connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection> - </scm> - <dependencies> - <dependency> - <groupId>groupId</groupId> - <artifactId>artifactId</artifactId> - <version>version</version> - </dependency> - <dependency> - <groupId>groupId</groupId> - <artifactId>test-artifactId</artifactId> - <version>version</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> 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 @@ -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>v3artifact</artifactId> - <version>1.0.0-20060105.130101-3</version> - <scm> - <connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection> - </scm> - <dependencies> - <dependency> - <groupId>groupId</groupId> - <artifactId>artifactId</artifactId> - <version>version</version> - </dependency> - <dependency> - <groupId>groupId</groupId> - <artifactId>test-artifactId</artifactId> - <version>version</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> 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 @@ -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>v3-warnings-artifact</artifactId> - <version>1.0.0</version> - <scm> - <connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection> - </scm> - <dependencies> - <dependency> - <groupId>groupId</groupId> - <artifactId>artifactId</artifactId> - <version>version</version> - </dependency> - <dependency> - <groupId>groupId</groupId> - <artifactId>test-artifactId</artifactId> - <version>version</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> 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 @@ -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>v3artifact</artifactId> - <version>1.0.0</version> - <scm> - <connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection> - </scm> - <dependencies> - <dependency> - <groupId>groupId</groupId> - <artifactId>artifactId</artifactId> - <version>version</version> - </dependency> - <dependency> - <groupId>groupId</groupId> - <artifactId>test-artifactId</artifactId> - <version>version</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> 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 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-foo-plugin</artifactId> - <version>1.0.0</version> - <packaging>maven-plugin</version> -</project> 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 @@ -<metadata> - <groupId>test</groupId> - <artifactId>newversion-artifact</artifactId> - <versioning> - <versions> - <version>1.0.0</version> - <version>1.0.1</version> - </versions> - </versioning> -</metadata> 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 @@ -<metadata> - <groupId>relocated-test</groupId> - <artifactId>relocated-v3artifact</artifactId> - <version>1.0.0</version> - <versioning /> -</metadata>
\ 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 @@ -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <groupId>relocated-test</groupId> - <artifactId>relocated-v3artifact</artifactId> - <version>1.0.0</version> - <scm> - <connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection> - </scm> - <dependencies> - <dependency> - <groupId>groupId</groupId> - <artifactId>artifactId</artifactId> - <version>version</version> - </dependency> - <dependency> - <groupId>groupId</groupId> - <artifactId>test-artifactId</artifactId> - <version>version</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> 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 @@ -<metadata> - <groupId>relocated-test</groupId> - <artifactId>relocated-v3artifact</artifactId> - <versioning> - <versions> - <version>1.0.0</version> - </versions> - </versioning> -</metadata>
\ 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 @@ -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <groupId>test</groupId> - <artifactId>relocated-v3artifact</artifactId> - <version>1.0.0</version> - <distributionManagement> - <relocation> - <groupId>relocated-test</groupId> - <artifactId>relocated-v3artifact</artifactId> - <version>1.0.0</version> - </relocation> - </distributionManagement> -</project>
\ 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 @@ -<metadata> - <groupId>test</groupId> - <artifactId>v3artifact</artifactId> - <versioning> - <versions> - <version>1.0.0</version> - </versions> - </versioning> -</metadata> 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 @@ -<metadata> - <groupId>test</groupId> - <artifactId>v3artifact</artifactId> - <versioning> - <versions> - <version>1.0.0-SNAPSHOT</version> - </versions> - </versioning> -</metadata> 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 @@ -<metadata> - <groupId>test</groupId> - <artifactId>v3artifact</artifactId> - <version>1.0.0-SNAPSHOT</version> - <versioning /> -</metadata> 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 @@ -<metadata> - <groupId>test</groupId> - <artifactId>v3artifact</artifactId> - <version>1.0.0-SNAPSHOT</version> - <versioning> - <snapshot> - <timestamp>20060105.130101</timestamp> - <buildNumber>3</buildNumber> - </snapshot> - </versioning> -</metadata> 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 @@ -<metadata> - <groupId>test</groupId> - <artifactId>v3artifact</artifactId> - <version>1.0.0</version> - <versioning /> -</metadata> 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 @@ -<metadata> - <groupId>test</groupId> - <artifactId>v4artifact</artifactId> - <versioning> - <versions> - <version>1.0.0</version> - </versions> - </versioning> -</metadata> 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 @@ -<metadata> - <groupId>test</groupId> - <artifactId>v4artifact</artifactId> - <versioning> - <versions> - <version>1.0.0-SNAPSHOT</version> - </versions> - </versioning> -</metadata> 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 @@ -<metadata> - <groupId>test</groupId> - <artifactId>v4artifact</artifactId> - <version>1.0.0-SNAPSHOT</version> - <versioning /> -</metadata> 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 @@ -<metadata> - <groupId>test</groupId> - <artifactId>v4artifact</artifactId> - <version>1.0.0-SNAPSHOT</version> - <versioning> - <snapshot> - <timestamp>20060111.120115</timestamp> - <buildNumber>1</buildNumber> - </snapshot> - </versioning> -</metadata> 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 @@ -<metadata> - <groupId>test</groupId> - <artifactId>v4artifact</artifactId> - <version>1.0.0</version> - <versioning /> -</metadata> 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 @@ -<?xml version="1.0"?> - -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> -<beans xmlns="http://www.springframework.org/schema/beans" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:context="http://www.springframework.org/schema/context" - xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd - http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - - <bean name="artifactConverter#force-repository-converter" class="org.apache.archiva.converter.artifact.LegacyToDefaultConverter"> - <property name="force" value="true"/> - <property name="dryrun" value="false"/> - </bean> - - <bean name="artifactConverter#dryrun-repository-converter" class="org.apache.archiva.converter.artifact.LegacyToDefaultConverter"> - <property name="force" value="false"/> - <property name="dryrun" value="true"/> - </bean> - -</beans>
\ 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 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<project> - <pomVersion>3</pomVersion> - <artifactId>incorrectArtifactMetadata</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0</currentVersion> -</project> 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 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<metadata> - <groupId>test</groupId> - <artifactId>incorrectArtifactMetadata</artifactId> - <versioning> - <versions> - <version>0.9</version> - </versions> - </versioning> -</metadata>
\ 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 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<project> - <pomVersion>3</pomVersion> - <artifactId>incorrectSnapshotMetadata</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0-20060102.030405-6</currentVersion> -</project> 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 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<metadata> - <groupId>test</groupId> - <artifactId>incorrectSnapshotMetadata</artifactId> - <version>1.0.0-SNAPSHOT</version> - <versioning> - <snapshot> - <buildNumber>10</buildNumber> - <timestamp>20060102.040506</timestamp> - </snapshot> - </versioning> -</metadata>
\ 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 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<metadata> - <groupId>test</groupId> - <artifactId>incorrectSnapshotMetadata</artifactId> - <versioning> - <versions> - <version>1.0.0-SNAPSHOT</version> - </versions> - </versioning> -</metadata>
\ 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 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>artifact-one</artifactId> - <version>1.0.0</version> -</project> 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 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>artifact-three</artifactId> - <version>1.0.0</version> -</project> 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 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>artifact-two</artifactId> - <version>1.0.0</version> -</project> 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 @@ -<!-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<project> - <modelVersion>4.0.0</modelVersion> - <artifactId>dryrun-artifact</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0</currentVersion> -</project> 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 @@ -<project> - <pomVersion>3</pomVersion> - <artifactId>incorrectMd5Artifact</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0</currentVersion> -</project> 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 @@ -<project> - <pomVersion>3</pomVersion> - <artifactId>incorrectSha1Artifact</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0</currentVersion> -</project> 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 @@ -<project> - <pomVersion>3</pomVersion> - <artifactId>maven-foo-plugin</artifactId> - <groupId>org.apache.maven.plugins</groupId> - <currentVersion>1.0</currentVersion> -</project> 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 @@ -<!-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<project> - <modelVersion>4.0.0</modelVersion> - <artifactId>modified-artifact</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0</currentVersion> -</project> 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 @@ -<!-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>newversoin-artifact</artifactId> - <version>1.0.1</version> -</project> 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 @@ -<project> - <pomVersion>3</pomVersion> - <artifactId>relocated-v3artifact</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0</currentVersion> - <dependencies> - <dependency> - <groupId>groupId</groupId> - <artifactId>artifactId</artifactId> - <version>version</version> - </dependency> - <dependency> - <groupId>groupId</groupId> - <artifactId>test-artifactId</artifactId> - <version>version</version> - <properties> - <scope>test</scope> - </properties> - </dependency> - </dependencies> - <repository> - <connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection> - </repository> - <properties> - <relocated.groupId>relocated-test</relocated.groupId> - </properties> -</project>
\ 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 @@ -<!-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<project> - <pomVersion>3</pomVersion> - <artifactId>v3artifact</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0</currentVersion> - <dependencies> - <dependency> - <groupId>groupId</groupId> - <artifactId>artifactId</artifactId> - <version>version</version> - </dependency> - <dependency> - <groupId>groupId</groupId> - <artifactId>test-artifactId</artifactId> - <version>version</version> - <properties> - <scope>test</scope> - </properties> - </dependency> - </dependencies> - <!-- deliberate parse error --> - <repository> -</project> 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 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<project> - <modelVersion>4.0.0</modelVersion> - <artifactId>unmodified-artifact</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0</currentVersion> -</project> 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 @@ -<!-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<project> - <pomVersion>3</pomVersion> - <extend>../project.xml</extend> - <artifactId>v3-warnings-artifact</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0</currentVersion> - <versions> - <version> - <id>1.0</id> - <name>1.0</name> - <tag>1_0</tag> - </version> - </versions> - <dependencies> - <dependency> - <groupId>groupId</groupId> - <artifactId>artifactId</artifactId> - <version>version</version> - </dependency> - <dependency> - <groupId>groupId</groupId> - <artifactId>test-artifactId</artifactId> - <version>version</version> - <properties> - <scope>test</scope> - </properties> - </dependency> - </dependencies> - <repository> - <connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection> - </repository> -</project> 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 @@ -<!-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<project> - <pomVersion>3</pomVersion> - <artifactId>v3artifact</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0-20060105.130101-3</currentVersion> - <dependencies> - <dependency> - <groupId>groupId</groupId> - <artifactId>artifactId</artifactId> - <version>version</version> - </dependency> - <dependency> - <groupId>groupId</groupId> - <artifactId>test-artifactId</artifactId> - <version>version</version> - <properties> - <scope>test</scope> - </properties> - </dependency> - </dependencies> - <repository> - <connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection> - </repository> -</project> 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 @@ -<!-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<project> - <pomVersion>3</pomVersion> - <artifactId>v3artifact</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0-SNAPSHOT</currentVersion> - <dependencies> - <dependency> - <groupId>groupId</groupId> - <artifactId>artifactId</artifactId> - <version>version</version> - </dependency> - <dependency> - <groupId>groupId</groupId> - <artifactId>test-artifactId</artifactId> - <version>version</version> - <properties> - <scope>test</scope> - </properties> - </dependency> - </dependencies> - <repository> - <connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection> - </repository> -</project> 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 @@ -<project> - <pomVersion>3</pomVersion> - <artifactId>v3artifact</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0</currentVersion> - <dependencies> - <dependency> - <groupId>groupId</groupId> - <artifactId>artifactId</artifactId> - <version>version</version> - </dependency> - <dependency> - <groupId>groupId</groupId> - <artifactId>test-artifactId</artifactId> - <version>version</version> - <properties> - <scope>test</scope> - </properties> - </dependency> - </dependencies> - <repository> - <connection>scm:cvs:ext:${maven.username}@localhost:/home/cvs</connection> - </repository> -</project> 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 @@ -<!-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>v4artifact</artifactId> - <version>1.0.0-20060111.120115-1</version> -</project> 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 @@ -<!-- - ~ Copyright 2005-2006 The Apache Software Foundation. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>v4artifact</artifactId> - <version>1.0.0-SNAPSHOT</version> -</project> 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 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>test</groupId> - <artifactId>v4artifact</artifactId> - <version>1.0.0</version> -</project> 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 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<project> - <modelVersion>4.0.0</modelVersion> - <artifactId>modified-artifact</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0</currentVersion> -</project> 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 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<project> - <modelVersion>4.0.0</modelVersion> - <artifactId>newversion-artifact</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0</currentVersion> -</project> 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 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<metadata> - <groupId>test</groupId> - <artifactId>newversion-artifact</artifactId> - <versioning> - <versions> - <version>1.0.0</version> - </versions> - </versioning> -</metadata>
\ 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 @@ -<!-- - ~ Licensed to the Apache Software Foundation (ASF) under one - ~ or more contributor license agreements. See the NOTICE file - ~ distributed with this work for additional information - ~ regarding copyright ownership. The ASF licenses this file - ~ to you under the Apache License, Version 2.0 (the - ~ "License"); you may not use this file except in compliance - ~ with the License. You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, - ~ software distributed under the License is distributed on an - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ~ KIND, either express or implied. See the License for the - ~ specific language governing permissions and limitations - ~ under the License. - --> - -<project> - <modelVersion>4.0.0</modelVersion> - <artifactId>unmodified-artifact</artifactId> - <groupId>test</groupId> - <currentVersion>1.0.0</currentVersion> -</project> 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 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-artifact-converter</artifactId> + <artifactId>archiva-transaction</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-model-converter</artifactId> </dependency> <dependency> <groupId>org.apache.archiva</groupId> 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 index 0fe5dff85..0fe5dff85 100644 --- 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 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 index 842f01e7c..842f01e7c 100644 --- 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 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 index 310123693..310123693 100644 --- 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 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 index ba8bf2703..ba8bf2703 100644 --- 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 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 index 0cec0fee7..0cec0fee7 100644 --- 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 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 index 5e5bc6dd3..5e5bc6dd3 100644 --- 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 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 index a737e845e..a737e845e 100644 --- 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 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 @@ <module>archiva-proxy-common</module> <module>archiva-proxy</module> <module>archiva-transaction</module> - <module>archiva-artifact-converter</module> <module>archiva-converter</module> <module>archiva-repository-scanner</module> <module>archiva-repository-admin</module> @@ -253,6 +253,7 @@ <groupId>org.apache.archiva</groupId> <artifactId>problem-reports</artifactId> <version>${project.version}</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -271,11 +272,6 @@ </dependency> <dependency> <groupId>org.apache.archiva</groupId> - <artifactId>archiva-artifact-converter</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.archiva</groupId> <artifactId>archiva-checksum</artifactId> <version>${project.version}</version> </dependency> |