]> source.dussan.org Git - archiva.git/commitdiff
Removing archiva-converter module
authorMartin Stockhammer <martin_s@apache.org>
Wed, 5 Feb 2020 21:04:05 +0000 (22:04 +0100)
committerMartin Stockhammer <martin_s@apache.org>
Wed, 5 Feb 2020 21:04:05 +0000 (22:04 +0100)
104 files changed:
archiva-modules/archiva-maven/archiva-maven-converter/pom.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/RepositoryConversionException.java [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/SnapshotArtifactRepositoryMetadata.java [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/META-INF/spring-context.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/org/apache/archiva/converter/DefaultRepositoryConverter.properties [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/org/apache/archiva/converter/artifact/messages.properties [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-one.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-three.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-two.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3-snapshot.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3-warnings.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/maven-foo-plugin-1.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/newversion-artifact-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-artifact-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-snapshot-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-version-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-artifact-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-snapshot-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-version-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/resources/spring-context.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar [deleted file]
archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom [deleted file]
archiva-modules/archiva-maven/pom.xml
pom.xml
src/ci/scripts/prepareWorkspace.sh
status-dep.txt

diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml b/archiva-modules/archiva-maven/archiva-maven-converter/pom.xml
deleted file mode 100644 (file)
index e1e5309..0000000
+++ /dev/null
@@ -1,167 +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.
-  -->
-
-<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">
-  <parent>
-    <groupId>org.apache.archiva.maven</groupId>
-    <artifactId>archiva-maven</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>archiva-maven-converter</artifactId>
-  <name>Archiva :: Maven :: Repository Converter</name>
-
-  <properties>
-    <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-consumer-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-transaction</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-model-converter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-checksum</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-repository-layer</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging-api</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-repository-scanner</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-plexus-bridge</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva.maven</groupId>
-      <artifactId>archiva-maven-repository</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-test-utils</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.archiva.components.cache</groupId>
-      <artifactId>archiva-components-spring-cache-ehcache</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <systemPropertyVariables>
-            <basedir>${basedir}</basedir>
-            <appserver.base>${project.build.directory}/appserver-base</appserver.base>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.rat</groupId>
-          <artifactId>apache-rat-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>src/test/expected-files/**</exclude>
-              <exclude>src/test/source-repository/**</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>jdk9+</id>
-      <activation>
-        <jdk>[1.9,)</jdk>
-      </activation>
-      <dependencies>
-        <!-- Needed for JDK >= 9 -->
-        <dependency>
-          <groupId>javax.annotation</groupId>
-          <artifactId>javax.annotation-api</artifactId>
-          <scope>test</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>javax.xml.bind</groupId>
-          <artifactId>jaxb-api</artifactId>
-          <scope>test</scope>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
-</project>
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/RepositoryConversionException.java b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/RepositoryConversionException.java
deleted file mode 100644 (file)
index a5edc27..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.apache.archiva.converter;
-
-/*
- * 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.
- */
-
-/**
- * Exception occuring during repository conversion.
- *
- */
-public class RepositoryConversionException
-    extends Exception
-{
-    public RepositoryConversionException( String message )
-    {
-        super( message );
-    }
-
-    public RepositoryConversionException( String message, Throwable cause )
-    {
-        super( message, cause );
-    }
-}
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConversionException.java
deleted file mode 100644 (file)
index 0fe5dff..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.apache.archiva.converter.artifact;
-
-/*
- * 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.
- */
-
-/**
- * ArtifactConversionException 
- *
- *
- */
-public class ArtifactConversionException
-    extends Exception
-{
-
-    public ArtifactConversionException()
-    {
-    }
-
-    public ArtifactConversionException( String message )
-    {
-        super( message );
-    }
-
-    public ArtifactConversionException( Throwable cause )
-    {
-        super( cause );
-    }
-
-    public ArtifactConversionException( String message, Throwable cause )
-    {
-        super( message, cause );
-    }
-}
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/ArtifactConverter.java
deleted file mode 100644 (file)
index 842f01e..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.apache.archiva.converter.artifact;
-
-/*
- * 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.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * ArtifactConverter 
- *
- *
- */
-public interface ArtifactConverter
-{
-    /**
-     * Convert an provided artifact, and place it into the destination repository.
-     * 
-     * @param artifact the artifact to convert.
-     * @param destinationRepository the respository to send the artifact to.
-     * @throws ArtifactConversionException 
-     */
-    void convert( Artifact artifact, ArtifactRepository destinationRepository )
-        throws ArtifactConversionException;
-
-    /**
-     * Get the map of accumulated warnings for the conversion.
-     * 
-     * @return the {@link Map}&lt;{@link Artifact}, {@link String}&gt; warning messages.
-     */
-    Map<Artifact, List<String>> getWarnings();
-
-    /**
-     * Clear the list of warning messages.
-     */
-    void clearWarnings();
-}
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyRepositoryLayout.java
deleted file mode 100644 (file)
index 96b4ded..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.apache.archiva.converter.artifact;
-/*
- * 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.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.handler.ArtifactHandler;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.codehaus.plexus.component.annotations.Component;
-
-/**
- * @author jdcasey
- */
-@Component( role = ArtifactRepositoryLayout.class, hint = "legacy")
-public class LegacyRepositoryLayout
-    implements ArtifactRepositoryLayout
-{
-
-    private static final String PATH_SEPARATOR = "/";
-
-    public String getId()
-    {
-        return "legacy";
-    }
-
-    @Override
-    public String pathOf( Artifact artifact )
-    {
-        ArtifactHandler artifactHandler = artifact.getArtifactHandler();
-
-        StringBuilder path = new StringBuilder( 128 );
-
-        path.append( artifact.getGroupId() ).append( '/' );
-        path.append( artifactHandler.getDirectory() ).append( '/' );
-        path.append( artifact.getArtifactId() ).append( '-' ).append( artifact.getVersion() );
-
-        if ( artifact.hasClassifier() )
-        {
-            path.append( '-' ).append( artifact.getClassifier() );
-        }
-
-        if ( artifactHandler.getExtension() != null && artifactHandler.getExtension().length() > 0 )
-        {
-            path.append( '.' ).append( artifactHandler.getExtension() );
-        }
-
-        return path.toString();
-    }
-
-    @Override
-    public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository )
-    {
-        return pathOfRepositoryMetadata( metadata, metadata.getLocalFilename( repository ) );
-    }
-
-    private String pathOfRepositoryMetadata( ArtifactMetadata metadata, String filename )
-    {
-        StringBuilder path = new StringBuilder( 128 );
-
-        path.append( metadata.getGroupId() ).append( PATH_SEPARATOR ).append( "poms" ).append( PATH_SEPARATOR );
-
-        path.append( filename );
-
-        return path.toString();
-    }
-
-    @Override
-    public String pathOfRemoteRepositoryMetadata( ArtifactMetadata metadata )
-    {
-        return pathOfRepositoryMetadata( metadata, metadata.getRemoteFilename() );
-    }
-
-}
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
deleted file mode 100644 (file)
index 39e39c9..0000000
+++ /dev/null
@@ -1,730 +0,0 @@
-package org.apache.archiva.converter.artifact;
-
-/*
- * 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.
- */
-
-import org.apache.archiva.checksum.ChecksumAlgorithm;
-import org.apache.archiva.checksum.ChecksumValidationException;
-import org.apache.archiva.checksum.ChecksummedFile;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
-import org.apache.archiva.transaction.FileTransaction;
-import org.apache.archiva.transaction.TransactionException;
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.Metadata;
-import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.Snapshot;
-import org.apache.maven.artifact.repository.metadata.Versioning;
-import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
-import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Writer;
-import org.apache.maven.model.DistributionManagement;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Relocation;
-import org.apache.maven.model.converter.ModelConverter;
-import org.apache.maven.model.converter.PomTranslationException;
-import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
-import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.regex.Matcher;
-
-/**
- * LegacyToDefaultConverter
- */
-@Service("artifactConverter#legacy-to-default")
-public class LegacyToDefaultConverter
-    implements ArtifactConverter
-{
-    /**
-     *
-     */
-    private List<ChecksumAlgorithm> digesters;
-
-    @Inject
-    private PlexusSisuBridge plexusSisuBridge;
-
-    private ModelConverter translator;
-
-    private ArtifactFactory artifactFactory;
-
-    private ArtifactHandlerManager artifactHandlerManager;
-
-    private boolean force;
-
-    private boolean dryrun;
-
-    private Map<Artifact, List<String>> warnings = new HashMap<>();
-
-    @PostConstruct
-    public void initialize()
-        throws PlexusSisuBridgeException
-    {
-        // TODO: Should be configurable!
-        this.digesters = Arrays.asList(ChecksumAlgorithm.SHA256, ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5);
-        translator = plexusSisuBridge.lookup( ModelConverter.class );
-        artifactFactory = plexusSisuBridge.lookup( ArtifactFactory.class );
-        artifactHandlerManager = plexusSisuBridge.lookup( ArtifactHandlerManager.class );
-    }
-
-    @Override
-    public void convert( Artifact artifact, ArtifactRepository targetRepository )
-        throws ArtifactConversionException
-    {
-        if ( artifact.getRepository().getUrl().equals( targetRepository.getUrl() ) )
-        {
-            throw new ArtifactConversionException( Messages.getString( "exception.repositories.match" ) ); //$NON-NLS-1$
-        }
-
-        if ( !validateMetadata( artifact ) )
-        {
-            addWarning( artifact, Messages.getString( "unable.to.validate.metadata" ) ); //$NON-NLS-1$
-            return;
-        }
-
-        FileTransaction transaction = new FileTransaction();
-
-        if ( !copyPom( artifact, targetRepository, transaction ) )
-        {
-            addWarning( artifact, Messages.getString( "unable.to.copy.pom" ) ); //$NON-NLS-1$
-            return;
-        }
-
-        if ( !copyArtifact( artifact, targetRepository, transaction ) )
-        {
-            addWarning( artifact, Messages.getString( "unable.to.copy.artifact" ) ); //$NON-NLS-1$
-            return;
-        }
-
-        Metadata metadata = createBaseMetadata( artifact );
-        Versioning versioning = new Versioning();
-        versioning.addVersion( artifact.getBaseVersion() );
-        metadata.setVersioning( versioning );
-        updateMetadata( new ArtifactRepositoryMetadata( artifact ), targetRepository, metadata, transaction );
-
-        metadata = createBaseMetadata( artifact );
-        metadata.setVersion( artifact.getBaseVersion() );
-        versioning = new Versioning();
-
-        Matcher matcher = Artifact.VERSION_FILE_PATTERN.matcher( artifact.getVersion() );
-        if ( matcher.matches() )
-        {
-            Snapshot snapshot = new Snapshot();
-            snapshot.setBuildNumber( Integer.parseInt( matcher.group( 3 ) ) );
-            snapshot.setTimestamp( matcher.group( 2 ) );
-            versioning.setSnapshot( snapshot );
-        }
-
-        // TODO: merge latest/release/snapshot from source instead
-        metadata.setVersioning( versioning );
-        updateMetadata( new SnapshotArtifactRepositoryMetadata( artifact ), targetRepository, metadata, transaction );
-
-        if ( !dryrun )
-        {
-            try
-            {
-                transaction.commit();
-            }
-            catch ( TransactionException e )
-            {
-                throw new ArtifactConversionException( Messages.getString( "transaction.failure", e.getMessage() ),
-                                                       e ); //$NON-NLS-1$
-            }
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    private boolean copyPom( Artifact artifact, ArtifactRepository targetRepository, FileTransaction transaction )
-        throws ArtifactConversionException
-    {
-        Artifact pom = artifactFactory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(),
-                                                              artifact.getVersion() );
-        pom.setBaseVersion( artifact.getBaseVersion() );
-        ArtifactRepository repository = artifact.getRepository();
-        Path file = Paths.get( repository.getBasedir(), repository.pathOf( pom ) );
-
-        boolean result = true;
-        if ( Files.exists(file) )
-        {
-            Path targetFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( pom ) );
-
-            String contents = null;
-            boolean checksumsValid = false;
-            try
-            {
-                if ( testChecksums( artifact, file ) )
-                {
-                    checksumsValid = true;
-                }
-
-                // Even if the checksums for the POM are invalid we should still convert the POM
-                contents = org.apache.archiva.common.utils.FileUtils.readFileToString( file, Charset.defaultCharset() );
-            }
-            catch ( IOException e )
-            {
-                throw new ArtifactConversionException(
-                    Messages.getString( "unable.to.read.source.pom", e.getMessage() ), e ); //$NON-NLS-1$
-            }
-
-            if ( checksumsValid && contents.indexOf( "modelVersion" ) >= 0 ) //$NON-NLS-1$
-            {
-                // v4 POM
-                boolean matching = false;
-                if ( !force && Files.exists( targetFile ) )
-                {
-                    String targetContents = org.apache.archiva.common.utils.FileUtils.readFileToString( targetFile, Charset.defaultCharset( ) );
-                    matching = targetContents.equals( contents );
-                }
-                if ( force || !matching )
-                {
-                    transaction.createFile( contents, targetFile, digesters );
-                }
-            }
-            else
-            {
-                // v3 POM
-                try (StringReader stringReader = new StringReader( contents ))
-                {
-
-                    try (StringWriter writer = new StringWriter())
-                    {
-                        org.apache.maven.model.v3_0_0.io.xpp3.MavenXpp3Reader v3Reader =
-                            new org.apache.maven.model.v3_0_0.io.xpp3.MavenXpp3Reader();
-                        org.apache.maven.model.v3_0_0.Model v3Model = v3Reader.read( stringReader );
-
-                        if ( doRelocation( artifact, v3Model, targetRepository, transaction ) )
-                        {
-                            Artifact relocatedPom =
-                                artifactFactory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(),
-                                                                       artifact.getVersion() );
-                            targetFile =
-                                Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( relocatedPom ) );
-                        }
-
-                        Model v4Model = translator.translate( v3Model );
-
-                        translator.validateV4Basics( v4Model, v3Model.getGroupId(), v3Model.getArtifactId(),
-                                                     v3Model.getVersion(), v3Model.getPackage() );
-
-                        MavenXpp3Writer xpp3Writer = new MavenXpp3Writer();
-                        xpp3Writer.write( writer, v4Model );
-
-                        transaction.createFile( writer.toString(), targetFile, digesters );
-
-                        List<String> warnings = translator.getWarnings();
-
-                        for ( String message : warnings )
-                        {
-                            addWarning( artifact, message );
-                        }
-                    }
-                    catch ( XmlPullParserException e )
-                    {
-                        addWarning( artifact,
-                                    Messages.getString( "invalid.source.pom", e.getMessage() ) ); //$NON-NLS-1$
-                        result = false;
-                    }
-                    catch ( IOException e )
-                    {
-                        throw new ArtifactConversionException( Messages.getString( "unable.to.write.converted.pom" ),
-                                                               e ); //$NON-NLS-1$
-                    }
-                    catch ( PomTranslationException e )
-                    {
-                        addWarning( artifact,
-                                    Messages.getString( "invalid.source.pom", e.getMessage() ) ); //$NON-NLS-1$
-                        result = false;
-                    }
-                }
-            }
-        }
-        else
-        {
-            addWarning( artifact, Messages.getString( "warning.missing.pom" ) ); //$NON-NLS-1$
-        }
-        return result;
-    }
-
-    private boolean testChecksums( Artifact artifact, Path file )
-        throws IOException
-    {
-        boolean result = true;
-        for ( ChecksumAlgorithm digester : digesters )
-        {
-            result &= verifyChecksum( file, file.getFileName() + "." + getDigesterFileExtension( digester ), digester,
-                                      //$NON-NLS-1$
-                                      artifact,
-                                      "failure.incorrect." + getDigesterFileExtension( digester ) ); //$NON-NLS-1$
-        }
-        return result;
-    }
-
-    private boolean verifyChecksum( Path file, String fileName, ChecksumAlgorithm digester, Artifact artifact, String key )
-        throws IOException
-    {
-        boolean result;
-        Path checksumFile = file.resolveSibling( fileName );
-        // We ignore the check, if the checksum file does not exist
-        if (!Files.exists(checksumFile)) {
-            return true;
-        }
-        ChecksummedFile csFile = new ChecksummedFile( file );
-        try
-        {
-            result = csFile.isValidChecksum( digester, true );
-        } catch (ChecksumValidationException e ) {
-            addWarning( artifact, Messages.getString( key ) );
-            result = false;
-        }
-        return result;
-    }
-
-    /**
-     * File extension for checksums
-     * TODO should be moved to plexus-digester ?
-     */
-    private String getDigesterFileExtension( ChecksumAlgorithm checksumAlgorithm )
-    {
-        return checksumAlgorithm.getExt().get(0);
-    }
-
-    private boolean copyArtifact( Artifact artifact, ArtifactRepository targetRepository, FileTransaction transaction )
-        throws ArtifactConversionException
-    {
-        Path sourceFile = artifact.getFile().toPath();
-
-        if ( sourceFile.toAbsolutePath().toString().indexOf( "/plugins/" ) > -1 ) //$NON-NLS-1$
-        {
-            artifact.setArtifactHandler( artifactHandlerManager.getArtifactHandler( "maven-plugin" ) ); //$NON-NLS-1$
-        }
-
-        Path targetFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-
-        boolean result = true;
-        try
-        {
-            boolean matching = false;
-            if ( !force && Files.exists(targetFile) )
-            {
-                matching = FileUtils.contentEquals( sourceFile.toFile(), targetFile.toFile() );
-                if ( !matching )
-                {
-                    addWarning( artifact, Messages.getString( "failure.target.already.exists" ) ); //$NON-NLS-1$
-                    result = false;
-                }
-            }
-            if ( result )
-            {
-                if ( force || !matching )
-                {
-                    if ( testChecksums( artifact, sourceFile ) )
-                    {
-                        transaction.copyFile( sourceFile, targetFile, digesters );
-                    }
-                    else
-                    {
-                        result = false;
-                    }
-                }
-            }
-        }
-        catch ( IOException e )
-        {
-            throw new ArtifactConversionException( Messages.getString( "error.copying.artifact" ), e ); //$NON-NLS-1$
-        }
-        return result;
-    }
-
-    private Metadata createBaseMetadata( Artifact artifact )
-    {
-        Metadata metadata = new Metadata();
-        metadata.setArtifactId( artifact.getArtifactId() );
-        metadata.setGroupId( artifact.getGroupId() );
-        return metadata;
-    }
-
-    private Metadata readMetadata( Path file )
-        throws ArtifactConversionException
-    {
-        MetadataXpp3Reader reader = new MetadataXpp3Reader();
-
-        try (Reader fileReader = Files.newBufferedReader( file, Charset.defaultCharset() ))
-        {
-            return reader.read( fileReader );
-        }
-        catch ( IOException | XmlPullParserException e )
-        {
-            throw new ArtifactConversionException( Messages.getString( "error.reading.target.metadata" ),
-                                                   e ); //$NON-NLS-1$
-        }
-    }
-
-    private boolean validateMetadata( Artifact artifact )
-        throws ArtifactConversionException
-    {
-        ArtifactRepository repository = artifact.getRepository();
-
-        boolean result = true;
-
-        RepositoryMetadata repositoryMetadata = new ArtifactRepositoryMetadata( artifact );
-        Path file = Paths.get( repository.getBasedir(), repository.pathOfRemoteRepositoryMetadata( repositoryMetadata ) );
-        if ( Files.exists(file) )
-        {
-            Metadata metadata = readMetadata( file );
-            result = validateMetadata( metadata, repositoryMetadata, artifact );
-        }
-
-        repositoryMetadata = new SnapshotArtifactRepositoryMetadata( artifact );
-        file = Paths.get( repository.getBasedir(), repository.pathOfRemoteRepositoryMetadata( repositoryMetadata ) );
-        if ( Files.exists(file) )
-        {
-            Metadata metadata = readMetadata( file );
-            result = result && validateMetadata( metadata, repositoryMetadata, artifact );
-        }
-
-        return result;
-    }
-
-    @SuppressWarnings("unchecked")
-    private boolean validateMetadata( Metadata metadata, RepositoryMetadata repositoryMetadata, Artifact artifact )
-    {
-        String groupIdKey;
-        String artifactIdKey = null;
-        String snapshotKey = null;
-        String versionKey = null;
-        String versionsKey = null;
-
-        if ( repositoryMetadata.storedInGroupDirectory() )
-        {
-            groupIdKey = "failure.incorrect.groupMetadata.groupId"; //$NON-NLS-1$
-        }
-        else if ( repositoryMetadata.storedInArtifactVersionDirectory() )
-        {
-            groupIdKey = "failure.incorrect.snapshotMetadata.groupId"; //$NON-NLS-1$
-            artifactIdKey = "failure.incorrect.snapshotMetadata.artifactId"; //$NON-NLS-1$
-            versionKey = "failure.incorrect.snapshotMetadata.version"; //$NON-NLS-1$
-            snapshotKey = "failure.incorrect.snapshotMetadata.snapshot"; //$NON-NLS-1$
-        }
-        else
-        {
-            groupIdKey = "failure.incorrect.artifactMetadata.groupId"; //$NON-NLS-1$
-            artifactIdKey = "failure.incorrect.artifactMetadata.artifactId"; //$NON-NLS-1$
-            versionsKey = "failure.incorrect.artifactMetadata.versions"; //$NON-NLS-1$
-        }
-
-        boolean result = true;
-
-        if ( metadata.getGroupId() == null || !metadata.getGroupId().equals( artifact.getGroupId() ) )
-        {
-            addWarning( artifact, Messages.getString( groupIdKey ) );
-            result = false;
-        }
-        if ( !repositoryMetadata.storedInGroupDirectory() )
-        {
-            if ( metadata.getGroupId() == null || !metadata.getArtifactId().equals( artifact.getArtifactId() ) )
-            {
-                addWarning( artifact, Messages.getString( artifactIdKey ) );
-                result = false;
-            }
-            if ( !repositoryMetadata.storedInArtifactVersionDirectory() )
-            {
-                // artifact metadata
-
-                boolean foundVersion = false;
-                if ( metadata.getVersioning() != null )
-                {
-                    for ( String version : (List<String>) metadata.getVersioning().getVersions() )
-                    {
-                        if ( version.equals( artifact.getBaseVersion() ) )
-                        {
-                            foundVersion = true;
-                            break;
-                        }
-                    }
-                }
-
-                if ( !foundVersion )
-                {
-                    addWarning( artifact, Messages.getString( versionsKey ) );
-                    result = false;
-                }
-            }
-            else
-            {
-                // snapshot metadata
-                if ( !artifact.getBaseVersion().equals( metadata.getVersion() ) )
-                {
-                    addWarning( artifact, Messages.getString( versionKey ) );
-                    result = false;
-                }
-
-                if ( artifact.isSnapshot() )
-                {
-                    Matcher matcher = Artifact.VERSION_FILE_PATTERN.matcher( artifact.getVersion() );
-                    if ( matcher.matches() )
-                    {
-                        boolean correct = false;
-                        if ( metadata.getVersioning() != null && metadata.getVersioning().getSnapshot() != null )
-                        {
-                            Snapshot snapshot = metadata.getVersioning().getSnapshot();
-                            int build = Integer.parseInt( matcher.group( 3 ) );
-                            String ts = matcher.group( 2 );
-                            if ( build == snapshot.getBuildNumber() && ts.equals( snapshot.getTimestamp() ) )
-                            {
-                                correct = true;
-                            }
-                        }
-
-                        if ( !correct )
-                        {
-                            addWarning( artifact, Messages.getString( snapshotKey ) );
-                            result = false;
-                        }
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    private void updateMetadata( RepositoryMetadata artifactMetadata, ArtifactRepository targetRepository,
-                                 Metadata newMetadata, FileTransaction transaction )
-        throws ArtifactConversionException
-    {
-        Path file = Paths.get( targetRepository.getBasedir(),
-                              targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
-
-        Metadata metadata;
-        boolean changed;
-
-        if ( Files.exists(file) )
-        {
-            metadata = readMetadata( file );
-            changed = metadata.merge( newMetadata );
-        }
-        else
-        {
-            changed = true;
-            metadata = newMetadata;
-        }
-
-        if ( changed )
-        {
-
-            try (StringWriter writer = new StringWriter())
-            {
-                MetadataXpp3Writer mappingWriter = new MetadataXpp3Writer();
-
-                mappingWriter.write( writer, metadata );
-
-                transaction.createFile( writer.toString(), file, digesters );
-            }
-            catch ( IOException e )
-            {
-                throw new ArtifactConversionException( Messages.getString( "error.writing.target.metadata" ),
-                                                       e ); //$NON-NLS-1$
-            }
-        }
-    }
-
-    private boolean doRelocation( Artifact artifact, org.apache.maven.model.v3_0_0.Model v3Model,
-                                  ArtifactRepository repository, FileTransaction transaction )
-        throws IOException
-    {
-        Properties properties = v3Model.getProperties();
-        if ( properties.containsKey( "relocated.groupId" ) || properties.containsKey( "relocated.artifactId" )
-            //$NON-NLS-1$ //$NON-NLS-2$
-            || properties.containsKey( "relocated.version" ) ) //$NON-NLS-1$
-        {
-            String newGroupId = properties.getProperty( "relocated.groupId", v3Model.getGroupId() ); //$NON-NLS-1$
-            properties.remove( "relocated.groupId" ); //$NON-NLS-1$
-
-            String newArtifactId =
-                properties.getProperty( "relocated.artifactId", v3Model.getArtifactId() ); //$NON-NLS-1$
-            properties.remove( "relocated.artifactId" ); //$NON-NLS-1$
-
-            String newVersion = properties.getProperty( "relocated.version", v3Model.getVersion() ); //$NON-NLS-1$
-            properties.remove( "relocated.version" ); //$NON-NLS-1$
-
-            String message = properties.getProperty( "relocated.message", "" ); //$NON-NLS-1$ //$NON-NLS-2$
-            properties.remove( "relocated.message" ); //$NON-NLS-1$
-
-            if ( properties.isEmpty() )
-            {
-                v3Model.setProperties( null );
-            }
-
-            writeRelocationPom( v3Model.getGroupId(), v3Model.getArtifactId(), v3Model.getVersion(), newGroupId,
-                                newArtifactId, newVersion, message, repository, transaction );
-
-            v3Model.setGroupId( newGroupId );
-            v3Model.setArtifactId( newArtifactId );
-            v3Model.setVersion( newVersion );
-
-            artifact.setGroupId( newGroupId );
-            artifact.setArtifactId( newArtifactId );
-            artifact.setVersion( newVersion );
-
-            return true;
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    private void writeRelocationPom( String groupId, String artifactId, String version, String newGroupId,
-                                     String newArtifactId, String newVersion, String message,
-                                     ArtifactRepository repository, FileTransaction transaction )
-        throws IOException
-    {
-        Model pom = new Model();
-        pom.setGroupId( groupId );
-        pom.setArtifactId( artifactId );
-        pom.setVersion( version );
-
-        DistributionManagement dMngt = new DistributionManagement();
-
-        Relocation relocation = new Relocation();
-        relocation.setGroupId( newGroupId );
-        relocation.setArtifactId( newArtifactId );
-        relocation.setVersion( newVersion );
-        if ( message != null && message.length() > 0 )
-        {
-            relocation.setMessage( message );
-        }
-
-        dMngt.setRelocation( relocation );
-
-        pom.setDistributionManagement( dMngt );
-
-        Artifact artifact = artifactFactory.createBuildArtifact( groupId, artifactId, version, "pom" ); //$NON-NLS-1$
-        Path pomFile = Paths.get( repository.getBasedir(), repository.pathOf( artifact ) );
-
-        StringWriter strWriter = new StringWriter();
-        MavenXpp3Writer pomWriter = new MavenXpp3Writer();
-        pomWriter.write( strWriter, pom );
-
-        transaction.createFile( strWriter.toString(), pomFile, digesters );
-    }
-
-    private void addWarning( Artifact artifact, String message )
-    {
-        List<String> messages = warnings.get( artifact );
-        if ( messages == null )
-        {
-            messages = new ArrayList<>( 1 );
-        }
-        messages.add( message );
-        warnings.put( artifact, messages );
-    }
-
-    @Override
-    public void clearWarnings()
-    {
-        warnings.clear();
-    }
-
-    @Override
-    public Map<Artifact, List<String>> getWarnings()
-    {
-        return warnings;
-    }
-
-
-    public List<ChecksumAlgorithm> getDigesters()
-    {
-        return digesters;
-    }
-
-    public void setDigesters( List<ChecksumAlgorithm> digesters )
-    {
-        this.digesters = digesters;
-    }
-
-    public ModelConverter getTranslator()
-    {
-        return translator;
-    }
-
-    public void setTranslator( ModelConverter translator )
-    {
-        this.translator = translator;
-    }
-
-    public ArtifactFactory getArtifactFactory()
-    {
-        return artifactFactory;
-    }
-
-    public void setArtifactFactory( ArtifactFactory artifactFactory )
-    {
-        this.artifactFactory = artifactFactory;
-    }
-
-    public ArtifactHandlerManager getArtifactHandlerManager()
-    {
-        return artifactHandlerManager;
-    }
-
-    public void setArtifactHandlerManager( ArtifactHandlerManager artifactHandlerManager )
-    {
-        this.artifactHandlerManager = artifactHandlerManager;
-    }
-
-    public boolean isForce()
-    {
-        return force;
-    }
-
-    public void setForce( boolean force )
-    {
-        this.force = force;
-    }
-
-    public boolean isDryrun()
-    {
-        return dryrun;
-    }
-
-    public void setDryrun( boolean dryrun )
-    {
-        this.dryrun = dryrun;
-    }
-}
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/Messages.java
deleted file mode 100644 (file)
index 0cec0fe..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.apache.archiva.converter.artifact;
-
-/*
- * 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.
- */
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
- * Messages 
- *
- *
- */
-public class Messages
-{
-    private static final String BUNDLE_NAME = "org.apache.archiva.converter.artifact.messages"; //$NON-NLS-1$
-
-    private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME );
-
-    private Messages()
-    {
-        // no op
-    }
-
-    public static String getString( String key )
-    {
-        try
-        {
-            return RESOURCE_BUNDLE.getString( key );
-        }
-        catch ( MissingResourceException e )
-        {
-            return '!' + key + '!';
-        }
-    }
-    
-    public static String getString( String key, Object argument )
-    {
-        return getString( key, new Object[] { argument } );
-    }
-    
-    public static String getString( String key, Object arguments[] )
-    {
-        try
-        {
-            String pattern = RESOURCE_BUNDLE.getString( key );
-            return MessageFormat.format( pattern, arguments );
-        }
-        catch ( MissingResourceException e )
-        {
-            return '!' + key + '!';
-        }
-    }
-}
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/SnapshotArtifactRepositoryMetadata.java b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/artifact/SnapshotArtifactRepositoryMetadata.java
deleted file mode 100644 (file)
index eec76f9..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.apache.archiva.converter.artifact;
-
-/*
- * 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.
- */
-
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.AbstractRepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.Snapshot;
-
-/**
- *
- * This is a copy of org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata
- * from the maven-compat module, because this is the only class that we use from the compat module and
- * we can get rid of the dependency.
- *
- * Metadata for the artifact version directory of the repository.
- *
- *
- * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- *
- */
-public class SnapshotArtifactRepositoryMetadata
-        extends AbstractRepositoryMetadata
-{
-    private Artifact artifact;
-
-    public SnapshotArtifactRepositoryMetadata( Artifact artifact )
-    {
-        super( createMetadata( artifact, null ) );
-        this.artifact = artifact;
-    }
-
-    public SnapshotArtifactRepositoryMetadata( Artifact artifact,
-                                               Snapshot snapshot )
-    {
-        super( createMetadata( artifact, createVersioning( snapshot ) ) );
-        this.artifact = artifact;
-    }
-
-    public boolean storedInGroupDirectory()
-    {
-        return false;
-    }
-
-    public boolean storedInArtifactVersionDirectory()
-    {
-        return true;
-    }
-
-    public String getGroupId()
-    {
-        return artifact.getGroupId();
-    }
-
-    public String getArtifactId()
-    {
-        return artifact.getArtifactId();
-    }
-
-    public String getBaseVersion()
-    {
-        return artifact.getBaseVersion();
-    }
-
-    public Object getKey()
-    {
-        return "snapshot " + artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getBaseVersion();
-    }
-
-    public boolean isSnapshot()
-    {
-        return artifact.isSnapshot();
-    }
-
-    public int getNature()
-    {
-        return isSnapshot() ? SNAPSHOT : RELEASE;
-    }
-
-    public ArtifactRepository getRepository()
-    {
-        return artifact.getRepository();
-    }
-
-    public void setRepository( ArtifactRepository remoteRepository )
-    {
-        artifact.setRepository( remoteRepository );
-    }
-}
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
deleted file mode 100644 (file)
index 7b26126..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.apache.archiva.converter.legacy;
-
-/*
- * 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.
- */
-
-import org.apache.archiva.common.filelock.DefaultFileLockManager;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
-import org.apache.archiva.common.utils.PathUtil;
-import org.apache.archiva.configuration.FileTypes;
-import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
-import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.archiva.converter.RepositoryConversionException;
-import org.apache.archiva.repository.base.BasicManagedRepository;
-import org.apache.archiva.repository.storage.FilesystemStorage;
-import org.apache.archiva.repository.content.maven2.ManagedDefaultRepositoryContent;
-import org.apache.archiva.repository.scanner.RepositoryScanner;
-import org.apache.archiva.repository.scanner.RepositoryScannerException;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.MavenArtifactRepository;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.springframework.stereotype.Service;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * DefaultLegacyRepositoryConverter
- *
- *
- */
-@Service( "legacyRepositoryConverter#default" )
-public class DefaultLegacyRepositoryConverter
-    implements LegacyRepositoryConverter
-{
-    /**
-     *
-     */
-    // private ArtifactRepositoryFactory artifactRepositoryFactory;
-
-    /**
-     *
-     */
-    private ArtifactRepositoryLayout defaultLayout;
-
-    @Inject
-    FileTypes fileTypes;
-
-    /**
-     *
-     */
-    @Inject
-    @Named( value = "knownRepositoryContentConsumer#artifact-legacy-to-default-converter" )
-    private LegacyConverterArtifactConsumer legacyConverterConsumer;
-
-    /**
-     *
-     */
-    @Inject
-    private RepositoryScanner repoScanner;
-
-    @Inject
-    public DefaultLegacyRepositoryConverter( PlexusSisuBridge plexusSisuBridge )
-        throws PlexusSisuBridgeException
-    {
-        // artifactRepositoryFactory = plexusSisuBridge.lookup( ArtifactRepositoryFactory.class );
-        defaultLayout = plexusSisuBridge.lookup( ArtifactRepositoryLayout.class, "default" );
-    }
-
-    @Override
-    public void convertLegacyRepository( Path legacyRepositoryDirectory, Path repositoryDirectory,
-                                         List<String> fileExclusionPatterns )
-        throws RepositoryConversionException
-    {
-        try
-        {
-            String defaultRepositoryUrl = PathUtil.toUrl( repositoryDirectory );
-
-            BasicManagedRepository legacyRepository = BasicManagedRepository.newFilesystemInstance( "legacy", "Legacy Repository", repositoryDirectory);
-            legacyRepository.setLocation( legacyRepositoryDirectory.toAbsolutePath().toUri() );
-            legacyRepository.setLayout( "legacy" );
-            DefaultFileLockManager lockManager = new DefaultFileLockManager();
-            FilesystemStorage storage = new FilesystemStorage(legacyRepositoryDirectory, lockManager);
-            legacyRepository.setContent(new ManagedDefaultRepositoryContent(legacyRepository, fileTypes, lockManager));
-
-            ArtifactRepository repository =
-                new MavenArtifactRepository("default", defaultRepositoryUrl, defaultLayout, null, null);
-
-            legacyConverterConsumer.setExcludes( fileExclusionPatterns );
-            legacyConverterConsumer.setDestinationRepository( repository );
-
-            List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<>( 1 );
-            knownConsumers.add( legacyConverterConsumer );
-
-            List<InvalidRepositoryContentConsumer> invalidConsumers = Collections.emptyList();
-            List<String> ignoredContent = new ArrayList<String>( Arrays.asList( RepositoryScanner.IGNORABLE_CONTENT ) );
-
-            repoScanner.scan( legacyRepository, knownConsumers, invalidConsumers, ignoredContent,
-                              RepositoryScanner.FRESH_SCAN );
-        }
-        catch (RepositoryScannerException | IOException e )
-        {
-            throw new RepositoryConversionException( "Error convering legacy repository.", e );
-        }
-    }
-}
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
deleted file mode 100644 (file)
index bddec98..0000000
+++ /dev/null
@@ -1,197 +0,0 @@
-package org.apache.archiva.converter.legacy;
-
-/*
- * 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.
- */
-
-import org.apache.archiva.common.filelock.FileLockManager;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
-import org.apache.archiva.configuration.FileTypes;
-import org.apache.archiva.consumers.AbstractMonitoredConsumer;
-import org.apache.archiva.consumers.ConsumerException;
-import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
-import org.apache.archiva.converter.artifact.ArtifactConversionException;
-import org.apache.archiva.converter.artifact.ArtifactConverter;
-import org.apache.archiva.metadata.repository.storage.maven2.ArtifactMappingProvider;
-import org.apache.archiva.model.ArtifactReference;
-import org.apache.archiva.repository.LayoutException;
-import org.apache.archiva.repository.ManagedRepository;
-import org.apache.archiva.repository.ManagedRepositoryContent;
-import org.apache.archiva.repository.content.maven2.ManagedDefaultRepositoryContent;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Scope;
-import org.springframework.stereotype.Service;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * LegacyConverterArtifactConsumer - convert artifacts as they are found
- * into the destination repository.
- *
- *
- */
-@Service( "knownRepositoryContentConsumer#artifact-legacy-to-default-converter" )
-@Scope( "prototype" )
-public class LegacyConverterArtifactConsumer
-    extends AbstractMonitoredConsumer
-    implements KnownRepositoryContentConsumer
-{
-    private Logger log = LoggerFactory.getLogger( LegacyConverterArtifactConsumer.class );
-
-    @Inject
-    @Named("artifactConverter#legacy-to-default")
-    private ArtifactConverter artifactConverter;
-
-    @Inject
-    private List<? extends ArtifactMappingProvider> artifactMappingProviders;
-
-    @Inject
-    private FileTypes fileTypes;
-
-    @Inject
-    private FileLockManager fileLockManager;
-
-    private ArtifactFactory artifactFactory;
-
-    private ManagedRepositoryContent managedRepository;
-
-    private ArtifactRepository destinationRepository;
-
-    private List<String> includes;
-
-    private List<String> excludes;
-
-    @Inject
-    public LegacyConverterArtifactConsumer( PlexusSisuBridge plexusSisuBridge )
-        throws PlexusSisuBridgeException
-    {
-        includes = new ArrayList<>( 3 );
-        includes.add( "**/*.jar" );
-        includes.add( "**/*.ear" );
-        includes.add( "**/*.war" );
-        artifactFactory = plexusSisuBridge.lookup( ArtifactFactory.class );
-    }
-
-    @Override
-    public void beginScan( ManagedRepository repository, Date whenGathered )
-        throws ConsumerException
-    {
-        this.managedRepository = new ManagedDefaultRepositoryContent(repository, artifactMappingProviders, fileTypes, fileLockManager);
-    }
-
-    @Override
-    public void beginScan( ManagedRepository repository, Date whenGathered, boolean executeOnEntireRepo )
-        throws ConsumerException
-    {
-        beginScan( repository, whenGathered );
-    }
-
-    @Override
-    public void completeScan()
-    {
-        // no op
-    }
-
-    @Override
-    public void completeScan( boolean executeOnEntireRepo )
-    {
-        completeScan();
-    }
-
-    @Override
-    public List<String> getExcludes()
-    {
-        return excludes;
-    }
-
-    @Override
-    public List<String> getIncludes()
-    {
-        return includes;
-    }
-
-    @Override
-    public void processFile( String path )
-        throws ConsumerException
-    {
-        try
-        {
-            ArtifactReference reference = managedRepository.toArtifactReference( path );
-            Artifact artifact = artifactFactory.createArtifact( reference.getGroupId(), reference.getArtifactId(),
-                                                                reference.getVersion(), reference.getClassifier(),
-                                                                reference.getType() );
-            artifactConverter.convert( artifact, destinationRepository );
-        }
-        catch ( LayoutException e )
-        {
-            log.warn( "Unable to convert artifact: {} : {}",path , e.getMessage(), e );
-        }
-        catch ( ArtifactConversionException e )
-        {
-            log.warn( "Unable to convert artifact: {} : {}",path , e.getMessage(), e );
-        }
-    }
-
-    @Override
-    public void processFile( String path, boolean executeOnEntireRepo )
-        throws Exception
-    {
-        processFile( path );
-    }
-
-    @Override
-    public String getDescription()
-    {
-        return "Legacy Artifact to Default Artifact Converter";
-    }
-
-    @Override
-    public String getId()
-    {
-        return "artifact-legacy-to-default-converter";
-    }
-
-    public void setExcludes( List<String> excludes )
-    {
-        this.excludes = excludes;
-    }
-
-    public void setIncludes( List<String> includes )
-    {
-        this.includes = includes;
-    }
-
-    public ArtifactRepository getDestinationRepository()
-    {
-        return destinationRepository;
-    }
-
-    public void setDestinationRepository( ArtifactRepository destinationRepository )
-    {
-        this.destinationRepository = destinationRepository;
-    }
-}
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyRepositoryConverter.java
deleted file mode 100644 (file)
index bfa4b9c..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.apache.archiva.converter.legacy;
-
-/*
- * 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.
- */
-
-import org.apache.archiva.converter.RepositoryConversionException;
-
-import java.nio.file.Path;
-import java.util.List;
-
-/**
- * Convert an entire repository.
- */
-public interface LegacyRepositoryConverter
-{
-
-    /**
-     * Convert a legacy repository to a modern repository. This means a Maven 1.x repository
-     * using v3 POMs to a Maven 2.x repository using v4.0.0 POMs.
-     *
-     * @param legacyRepositoryDirectory      the directory of the legacy repository.
-     * @param destinationRepositoryDirectory the directory of the modern repository.
-     * @param fileExclusionPatterns          the list of patterns to exclude from the conversion.
-     * @throws RepositoryConversionException
-     */
-    void convertLegacyRepository( Path legacyRepositoryDirectory, Path destinationRepositoryDirectory,
-                                  List<String> fileExclusionPatterns )
-        throws RepositoryConversionException;
-}
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/META-INF/spring-context.xml
deleted file mode 100644 (file)
index 1683d03..0000000
+++ /dev/null
@@ -1,33 +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"
-       default-lazy-init="true">
-
-  <context:annotation-config/>
-  <context:component-scan base-package="org.apache.archiva.converter"/>
-
-</beans>
\ No newline at end of file
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/org/apache/archiva/converter/DefaultRepositoryConverter.properties b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/org/apache/archiva/converter/DefaultRepositoryConverter.properties
deleted file mode 100644 (file)
index 8589df4..0000000
+++ /dev/null
@@ -1,38 +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.
-#
-
-failure.incorrect.md5=The MD5 checksum value was incorrect.
-failure.incorrect.sha1=The SHA1 checksum value was incorrect.
-failure.target.already.exists=The artifact could not be converted because it already exists.
-failure.invalid.source.pom=The source POM was invalid: {0}.
-
-warning.missing.pom=The artifact had no POM in the source repository.
-
-exception.repositories.match=Source and target repositories are identical.
-
-failure.incorrect.groupMetadata.groupId=The group ID in the source group metadata is incorrect.
-
-failure.incorrect.artifactMetadata.artifactId=The artifact ID in the source artifact metadata is incorrect.
-failure.incorrect.artifactMetadata.groupId=The group ID in the source artifact metadata is incorrect.
-failure.incorrect.artifactMetadata.versions=The version list in the source artifact metadata is incorrect.
-
-failure.incorrect.snapshotMetadata.artifactId=The artifact ID in the source artifact version metadata is incorrect.
-failure.incorrect.snapshotMetadata.groupId=The group ID in the source artifact version metadata is incorrect.
-failure.incorrect.snapshotMetadata.version=The version in the source artifact version metadata is incorrect.
-failure.incorrect.snapshotMetadata.snapshot=The snapshot information in the source artifact version metadata is incorrect.
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/org/apache/archiva/converter/artifact/messages.properties b/archiva-modules/archiva-maven/archiva-maven-converter/src/main/resources/org/apache/archiva/converter/artifact/messages.properties
deleted file mode 100644 (file)
index 5e5bc6d..0000000
+++ /dev/null
@@ -1,51 +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.
-#
-
-unable.to.validate.metadata=Unable to validate metadata
-unable.to.copy.pom=Unable to copy pom.
-unable.to.copy.artifact=Unable to copy artifact
-unable.to.read.source.pom=Unable to read source POM: {0} 
-unable.to.write.target.pom=Unable to write target POM: {0}
-unable.to.write.converted.pom=Unable to write converted POM
-
-
-exception.repositories.match=Source repository of artifact, and target repository are the same.  No conversion needed.
-transaction.failure=Transaction failure: {0} 
-invalid.source.pom=Invalid source pom: {0}
-
-warning.missing.pom=The artifact had no POM in the source repository.
-
-error.copying.artifact=Error copying artifact
-error.reading.target.metadata=Error reading target metadata
-error.writing.target.metadata=Error writing target metadata
-
-failure.target.already.exists=The artifact could not be converted because it already exists.
-failure.incorrect.groupMetadata.groupId=The group ID in the source group metadata is incorrect.
-
-failure.incorrect.artifactMetadata.artifactId=The artifact ID in the source artifact metadata is incorrect.
-failure.incorrect.artifactMetadata.groupId=The group ID in the source artifact metadata is incorrect.
-failure.incorrect.artifactMetadata.versions=The version list in the source artifact metadata is incorrect.
-
-failure.incorrect.snapshotMetadata.artifactId=The artifact ID in the source artifact version metadata is incorrect.
-failure.incorrect.snapshotMetadata.groupId=The group ID in the source artifact version metadata is incorrect.
-failure.incorrect.snapshotMetadata.version=The version in the source artifact version metadata is incorrect.
-failure.incorrect.snapshotMetadata.snapshot=The snapshot information in the source artifact version metadata is incorrect.
-
-failure.incorrect.md5=The MD5 checksum value was incorrect.
-failure.incorrect.sha1=The SHA1 checksum value was incorrect.
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-one.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-one.pom
deleted file mode 100644 (file)
index cd3862d..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-three.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-three.pom
deleted file mode 100644 (file)
index 3432910..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-two.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-artifact-two.pom
deleted file mode 100644 (file)
index 2274701..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/converted-v3-snapshot.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3-snapshot.pom
deleted file mode 100644 (file)
index f03b5a5..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
deleted file mode 100644 (file)
index 1c56340..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/converted-v3-warnings.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3-warnings.pom
deleted file mode 100644 (file)
index bdd2276..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/converted-v3.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/converted-v3.pom
deleted file mode 100644 (file)
index df4700c..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/maven-foo-plugin-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/maven-foo-plugin-1.0.pom
deleted file mode 100644 (file)
index 17095cc..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/newversion-artifact-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/newversion-artifact-metadata.xml
deleted file mode 100644 (file)
index ecc7f09..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/maven-metadata.xml
deleted file mode 100644 (file)
index ebd9be9..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.jar
deleted file mode 100644 (file)
index 29ef827..0000000
+++ /dev/null
@@ -1 +0,0 @@
-v3
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
deleted file mode 100644 (file)
index 3f5df22..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/relocated-test/relocated-v3artifact/maven-metadata.xml
deleted file mode 100644 (file)
index b4b1a86..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/test/relocated-v3artifact/1.0.0/relocated-v3artifact-1.0.0.pom
deleted file mode 100644 (file)
index 4efefb7..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/v3-artifact-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-artifact-metadata.xml
deleted file mode 100644 (file)
index a8a7f37..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
deleted file mode 100644 (file)
index 24d25a0..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/v3-snapshot-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-snapshot-metadata.xml
deleted file mode 100644 (file)
index b19c537..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
deleted file mode 100644 (file)
index 602c38e..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/v3-version-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v3-version-metadata.xml
deleted file mode 100644 (file)
index 3c89389..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/v4-artifact-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-artifact-metadata.xml
deleted file mode 100644 (file)
index c0cdbfd..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
deleted file mode 100644 (file)
index f8072b0..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/v4-snapshot-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-snapshot-metadata.xml
deleted file mode 100644 (file)
index d5ecb7d..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
deleted file mode 100644 (file)
index 060a79c..0000000
+++ /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-maven/archiva-maven-converter/src/test/expected-files/v4-version-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/expected-files/v4-version-metadata.xml
deleted file mode 100644 (file)
index 7cbd8ad..0000000
+++ /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-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/RepositoryConverterTest.java
deleted file mode 100644 (file)
index b52f951..0000000
+++ /dev/null
@@ -1,164 +0,0 @@
-package org.apache.archiva.converter;
-
-/*
- * 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.
- */
-
-import junit.framework.TestCase;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
-import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.archiva.converter.artifact.LegacyRepositoryLayout;
-import org.apache.archiva.converter.legacy.LegacyRepositoryConverter;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.MavenArtifactRepository;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.test.context.ContextConfiguration;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Test the repository converter.
- *
- * @todo what about deletions from the source repository?
- * @todo use artifact-test instead
- * @todo should reject if dependencies are missing - rely on reporting?
- * @todo group metadata
- */
-@RunWith( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = {"classpath*:/META-INF/spring-context.xml","classpath:/spring-context.xml"} )
-public class RepositoryConverterTest
-    extends TestCase
-{
-    private ArtifactRepository sourceRepository;
-
-    private ManagedRepositoryConfiguration targetRepository;
-
-    @Inject
-    @Named(value = "legacyRepositoryConverter#default")
-    private LegacyRepositoryConverter repositoryConverter;
-
-    @Inject
-    PlexusSisuBridge plexusSisuBridge;
-
-    @Before
-    @Override
-    public void setUp()
-        throws Exception
-    {
-        super.setUp();
-
-        // ArtifactRepositoryFactory factory = plexusSisuBridge.lookup( ArtifactRepositoryFactory.class );
-            //(ArtifactRepositoryFactory) lookup( ArtifactRepositoryFactory.ROLE );
-
-        ArtifactRepositoryLayout layout = new LegacyRepositoryLayout();
-            //(ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "legacy" );
-
-        Path sourceBase = Paths.get( "src/test/source-repository" );
-        sourceRepository = new MavenArtifactRepository( "source", sourceBase.toUri().toURL().toString(), layout, null,
-                                                             null );
-
-        layout = plexusSisuBridge.lookup( ArtifactRepositoryLayout.class, "default" );
-            //(ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" );
-
-        Path targetBase = Paths.get( "target/test-target-repository" );
-        copyDirectoryStructure( Paths.get( "src/test/target-repository" ), targetBase );
-
-        targetRepository = new ManagedRepositoryConfiguration();
-        targetRepository.setId( "target" );
-        targetRepository.setName( "Target Repo" );
-        targetRepository.setLocation( targetBase.toAbsolutePath().toString() );
-        targetRepository.setLayout( "default" );
-
-        //repositoryConverter = (LegacyRepositoryConverter) lookup( LegacyRepositoryConverter.ROLE, "default" );
-    }
-
-    @Override
-    protected void tearDown()
-        throws Exception
-    {
-        super.tearDown();
-    }
-
-    private void copyDirectoryStructure( Path sourceDirectory, Path destinationDirectory )
-        throws IOException
-    {
-        if ( !Files.exists(sourceDirectory) )
-        {
-            throw new IOException( "Source directory doesn't exists (" + sourceDirectory.toAbsolutePath() + ")." );
-        }
-
-        Path[] files = Files.list(sourceDirectory).toArray(Path[]::new);
-
-        String sourcePath = sourceDirectory.toAbsolutePath().toString();
-
-        for ( int i = 0; i < files.length; i++ )
-        {
-            Path file = files[i];
-
-            String dest = file.toAbsolutePath().toString();
-
-            dest = dest.substring( sourcePath.length() + 1 );
-
-            Path destination = destinationDirectory.resolve( dest );
-
-            if ( Files.isRegularFile(file) )
-            {
-                destination = destination.getParent();
-
-                FileUtils.copyFileToDirectory( file.toFile(), destination.toFile() );
-            }
-            else if ( Files.isDirectory(file) )
-            {
-                if ( !".svn".equals( file.getFileName().toString() ) )
-                {
-                    if ( !Files.exists(destination))
-                    {
-                        Files.createDirectories( destination );
-                    }
-                    copyDirectoryStructure( file, destination );
-                }
-            }
-            else
-            {
-                throw new IOException( "Unknown file type: " + file.toAbsolutePath() );
-            }
-        }
-    }
-
-    @Test
-    public void testLegacyConversion()
-        throws IOException, RepositoryConversionException
-    {
-        Path legacyRepoDir = Paths.get( sourceRepository.getBasedir() );
-        Path destRepoDir = Paths.get( targetRepository.getLocation() );
-        List<String> excludes = new ArrayList<>();
-        repositoryConverter.convertLegacyRepository( legacyRepoDir, destRepoDir, excludes );
-    }
-}
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverterTest.java
deleted file mode 100644 (file)
index 8a4cbbc..0000000
+++ /dev/null
@@ -1,1050 +0,0 @@
-package org.apache.archiva.converter.artifact;
-
-/*
- * 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.
- */
-
-import junit.framework.TestCase;
-import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
-import org.apache.commons.io.FileUtils;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.MavenArtifactRepository;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
-import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.context.ApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-
-import javax.inject.Inject;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.attribute.FileTime;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.regex.Matcher;
-
-/**
- * LegacyToDefaultConverterTest
- */
-@RunWith (ArchivaSpringJUnit4ClassRunner.class)
-@ContextConfiguration (locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" })
-public class LegacyToDefaultConverterTest
-    extends TestCase
-{
-    private ArtifactRepository sourceRepository;
-
-    private ArtifactRepository targetRepository;
-
-    private ArtifactConverter artifactConverter;
-
-    private ArtifactFactory artifactFactory;
-
-    @Inject
-    private PlexusSisuBridge plexusSisuBridge;
-
-    @Inject
-    private ApplicationContext applicationContext;
-
-    private static final int SLEEP_MILLIS = 100;
-
-    @Before
-    public void init()
-        throws Exception
-    {
-        super.setUp();
-
-        // ArtifactRepositoryFactory factory = plexusSisuBridge.lookup( ArtifactRepositoryFactory.class );
-
-        ArtifactRepositoryLayout layout = new LegacyRepositoryLayout();
-
-        Path sourceBase = getTestFile( "src/test/source-repository" );
-        sourceRepository =
-            new MavenArtifactRepository( "source", sourceBase.toUri().toURL().toString(), layout, null, null );
-
-        layout = plexusSisuBridge.lookup( ArtifactRepositoryLayout.class, "default" );
-
-        Path targetBase = getTestFile( "target/test-target-repository" );
-        copyDirectoryStructure( getTestFile( "src/test/target-repository" ), targetBase );
-
-        targetRepository =
-            new MavenArtifactRepository( "target", targetBase.toUri().toURL().toString(), layout, null, null );
-
-        artifactConverter =
-            applicationContext.getBean( "artifactConverter#legacy-to-default", ArtifactConverter.class );
-
-        artifactConverter.clearWarnings();
-        artifactFactory = (ArtifactFactory) plexusSisuBridge.lookup( ArtifactFactory.class );
-    }
-
-    public static Path getTestFile( String path )
-    {
-        return Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), path );
-    }
-
-    private void copyDirectoryStructure( Path sourceDirectory, Path destinationDirectory )
-        throws IOException
-    {
-        if ( !Files.exists(sourceDirectory) )
-        {
-            throw new IOException( "Source directory doesn't exists (" + sourceDirectory.toAbsolutePath()+ ")." );
-        }
-
-        Path[] files = Files.list( sourceDirectory ).toArray( Path[]::new );
-
-        String sourcePath = sourceDirectory.toAbsolutePath().toString();
-
-        for ( int i = 0; i < files.length; i++ )
-        {
-            Path file = files[i];
-
-            String dest = file.toAbsolutePath().toString();
-
-            dest = dest.substring( sourcePath.length() + 1 );
-
-            Path destination = destinationDirectory.resolve( dest );
-
-            if ( Files.isRegularFile( file ) )
-            {
-                destination = destination.getParent();
-
-                FileUtils.copyFileToDirectory( file.toFile(), destination.toFile() );
-            }
-            else if ( Files.isDirectory( file ) )
-            {
-                if ( !".svn".equals( file.getFileName().toString() ) )
-                {
-                    if ( !Files.exists(destination))
-                    {
-                        Files.createDirectories( destination );
-                    }
-                    copyDirectoryStructure( file, destination );
-                }
-            }
-            else
-            {
-                throw new IOException( "Unknown file type: " + file.toAbsolutePath() );
-            }
-        }
-    }
-
-    @Test
-    public void testV4PomConvert()
-        throws Exception
-    {
-        // test that it is copied as is
-
-        Artifact artifact = createArtifact( "test", "v4artifact", "1.0.0" );
-        ArtifactMetadata artifactMetadata = new ArtifactRepositoryMetadata( artifact );
-        Path artifactMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                              targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
-        Files.deleteIfExists( artifactMetadataFile);
-
-        ArtifactMetadata versionMetadata = new SnapshotArtifactRepositoryMetadata( artifact );
-        Path versionMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                             targetRepository.pathOfRemoteRepositoryMetadata( versionMetadata ) );
-        Files.deleteIfExists(versionMetadataFile);
-
-        Path artifactFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Files.deleteIfExists(artifactFile);
-
-        artifactConverter.convert( artifact, targetRepository );
-        checkSuccess( artifactConverter );
-
-        assertTrue( "Check artifact created", Files.exists(artifactFile) );
-        assertTrue( "Check artifact matches", FileUtils.contentEquals( artifactFile.toFile(), artifact.getFile() ) );
-
-        artifact = createPomArtifact( artifact );
-        Path pomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Path sourcePomFile = Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( artifact ) );
-        assertTrue( "Check POM created", Files.exists(pomFile) );
-
-        compareFiles( sourcePomFile, pomFile );
-
-        assertTrue( "Check artifact metadata created", Files.exists(artifactMetadataFile) );
-
-        Path expectedMetadataFile = getTestFile( "src/test/expected-files/v4-artifact-metadata.xml" );
-
-        compareFiles( expectedMetadataFile, artifactMetadataFile );
-
-        assertTrue( "Check snapshot metadata created", Files.exists(versionMetadataFile) );
-
-        expectedMetadataFile = getTestFile( "src/test/expected-files/v4-version-metadata.xml" );
-
-        compareFiles( expectedMetadataFile, versionMetadataFile );
-    }
-
-    @Test
-    public void testV3PomConvert()
-        throws Exception
-    {
-        // test that the pom is coverted
-
-        Artifact artifact = createArtifact( "test", "v3artifact", "1.0.0" );
-        ArtifactMetadata artifactMetadata = new ArtifactRepositoryMetadata( artifact );
-        Path artifactMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                              targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
-        Files.deleteIfExists(artifactMetadataFile);
-
-        ArtifactMetadata versionMetadata = new SnapshotArtifactRepositoryMetadata( artifact );
-        Path versionMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                             targetRepository.pathOfRemoteRepositoryMetadata( versionMetadata ) );
-        Files.deleteIfExists(versionMetadataFile);
-
-        artifactConverter.convert( artifact, targetRepository );
-        checkSuccess( artifactConverter );
-
-        Path artifactFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        assertTrue( "Check artifact created", Files.exists(artifactFile) );
-        assertTrue( "Check artifact matches", FileUtils.contentEquals( artifactFile.toFile(), artifact.getFile() ) );
-
-        artifact = createPomArtifact( artifact );
-        Path pomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Path expectedPomFile = getTestFile( "src/test/expected-files/converted-v3.pom" );
-        assertTrue( "Check POM created", Files.exists(pomFile) );
-
-        compareFiles( expectedPomFile, pomFile );
-
-        assertTrue( "Check artifact metadata created", Files.exists(artifactMetadataFile) );
-
-        Path expectedMetadataFile = getTestFile( "src/test/expected-files/v3-artifact-metadata.xml" );
-
-        compareFiles( expectedMetadataFile, artifactMetadataFile );
-
-        assertTrue( "Check snapshot metadata created", Files.exists(versionMetadataFile) );
-
-        expectedMetadataFile = getTestFile( "src/test/expected-files/v3-version-metadata.xml" );
-
-        compareFiles( expectedMetadataFile, versionMetadataFile );
-    }
-
-    @Test
-    public void testV3PomConvertWithRelocation()
-        throws Exception
-    {
-        Artifact artifact = createArtifact( "test", "relocated-v3artifact", "1.0.0" );
-        ArtifactMetadata artifactMetadata = new ArtifactRepositoryMetadata( artifact );
-        Path artifactMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                              targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
-        Files.deleteIfExists(artifactMetadataFile);
-
-        ArtifactMetadata versionMetadata = new SnapshotArtifactRepositoryMetadata( artifact );
-        Path versionMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                             targetRepository.pathOfRemoteRepositoryMetadata( versionMetadata ) );
-        Files.deleteIfExists(versionMetadataFile);
-
-        artifactConverter.convert( artifact, targetRepository );
-        //checkSuccess();  --> commented until MNG-2100 is fixed
-
-        Path artifactFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        assertTrue( "Check if relocated artifact created", Files.exists(artifactFile) );
-        assertTrue( "Check if relocated artifact matches",
-                    FileUtils.contentEquals( artifactFile.toFile(), artifact.getFile() ) );
-        Artifact pomArtifact = createArtifact( "relocated-test", "relocated-v3artifact", "1.0.0", "1.0.0", "pom" );
-        Path pomFile = getTestFile( "src/test/expected-files/" + targetRepository.pathOf( pomArtifact ) );
-        Path testFile = getTestFile( "target/test-target-repository/" + targetRepository.pathOf( pomArtifact ) );
-        compareFiles( pomFile, testFile );
-
-        Artifact orig = createArtifact( "test", "relocated-v3artifact", "1.0.0", "1.0.0", "pom" );
-        artifactFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( orig ) );
-        assertTrue( "Check if relocation artifact pom is created", Files.exists(artifactFile) );
-        testFile = getTestFile( "src/test/expected-files/" + targetRepository.pathOf( orig ) );
-        compareFiles( artifactFile, testFile );
-    }
-
-    @Test
-    public void testV3PomWarningsOnConvert()
-        throws Exception
-    {
-        // test that the pom is converted but that warnings are reported
-
-        Artifact artifact = createArtifact( "test", "v3-warnings-artifact", "1.0.0" );
-        ArtifactMetadata artifactMetadata = new ArtifactRepositoryMetadata( artifact );
-        Path artifactMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                              targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
-        Files.deleteIfExists(artifactMetadataFile);
-
-        ArtifactMetadata versionMetadata = new SnapshotArtifactRepositoryMetadata( artifact );
-        Path versionMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                             targetRepository.pathOfRemoteRepositoryMetadata( versionMetadata ) );
-        Files.deleteIfExists(versionMetadataFile);
-
-        artifactConverter.convert( artifact, targetRepository );
-        checkWarnings( artifactConverter, 2 );
-
-        Path artifactFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        assertTrue( "Check artifact created", Files.exists(artifactFile) );
-        assertTrue( "Check artifact matches", FileUtils.contentEquals( artifactFile.toFile(), artifact.getFile() ) );
-
-        artifact = createPomArtifact( artifact );
-        Path pomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Path expectedPomFile = getTestFile( "src/test/expected-files/converted-v3-warnings.pom" );
-        assertTrue( "Check POM created", Files.exists(pomFile) );
-
-        compareFiles( expectedPomFile, pomFile );
-
-        // TODO: check 2 warnings (extend and versions) matched on i18n key
-    }
-
-    private void doTestV4SnapshotPomConvert( String version, String expectedMetadataFileName )
-        throws Exception
-    {
-        // test that it is copied as is
-
-        Artifact artifact = createArtifact( "test", "v4artifact", version );
-        ArtifactMetadata artifactMetadata = new ArtifactRepositoryMetadata( artifact );
-        Path artifactMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                              targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
-        Files.deleteIfExists(artifactMetadataFile);
-
-        ArtifactMetadata snapshotMetadata = new SnapshotArtifactRepositoryMetadata( artifact );
-        Path snapshotMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                              targetRepository.pathOfRemoteRepositoryMetadata( snapshotMetadata ) );
-        Files.deleteIfExists(snapshotMetadataFile);
-
-        artifactConverter.convert( artifact, targetRepository );
-        checkSuccess( artifactConverter );
-
-        Path artifactFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        assertTrue( "Check artifact created", Files.exists(artifactFile) );
-        assertTrue( "Check artifact matches", FileUtils.contentEquals( artifactFile.toFile(), artifact.getFile() ) );
-
-        artifact = createPomArtifact( artifact );
-        Path pomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Path sourcePomFile = Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( artifact ) );
-        assertTrue( "Check POM created", Files.exists(pomFile) );
-
-        compareFiles( sourcePomFile, pomFile );
-
-        assertTrue( "Check artifact metadata created", Files.exists(artifactMetadataFile) );
-
-        Path expectedMetadataFile = getTestFile( "src/test/expected-files/v4-snapshot-artifact-metadata.xml" );
-
-        compareFiles( expectedMetadataFile, artifactMetadataFile );
-
-        assertTrue( "Check snapshot metadata created", Files.exists(snapshotMetadataFile) );
-
-        expectedMetadataFile = getTestFile( expectedMetadataFileName );
-
-        compareFiles( expectedMetadataFile, snapshotMetadataFile );
-    }
-
-    @Test
-    public void testV3SnapshotPomConvert()
-        throws Exception
-    {
-        // test that the pom is coverted
-
-        Artifact artifact = createArtifact( "test", "v3artifact", "1.0.0-SNAPSHOT" );
-        ArtifactMetadata artifactMetadata = new ArtifactRepositoryMetadata( artifact );
-        Path artifactMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                              targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
-        Files.deleteIfExists(artifactMetadataFile);
-
-        ArtifactMetadata snapshotMetadata = new SnapshotArtifactRepositoryMetadata( artifact );
-        Path snapshotMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                              targetRepository.pathOfRemoteRepositoryMetadata( snapshotMetadata ) );
-        Files.deleteIfExists(snapshotMetadataFile);
-
-        artifactConverter.convert( artifact, targetRepository );
-        checkSuccess( artifactConverter );
-
-        Path artifactFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        assertTrue( "Check artifact created", Files.exists(artifactFile) );
-        assertTrue( "Check artifact matches", FileUtils.contentEquals( artifactFile.toFile(), artifact.getFile() ) );
-
-        artifact = createPomArtifact( artifact );
-        Path pomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Path expectedPomFile = getTestFile( "src/test/expected-files/converted-v3-snapshot.pom" );
-        assertTrue( "Check POM created", Files.exists(pomFile) );
-
-        compareFiles( expectedPomFile, pomFile );
-
-        assertTrue( "Check artifact metadata created", Files.exists(artifactMetadataFile) );
-
-        Path expectedMetadataFile = getTestFile( "src/test/expected-files/v3-snapshot-artifact-metadata.xml" );
-
-        compareFiles( expectedMetadataFile, artifactMetadataFile );
-
-        assertTrue( "Check snapshot metadata created", Files.exists(snapshotMetadataFile) );
-
-        expectedMetadataFile = getTestFile( "src/test/expected-files/v3-snapshot-metadata.xml" );
-
-        compareFiles( expectedMetadataFile, snapshotMetadataFile );
-    }
-
-    @Test
-    public void testV4SnapshotPomConvert()
-        throws Exception
-    {
-        doTestV4SnapshotPomConvert( "1.0.0-SNAPSHOT", "src/test/expected-files/v4-snapshot-metadata.xml" );
-
-        assertTrue( true );
-    }
-
-    @Test
-    public void testV4TimestampedSnapshotPomConvert()
-        throws Exception
-    {
-        doTestV4SnapshotPomConvert( "1.0.0-20060111.120115-1",
-                                    "src/test/expected-files/v4-timestamped-snapshot-metadata.xml" );
-
-        assertTrue( true );
-    }
-
-    @Test
-    public void testMavenOnePluginConversion()
-        throws Exception
-    {
-        Artifact artifact =
-            createArtifact( "org.apache.maven.plugins", "maven-foo-plugin", "1.0", "1.0", "maven-plugin" );
-        artifact.setFile(
-            Paths.get( org.apache.archiva.common.utils.FileUtils.getBasedir(), "src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar" ).toFile() );
-        artifactConverter.convert( artifact, targetRepository );
-        // There is a warning but I can't figure out how to look at it. Eyeballing the results it appears
-        // the plugin is being coverted correctly.
-        //checkSuccess();
-
-        Path artifactFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        assertTrue( "Check artifact created", Files.exists(artifactFile) );
-        assertTrue( "Check artifact matches", FileUtils.contentEquals( artifactFile.toFile(), artifact.getFile() ) );
-
-        /*
-         The POM isn't needed for Maven 1.x plugins but the raw conversion for  
-
-         artifact = createPomArtifact( artifact );
-         Path pomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-         File expectedPomFile = getTestFile( "src/test/expected-files/maven-foo-plugin-1.0.pom" );
-         assertTrue( "Check POM created", Files.exists(pomFile) );
-         compareFiles( expectedPomFile, pomFile );
-         */
-    }
-
-    @Test
-    public void testV3TimestampedSnapshotPomConvert()
-        throws Exception
-    {
-        // test that the pom is coverted
-
-        Artifact artifact = createArtifact( "test", "v3artifact", "1.0.0-20060105.130101-3" );
-        ArtifactMetadata artifactMetadata = new ArtifactRepositoryMetadata( artifact );
-        Path artifactMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                              targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
-        Files.deleteIfExists(artifactMetadataFile);
-
-        ArtifactMetadata snapshotMetadata = new SnapshotArtifactRepositoryMetadata( artifact );
-        Path snapshotMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                              targetRepository.pathOfRemoteRepositoryMetadata( snapshotMetadata ) );
-        Files.deleteIfExists(snapshotMetadataFile);
-
-        artifactConverter.convert( artifact, targetRepository );
-        checkSuccess( artifactConverter );
-
-        Path artifactFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        assertTrue( "Check artifact created", Files.exists(artifactFile) );
-        assertTrue( "Check artifact matches", FileUtils.contentEquals( artifactFile.toFile(), artifact.getFile() ) );
-
-        artifact = createPomArtifact( artifact );
-        Path pomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Path expectedPomFile = getTestFile( "src/test/expected-files/converted-v3-timestamped-snapshot.pom" );
-        assertTrue( "Check POM created", Files.exists(pomFile) );
-
-        compareFiles( expectedPomFile, pomFile );
-
-        assertTrue( "Check artifact snapshotMetadata created", Files.exists(artifactMetadataFile) );
-
-        Path expectedMetadataFile = getTestFile( "src/test/expected-files/v3-snapshot-artifact-metadata.xml" );
-
-        compareFiles( expectedMetadataFile, artifactMetadataFile );
-
-        assertTrue( "Check snapshot snapshotMetadata created", Files.exists(snapshotMetadataFile) );
-
-        expectedMetadataFile = getTestFile( "src/test/expected-files/v3-timestamped-snapshot-metadata.xml" );
-
-        compareFiles( expectedMetadataFile, snapshotMetadataFile );
-    }
-
-    @Test
-    public void testNoPomConvert()
-        throws Exception
-    {
-        // test that a POM is not created when there was none at the source
-
-        Artifact artifact = createArtifact( "test", "noPomArtifact", "1.0.0" );
-        artifactConverter.convert( artifact, targetRepository );
-        checkWarnings( artifactConverter, 1 );
-
-        assertHasWarningReason( artifactConverter, Messages.getString( "warning.missing.pom" ) );
-
-        Path artifactFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        assertTrue( "Check artifact created", Files.exists(artifactFile) );
-        assertTrue( "Check artifact matches", FileUtils.contentEquals( artifactFile.toFile(), artifact.getFile() ) );
-
-        artifact = createPomArtifact( artifact );
-        Path pomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Path sourcePomFile = Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( artifact ) );
-
-        assertFalse( "Check no POM created", Files.exists(pomFile) );
-        assertFalse( "No source POM", Files.exists(sourcePomFile) );
-    }
-
-    @Test
-    public void testIncorrectSourceChecksumMd5()
-        throws Exception
-    {
-        // test that it fails when the source md5 is wrong
-
-        Artifact artifact = createArtifact( "test", "incorrectMd5Artifact", "1.0.0" );
-        Path file = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Files.deleteIfExists(file);
-
-        artifactConverter.convert( artifact, targetRepository );
-        checkWarnings( artifactConverter, 2 );
-
-        assertHasWarningReason( artifactConverter, Messages.getString( "failure.incorrect.md5" ) );
-
-        assertFalse( "Check artifact not created", Files.exists(file) );
-
-        ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact );
-        Path metadataFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOfRemoteRepositoryMetadata( metadata ) );
-        assertFalse( "Check metadata not created", Files.exists(metadataFile) );
-    }
-
-    @Test
-    public void testIncorrectSourceChecksumSha1()
-        throws Exception
-    {
-        // test that it fails when the source sha1 is wrong
-
-        Artifact artifact = createArtifact( "test", "incorrectSha1Artifact", "1.0.0" );
-        Path file = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Files.deleteIfExists(file);
-
-        artifactConverter.convert( artifact, targetRepository );
-        checkWarnings( artifactConverter, 2 );
-
-        assertHasWarningReason( artifactConverter, Messages.getString( "failure.incorrect.sha1" ) );
-
-        assertFalse( "Check artifact not created", Files.exists(file) );
-
-        ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact );
-        Path metadataFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOfRemoteRepositoryMetadata( metadata ) );
-        assertFalse( "Check metadata not created", Files.exists(metadataFile) );
-    }
-
-    @Test
-    public void testUnmodifiedArtifact()
-        throws Exception, InterruptedException
-    {
-        // test the unmodified artifact is untouched
-
-        Artifact artifact = createArtifact( "test", "unmodified-artifact", "1.0.0" );
-        Artifact pomArtifact = createPomArtifact( artifact );
-
-        Path sourceFile = Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( artifact ) );
-        Path sourcePomFile = Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( pomArtifact ) );
-        Path targetFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Path targetPomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( pomArtifact ) );
-
-        assertTrue( "Check target file exists", Files.exists(targetFile) );
-        assertTrue( "Check target POM exists", Files.exists(targetPomFile) );
-
-        Files.setLastModifiedTime( sourceFile, FileTime.from(System.currentTimeMillis(), TimeUnit.MILLISECONDS) );
-        Files.setLastModifiedTime( sourcePomFile, FileTime.from(System.currentTimeMillis(), TimeUnit.MILLISECONDS) );
-
-        long origTime = Files.getLastModifiedTime( targetFile ).toMillis();
-        long origPomTime = Files.getLastModifiedTime( targetPomFile ).toMillis();
-
-        // Need to guarantee last modified is not equal
-        Thread.sleep( SLEEP_MILLIS );
-
-        artifactConverter.convert( artifact, targetRepository );
-        checkSuccess( artifactConverter );
-
-        compareFiles( sourceFile, targetFile );
-        compareFiles( sourcePomFile, targetPomFile );
-
-        assertEquals( "Check artifact unmodified", origTime, Files.getLastModifiedTime( targetFile ).toMillis() );
-        assertEquals( "Check POM unmodified", origPomTime, Files.getLastModifiedTime( targetPomFile ).toMillis() );
-    }
-
-    @Test
-    public void testModifedArtifactFails()
-        throws Exception
-    {
-        // test that it fails when the source artifact has changed and is different to the existing artifact in the
-        // target repository
-
-        Artifact artifact = createArtifact( "test", "modified-artifact", "1.0.0" );
-        Artifact pomArtifact = createPomArtifact( artifact );
-
-        Path sourceFile = Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( artifact ) );
-        Path sourcePomFile = Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( pomArtifact ) );
-        Path targetFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Path targetPomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( pomArtifact ) );
-
-        assertTrue( "Check target file exists", Files.exists(targetFile) );
-        assertTrue( "Check target POM exists", Files.exists(targetPomFile) );
-
-        Files.setLastModifiedTime(sourceFile, FileTime.from(System.currentTimeMillis() , TimeUnit.MILLISECONDS));
-        Files.setLastModifiedTime(sourcePomFile, FileTime.from(System.currentTimeMillis() , TimeUnit.MILLISECONDS));
-
-        long origTime = Files.getLastModifiedTime(targetFile).toMillis();
-        long origPomTime = Files.getLastModifiedTime(targetPomFile).toMillis();
-
-        // Need to guarantee last modified is not equal
-        Thread.sleep( SLEEP_MILLIS );
-
-        artifactConverter.convert( artifact, targetRepository );
-        checkWarnings( artifactConverter, 2 );
-
-        assertHasWarningReason( artifactConverter, Messages.getString( "failure.target.already.exists" ) );
-
-        assertEquals( "Check unmodified", origTime, Files.getLastModifiedTime(targetFile).toMillis() );
-        assertEquals( "Check unmodified", origPomTime, Files.getLastModifiedTime(targetPomFile).toMillis() );
-
-        ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact );
-        Path metadataFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOfRemoteRepositoryMetadata( metadata ) );
-        assertFalse( "Check metadata not created", Files.exists(metadataFile) );
-    }
-
-    @Test
-    public void testForcedUnmodifiedArtifact()
-        throws Exception
-    {
-        // test unmodified artifact is still converted when set to force
-
-        artifactConverter =
-            applicationContext.getBean( "artifactConverter#force-repository-converter", ArtifactConverter.class );
-
-        Artifact artifact = createArtifact( "test", "unmodified-artifact", "1.0.0" );
-        Artifact pomArtifact = createPomArtifact( artifact );
-
-        Path sourceFile = Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( artifact ) );
-        Path sourcePomFile = Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( pomArtifact ) );
-        Path targetFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Path targetPomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( pomArtifact ) );
-
-        SimpleDateFormat dateFormat = new SimpleDateFormat( "yyyy-MM-dd", Locale.getDefault() );
-        long origTime = dateFormat.parse( "2006-03-03" ).getTime();
-        Files.setLastModifiedTime(targetFile, FileTime.from(origTime , TimeUnit.MILLISECONDS));
-        Files.setLastModifiedTime(targetPomFile, FileTime.from(origTime , TimeUnit.MILLISECONDS));
-
-        Files.setLastModifiedTime(sourceFile, FileTime.from(dateFormat.parse( "2006-01-01" ).getTime() , TimeUnit.MILLISECONDS));
-        Files.setLastModifiedTime(sourcePomFile, FileTime.from(dateFormat.parse( "2006-02-02" ).getTime() , TimeUnit.MILLISECONDS));
-
-        artifactConverter.convert( artifact, targetRepository );
-        checkSuccess( artifactConverter );
-
-        compareFiles( sourceFile, targetFile );
-        compareFiles( sourcePomFile, targetPomFile );
-
-        assertFalse( "Check modified", origTime == Files.getLastModifiedTime(targetFile).toMillis() );
-        assertFalse( "Check modified", origTime == Files.getLastModifiedTime(targetPomFile).toMillis() );
-
-        ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact );
-        Path metadataFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOfRemoteRepositoryMetadata( metadata ) );
-        assertTrue( "Check metadata created", Files.exists(metadataFile) );
-    }
-
-    @Test
-    public void testDryRunSuccess()
-        throws Exception
-    {
-        // test dry run does nothing on a run that will be successful, and returns success
-
-        artifactConverter =
-            applicationContext.getBean( "artifactConverter#dryrun-repository-converter", ArtifactConverter.class );
-
-        Artifact artifact = createArtifact( "test", "dryrun-artifact", "1.0.0" );
-        Artifact pomArtifact = createPomArtifact( artifact );
-
-        Path sourceFile = Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( artifact ) );
-        Path sourcePomFile = Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( pomArtifact ) );
-        Path targetFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Path targetPomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( pomArtifact ) );
-
-        // clear warning before test related to MRM-1638
-        artifactConverter.clearWarnings();
-        artifactConverter.convert( artifact, targetRepository );
-        checkSuccess( artifactConverter );
-
-        assertTrue( "Check source file exists", Files.exists(sourceFile) );
-        assertTrue( "Check source POM exists", Files.exists(sourcePomFile) );
-
-        assertFalse( "Check target file doesn't exist", Files.exists(targetFile) );
-        assertFalse( "Check target POM doesn't exist", Files.exists(targetPomFile) );
-
-        ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact );
-        Path metadataFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOfRemoteRepositoryMetadata( metadata ) );
-        assertFalse( "Check metadata not created", Files.exists(metadataFile) );
-    }
-
-    @Test
-    public void testDryRunFailure()
-        throws Exception
-    {
-        // test dry run does nothing on a run that will fail, and returns failure
-
-        artifactConverter =
-            applicationContext.getBean( "artifactConverter#dryrun-repository-converter", ArtifactConverter.class );
-
-        Artifact artifact = createArtifact( "test", "modified-artifact", "1.0.0" );
-        Artifact pomArtifact = createPomArtifact( artifact );
-
-        Path sourceFile = Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( artifact ) );
-        Path sourcePomFile = Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( pomArtifact ) );
-        Path targetFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Path targetPomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( pomArtifact ) );
-
-        assertTrue( "Check target file exists", Files.exists(targetFile) );
-        assertTrue( "Check target POM exists", Files.exists(targetPomFile) );
-
-        Files.setLastModifiedTime(sourceFile, FileTime.from(System.currentTimeMillis() , TimeUnit.MILLISECONDS));
-        Files.setLastModifiedTime(sourcePomFile, FileTime.from(System.currentTimeMillis() , TimeUnit.MILLISECONDS));
-
-        long origTime = Files.getLastModifiedTime(targetFile).toMillis();
-        long origPomTime = Files.getLastModifiedTime(targetPomFile).toMillis();
-
-        // Need to guarantee last modified is not equal
-        Thread.sleep( SLEEP_MILLIS );
-
-        // clear warning before test related to MRM-1638
-        artifactConverter.clearWarnings();
-        artifactConverter.convert( artifact, targetRepository );
-        checkWarnings( artifactConverter, 2 );
-
-        assertHasWarningReason( artifactConverter, Messages.getString( "failure.target.already.exists" ) );
-
-        assertEquals( "Check unmodified", origTime, Files.getLastModifiedTime(targetFile).toMillis() );
-        assertEquals( "Check unmodified", origPomTime, Files.getLastModifiedTime(targetPomFile).toMillis() );
-
-        ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact );
-        Path metadataFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOfRemoteRepositoryMetadata( metadata ) );
-        assertFalse( "Check metadata not created", Files.exists(metadataFile) );
-    }
-
-    @Test
-    public void testRollbackArtifactCreated()
-        throws Exception
-    {
-        // test rollback can remove a created artifact, including checksums
-
-        Artifact artifact = createArtifact( "test", "rollback-created-artifact", "1.0.0" );
-        ArtifactMetadata artifactMetadata = new ArtifactRepositoryMetadata( artifact );
-        Path artifactMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                              targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
-        org.apache.archiva.common.utils.FileUtils.deleteDirectory( artifactMetadataFile.getParent() );
-
-        ArtifactMetadata versionMetadata = new SnapshotArtifactRepositoryMetadata( artifact );
-        Path versionMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                             targetRepository.pathOfRemoteRepositoryMetadata( versionMetadata ) );
-
-        Path artifactFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-
-        artifactConverter.convert( artifact, targetRepository );
-        checkWarnings( artifactConverter, 2 );
-
-        boolean found = false;
-        String pattern = "^" + Messages.getString( "invalid.source.pom" ).replaceFirst( "\\{0\\}", ".*" ) + "$";
-        for ( List<String> messages : artifactConverter.getWarnings().values() )
-        {
-            for ( String message : messages )
-            {
-                if ( message.matches( pattern ) )
-                {
-                    found = true;
-                    break;
-                }
-            }
-
-            if ( found )
-            {
-                break;
-            }
-        }
-
-        assertTrue( "Check failure message.", found );
-
-        assertFalse( "check artifact rolled back", Files.exists(artifactFile) );
-        assertFalse( "check metadata rolled back", Files.exists(artifactMetadataFile) );
-        assertFalse( "check metadata rolled back", Files.exists(versionMetadataFile) );
-    }
-
-    @Test
-    public void testMultipleArtifacts()
-        throws Exception
-    {
-        // test multiple artifacts are converted
-
-        List<Artifact> artifacts = new ArrayList<>();
-        artifacts.add( createArtifact( "test", "artifact-one", "1.0.0" ) );
-        artifacts.add( createArtifact( "test", "artifact-two", "1.0.0" ) );
-        artifacts.add( createArtifact( "test", "artifact-three", "1.0.0" ) );
-
-        for ( Artifact artifact : artifacts )
-        {
-            artifactConverter.convert( artifact, targetRepository );
-            checkSuccess( artifactConverter );
-        }
-
-        for ( Artifact artifact : artifacts )
-        {
-            Path artifactFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-            assertTrue( "Check artifact created", Files.exists(artifactFile) );
-            assertTrue( "Check artifact matches", FileUtils.contentEquals( artifactFile.toFile(), artifact.getFile() ) );
-
-            artifact = createPomArtifact( artifact );
-            Path pomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-            Path expectedPomFile =
-                getTestFile( "src/test/expected-files/converted-" + artifact.getArtifactId() + ".pom" );
-            assertTrue( "Check POM created", Files.exists(pomFile) );
-
-            compareFiles( expectedPomFile, pomFile );
-        }
-    }
-
-    @Test
-    public void testInvalidSourceArtifactMetadata()
-        throws Exception
-    {
-        // test artifact is not converted when source metadata is invalid, and returns failure
-
-        createModernSourceRepository();
-
-        Artifact artifact = createArtifact( "test", "incorrectArtifactMetadata", "1.0.0" );
-        Path file = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Files.deleteIfExists(file);
-
-        artifactConverter.convert( artifact, targetRepository );
-        checkWarnings( artifactConverter, 2 );
-
-        assertHasWarningReason( artifactConverter,
-                                Messages.getString( "failure.incorrect.artifactMetadata.versions" ) );
-
-        assertFalse( "Check artifact not created", Files.exists(file) );
-
-        ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact );
-        Path metadataFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOfRemoteRepositoryMetadata( metadata ) );
-        assertFalse( "Check metadata not created", Files.exists(metadataFile) );
-    }
-
-    @Test
-    public void testInvalidSourceSnapshotMetadata()
-        throws Exception
-    {
-        // test artifact is not converted when source snapshot metadata is invalid and returns failure
-
-        createModernSourceRepository();
-
-        Artifact artifact = createArtifact( "test", "incorrectSnapshotMetadata", "1.0.0-20060102.030405-6" );
-        Path file = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Files.deleteIfExists(file);
-
-        artifactConverter.convert( artifact, targetRepository );
-        checkWarnings( artifactConverter, 2 );
-
-        assertHasWarningReason( artifactConverter,
-                                Messages.getString( "failure.incorrect.snapshotMetadata.snapshot" ) );
-
-        assertFalse( "Check artifact not created", Files.exists(file) );
-
-        ArtifactRepositoryMetadata metadata = new ArtifactRepositoryMetadata( artifact );
-        Path metadataFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOfRemoteRepositoryMetadata( metadata ) );
-        assertFalse( "Check metadata not created", Files.exists(metadataFile) );
-    }
-
-    @Test
-    public void testMergeArtifactMetadata()
-        throws Exception
-    {
-        // test artifact level metadata is merged when it already exists on successful conversion
-
-        Artifact artifact = createArtifact( "test", "newversion-artifact", "1.0.1" );
-        artifactConverter.convert( artifact, targetRepository );
-        checkSuccess( artifactConverter );
-
-        Path artifactFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        assertTrue( "Check artifact created", Files.exists(artifactFile) );
-        assertTrue( "Check artifact matches", FileUtils.contentEquals( artifactFile.toFile(), artifact.getFile() ) );
-
-        artifact = createPomArtifact( artifact );
-        Path pomFile = Paths.get( targetRepository.getBasedir(), targetRepository.pathOf( artifact ) );
-        Path sourcePomFile = Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( artifact ) );
-        assertTrue( "Check POM created", Files.exists(pomFile) );
-
-        compareFiles( sourcePomFile, pomFile );
-
-        ArtifactMetadata artifactMetadata = new ArtifactRepositoryMetadata( artifact );
-        Path artifactMetadataFile = Paths.get( targetRepository.getBasedir(),
-                                              targetRepository.pathOfRemoteRepositoryMetadata( artifactMetadata ) );
-        assertTrue( "Check artifact metadata created", Files.exists(artifactMetadataFile) );
-
-        Path expectedMetadataFile = getTestFile( "src/test/expected-files/newversion-artifact-metadata.xml" );
-
-        compareFiles( expectedMetadataFile, artifactMetadataFile );
-    }
-
-    @Test
-    public void testSourceAndTargetRepositoriesMatch()
-        throws Exception
-    {
-        // test that it fails if the same
-
-
-        sourceRepository =
-            new MavenArtifactRepository( "source", targetRepository.getUrl(), targetRepository.getLayout(), null,
-                                              null );
-
-        Artifact artifact = createArtifact( "test", "repository-artifact", "1.0" );
-
-        try
-        {
-            artifactConverter.convert( artifact, targetRepository );
-            fail( "Should have failed trying to convert within the same repository" );
-        }
-        catch ( ArtifactConversionException e )
-        {
-            // expected
-            assertEquals( "check message", Messages.getString( "exception.repositories.match" ), e.getMessage() );
-            assertNull( "Check no additional cause", e.getCause() );
-        }
-    }
-
-    private Artifact createArtifact( String groupId, String artifactId, String version )
-    {
-        Matcher matcher = Artifact.VERSION_FILE_PATTERN.matcher( version );
-        String baseVersion;
-        if ( matcher.matches() )
-        {
-            baseVersion = matcher.group( 1 ) + "-SNAPSHOT";
-        }
-        else
-        {
-            baseVersion = version;
-        }
-        return createArtifact( groupId, artifactId, baseVersion, version, "jar" );
-    }
-
-    private Artifact createArtifact( String groupId, String artifactId, String baseVersion, String version,
-                                     String type )
-    {
-        Artifact artifact = artifactFactory.createArtifact( groupId, artifactId, version, null, type );
-        artifact.setBaseVersion( baseVersion );
-        artifact.setRepository( sourceRepository );
-        artifact.setFile( Paths.get( sourceRepository.getBasedir(), sourceRepository.pathOf( artifact ) ).toFile() );
-        return artifact;
-    }
-
-    private Artifact createPomArtifact( Artifact artifact )
-    {
-        return createArtifact( artifact.getGroupId(), artifact.getArtifactId(), artifact.getBaseVersion(),
-                               artifact.getVersion(), "pom" );
-    }
-
-    private static void compareFiles( Path expectedPomFile, Path pomFile )
-        throws IOException
-    {
-        String expectedContent = normalizeString(
-            org.apache.archiva.common.utils.FileUtils.readFileToString( expectedPomFile, Charset.defaultCharset() ) );
-        String targetContent =
-            normalizeString( org.apache.archiva.common.utils.FileUtils.readFileToString( pomFile, Charset.defaultCharset() ) );
-        assertEquals( "Check file match between " + expectedPomFile + " and " + pomFile, expectedContent,
-                      targetContent );
-    }
-
-    private static String normalizeString( String path )
-    {
-        return path.trim().replaceAll( "\r\n", "\n" ).replace( '\r', '\n' ).replaceAll( "<\\?xml .+\\?>",
-                                                                                        "" ).replaceAll( "^\\s+", "" );
-    }
-
-    private void checkSuccess( ArtifactConverter converter )
-    {
-        assertNotNull( "Warnings should never be null.", converter.getWarnings() );
-        assertEquals( "Should have no warnings. " + converter.getWarnings(), 0, countWarningMessages( converter ) );
-    }
-
-    private void checkWarnings( ArtifactConverter converter, int count )
-    {
-        assertNotNull( "Warnings should never be null.", converter.getWarnings() );
-        assertEquals( "Should have some warnings.", count, countWarningMessages( converter ) );
-    }
-
-    private int countWarningMessages( ArtifactConverter converter )
-    {
-        int count = 0;
-        for ( List<String> values : converter.getWarnings().values() )
-        {
-            count += values.size();
-        }
-        return count;
-    }
-
-    private void assertHasWarningReason( ArtifactConverter converter, String reason )
-    {
-        assertNotNull( "Warnings should never be null.", converter.getWarnings() );
-        assertTrue( "Expecting 1 or more Warnings", countWarningMessages( converter ) > 0 );
-
-        for ( List<String> messages : converter.getWarnings().values() )
-        {
-            if ( messages.contains( reason ) )
-            {
-                /* No need to check any further */
-                return;
-            }
-        }
-
-        /* didn't find it. */
-
-        for ( Map.Entry<Artifact, List<String>> entry : converter.getWarnings().entrySet() )
-        {
-            Artifact artifact = (Artifact) entry.getKey();
-            System.out.println(
-                "-Artifact: " + artifact.getGroupId() + ":" + artifact.getArtifactId() + ":" + artifact.getVersion() );
-            List<String> messages = entry.getValue();
-            for ( String message : messages )
-            {
-                System.out.println( "  " + message );
-            }
-        }
-        fail( "Unable to find message <" + reason + "> in warnings." );
-    }
-
-    private void createModernSourceRepository()
-        throws Exception
-    {
-        ArtifactRepositoryLayout layout = plexusSisuBridge.lookup( ArtifactRepositoryLayout.class, "default" );
-
-        Path sourceBase = getTestFile( "src/test/source-modern-repository" );
-        sourceRepository =
-            new MavenArtifactRepository( "source", sourceBase.toUri().toURL().toString(), layout, null, null );
-    }
-}
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/java/org/apache/archiva/converter/mock/MockArchivaAdministration.java
deleted file mode 100644 (file)
index c001894..0000000
+++ /dev/null
@@ -1,199 +0,0 @@
-package org.apache.archiva.converter.mock;
-/*
- * 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.
- */
-
-import org.apache.archiva.admin.model.AuditInformation;
-import org.apache.archiva.admin.model.RepositoryAdminException;
-import org.apache.archiva.admin.model.admin.ArchivaAdministration;
-import org.apache.archiva.admin.model.beans.FileType;
-import org.apache.archiva.admin.model.beans.LegacyArtifactPath;
-import org.apache.archiva.admin.model.beans.NetworkConfiguration;
-import org.apache.archiva.admin.model.beans.OrganisationInformation;
-import org.apache.archiva.admin.model.beans.UiConfiguration;
-
-import java.util.List;
-
-/**
- * @author Olivier Lamy
- */
-public class MockArchivaAdministration
-    implements ArchivaAdministration
-{
-    @Override
-    public List<LegacyArtifactPath> getLegacyArtifactPaths()
-        throws RepositoryAdminException
-    {
-        return null;
-    }
-
-    @Override
-    public void addLegacyArtifactPath( LegacyArtifactPath legacyArtifactPath, AuditInformation auditInformation )
-        throws RepositoryAdminException
-    {
-
-    }
-
-    @Override
-    public void deleteLegacyArtifactPath( String path, AuditInformation auditInformation )
-        throws RepositoryAdminException
-    {
-
-    }
-
-    @Override
-    public void addFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
-        throws RepositoryAdminException
-    {
-
-    }
-
-    @Override
-    public void removeFileTypePattern( String fileTypeId, String pattern, AuditInformation auditInformation )
-        throws RepositoryAdminException
-    {
-
-    }
-
-    @Override
-    public List<FileType> getFileTypes()
-        throws RepositoryAdminException
-    {
-        return null;
-    }
-
-    @Override
-    public FileType getFileType( String fileTypeId )
-        throws RepositoryAdminException
-    {
-        return null;
-    }
-
-    @Override
-    public void addFileType( FileType fileType, AuditInformation auditInformation )
-        throws RepositoryAdminException
-    {
-
-    }
-
-    @Override
-    public void removeFileType( String fileTypeId, AuditInformation auditInformation )
-        throws RepositoryAdminException
-    {
-
-    }
-
-    @Override
-    public void addKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
-        throws RepositoryAdminException
-    {
-
-    }
-
-    @Override
-    public void setKnownContentConsumers( List<String> knownContentConsumers, AuditInformation auditInformation )
-        throws RepositoryAdminException
-    {
-
-    }
-
-    @Override
-    public List<String> getKnownContentConsumers()
-        throws RepositoryAdminException
-    {
-        return null;
-    }
-
-    @Override
-    public void removeKnownContentConsumer( String knownContentConsumer, AuditInformation auditInformation )
-        throws RepositoryAdminException
-    {
-
-    }
-
-    @Override
-    public void addInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
-        throws RepositoryAdminException
-    {
-
-    }
-
-    @Override
-    public void setInvalidContentConsumers( List<String> invalidContentConsumers, AuditInformation auditInformation )
-        throws RepositoryAdminException
-    {
-
-    }
-
-    @Override
-    public List<String> getInvalidContentConsumers()
-        throws RepositoryAdminException
-    {
-        return null;
-    }
-
-    @Override
-    public void removeInvalidContentConsumer( String invalidContentConsumer, AuditInformation auditInformation )
-        throws RepositoryAdminException
-    {
-
-    }
-
-    @Override
-    public OrganisationInformation getOrganisationInformation()
-        throws RepositoryAdminException
-    {
-        return null;
-    }
-
-    @Override
-    public void setOrganisationInformation( OrganisationInformation organisationInformation )
-        throws RepositoryAdminException
-    {
-
-
-    }
-
-    @Override
-    public UiConfiguration getUiConfiguration()
-        throws RepositoryAdminException
-    {
-        return null;
-    }
-
-    @Override
-    public void updateUiConfiguration( UiConfiguration uiConfiguration )
-        throws RepositoryAdminException
-    {
-
-    }
-
-    @Override
-    public NetworkConfiguration getNetworkConfiguration()
-        throws RepositoryAdminException
-    {
-        return null;
-    }
-
-    @Override
-    public void setNetworkConfiguration( NetworkConfiguration networkConfiguration )
-        throws RepositoryAdminException
-    {
-
-    }
-}
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/resources/spring-context.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/resources/spring-context.xml
deleted file mode 100644 (file)
index 69187cb..0000000
+++ /dev/null
@@ -1,38 +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"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-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>
-
-  <bean name="mockArchivaAdministration" class="org.apache.archiva.converter.mock.MockArchivaAdministration"/>
-
-</beans>
\ No newline at end of file
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.jar
deleted file mode 100644 (file)
index 72af4bc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-incorrectMd5
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/1.0.0/incorrectArtifactMetadata-1.0.0.pom
deleted file mode 100644 (file)
index b64e1d0..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectArtifactMetadata/maven-metadata.xml
deleted file mode 100644 (file)
index b393bcd..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.jar
deleted file mode 100644 (file)
index 72af4bc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-incorrectMd5
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/incorrectSnapshotMetadata-1.0.0-20060102.030405-6.pom
deleted file mode 100644 (file)
index 929190a..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/1.0.0-SNAPSHOT/maven-metadata.xml
deleted file mode 100644 (file)
index 5980278..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-modern-repository/test/incorrectSnapshotMetadata/maven-metadata.xml
deleted file mode 100644 (file)
index 3f9a0ce..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-one-1.0.0.jar
deleted file mode 100644 (file)
index 5626abf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-one
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-three-1.0.0.jar
deleted file mode 100644 (file)
index 2bdf67a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-three
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/artifact-two-1.0.0.jar
deleted file mode 100644 (file)
index f719efd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-two
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/dryrun-artifact-1.0.0.jar
deleted file mode 100644 (file)
index cbaf024..0000000
+++ /dev/null
@@ -1 +0,0 @@
-existing
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/existing-artifact-1.0.0.jar
deleted file mode 100644 (file)
index cbaf024..0000000
+++ /dev/null
@@ -1 +0,0 @@
-existing
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar
deleted file mode 100644 (file)
index 72af4bc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-incorrectMd5
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectMd5Artifact-1.0.0.jar.md5
deleted file mode 100644 (file)
index 316d9a4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-379dcfcd1e6312cc859111f696047eb4
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar
deleted file mode 100644 (file)
index f5812f3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-incorrectSha1
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/incorrectSha1Artifact-1.0.0.jar.sha1
deleted file mode 100644 (file)
index cce322e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-52e07b82d944741f66bba5896d4cd74e9879e289
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/modified-artifact-1.0.0.jar
deleted file mode 100644 (file)
index 2e09960..0000000
+++ /dev/null
@@ -1 +0,0 @@
-modified
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/newversion-artifact-1.0.1.jar
deleted file mode 100644 (file)
index c694117..0000000
+++ /dev/null
@@ -1 +0,0 @@
-v4
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/noPomArtifact-1.0.0.jar
deleted file mode 100644 (file)
index 3d27acd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-noPom
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/relocated-v3artifact-1.0.0.jar
deleted file mode 100644 (file)
index 29ef827..0000000
+++ /dev/null
@@ -1 +0,0 @@
-v3
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/rollback-created-artifact-1.0.0.jar
deleted file mode 100644 (file)
index 29ef827..0000000
+++ /dev/null
@@ -1 +0,0 @@
-v3
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/unmodified-artifact-1.0.0.jar
deleted file mode 100644 (file)
index 27597bc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-unmodified
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3-warnings-artifact-1.0.0.jar
deleted file mode 100644 (file)
index 29ef827..0000000
+++ /dev/null
@@ -1 +0,0 @@
-v3
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-20060105.130101-3.jar
deleted file mode 100644 (file)
index 29ef827..0000000
+++ /dev/null
@@ -1 +0,0 @@
-v3
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0-SNAPSHOT.jar
deleted file mode 100644 (file)
index 29ef827..0000000
+++ /dev/null
@@ -1 +0,0 @@
-v3
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v3artifact-1.0.0.jar
deleted file mode 100644 (file)
index 29ef827..0000000
+++ /dev/null
@@ -1 +0,0 @@
-v3
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-20060111.120115-1.jar
deleted file mode 100644 (file)
index 29ef827..0000000
+++ /dev/null
@@ -1 +0,0 @@
-v3
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0-SNAPSHOT.jar
deleted file mode 100644 (file)
index 29ef827..0000000
+++ /dev/null
@@ -1 +0,0 @@
-v3
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar
deleted file mode 100644 (file)
index c694117..0000000
+++ /dev/null
@@ -1 +0,0 @@
-v4
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5 b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.md5
deleted file mode 100644 (file)
index 1930bc6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-4289bbdd6fba75013b317b2f9a540736 *v4artifact-1.0.0.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1 b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/jars/v4artifact-1.0.0.jar.sha1
deleted file mode 100644 (file)
index 466f209..0000000
+++ /dev/null
@@ -1 +0,0 @@
-e3e4159da65a4257f0bffb7cac8e3e78241a4dca *v4artifact-1.0.0.jar
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/plugins/maven-foo-plugin-1.0.jar
deleted file mode 100644 (file)
index 5626abf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-one
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-one-1.0.0.pom
deleted file mode 100644 (file)
index cd3862d..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-three-1.0.0.pom
deleted file mode 100644 (file)
index 3432910..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/artifact-two-1.0.0.pom
deleted file mode 100644 (file)
index 2274701..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/dryrun-artifact-1.0.0.pom
deleted file mode 100644 (file)
index 1953c55..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/incorrectMd5Artifact-1.0.0.pom
deleted file mode 100644 (file)
index 74d5e12..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/incorrectSha1Artifact-1.0.0.pom
deleted file mode 100644 (file)
index fe3c7fd..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/maven-foo-plugin-1.0.pom
deleted file mode 100644 (file)
index a5a02c4..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/modified-artifact-1.0.0.pom
deleted file mode 100644 (file)
index fcfdaac..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/newversion-artifact-1.0.1.pom
deleted file mode 100644 (file)
index f441c9a..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/relocated-v3artifact-1.0.0.pom
deleted file mode 100644 (file)
index ab112a2..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/rollback-created-artifact-1.0.0.pom
deleted file mode 100644 (file)
index 00692be..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/unmodified-artifact-1.0.0.pom
deleted file mode 100644 (file)
index a8428a8..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3-warnings-artifact-1.0.0.pom
deleted file mode 100644 (file)
index 5f347f3..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-20060105.130101-3.pom
deleted file mode 100644 (file)
index d7ae895..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0-SNAPSHOT.pom
deleted file mode 100644 (file)
index 3958a33..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v3artifact-1.0.0.pom
deleted file mode 100644 (file)
index 5aed343..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-20060111.120115-1.pom
deleted file mode 100644 (file)
index e4f3656..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0-SNAPSHOT.pom
deleted file mode 100644 (file)
index be5b8b7..0000000
+++ /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-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/source-repository/test/poms/v4artifact-1.0.0.pom
deleted file mode 100644 (file)
index fa6e82b..0000000
+++ /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-maven/archiva-maven-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.jar
deleted file mode 100644 (file)
index 27597bc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-unmodified
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/modified-artifact/1.0.0/modified-artifact-1.0.0.pom
deleted file mode 100644 (file)
index d23afd0..0000000
+++ /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-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.jar
deleted file mode 100644 (file)
index 27597bc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-unmodified
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/1.0.0/newversion-artifact-1.0.0.pom
deleted file mode 100644 (file)
index e21492e..0000000
+++ /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-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/newversion-artifact/maven-metadata.xml
deleted file mode 100644 (file)
index 42537e4..0000000
+++ /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-maven/archiva-maven-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.jar
deleted file mode 100644 (file)
index 27597bc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-unmodified
diff --git a/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom b/archiva-modules/archiva-maven/archiva-maven-converter/src/test/target-repository/test/unmodified-artifact/1.0.0/unmodified-artifact-1.0.0.pom
deleted file mode 100644 (file)
index a8428a8..0000000
+++ /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>
index b17c1b1276ec920df217396e7501daf3309e3db1..1dbd32ebe2d897f73aab96d768ac6ddda0c79784 100644 (file)
@@ -37,7 +37,6 @@
 
   <modules>
     <module>archiva-maven-common</module>
-    <module>archiva-maven-converter</module>
     <module>archiva-maven-model</module>
     <module>archiva-maven-metadata</module>
     <module>archiva-maven-indexer</module>
diff --git a/pom.xml b/pom.xml
index 74b83b73ac9d584a67a0c7cf18e37e7bd56cf2ba..7e1de3d7c0f67f0500d753f092565f6282c21cb1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
         <artifactId>maven-model</artifactId>
         <version>${maven3x.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-model-v3</artifactId>
+        <version>2.0</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-model-builder</artifactId>
index 548cec51aea84418e9249986e93cd8beb676f209..f30d8aec51ecb98e032435de4accd88d28192cb6 100755 (executable)
@@ -34,6 +34,7 @@ ATTIC_DIRS="archiva-modules/archiva-base/archiva-indexer\
  archiva-modules/plugins/maven2-repository\
  archiva-modules/archiva-base/archiva-converter\
  archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumer\
+ archiva-modules/maven/archiva-converter\
 "
 REMOVE_DIRS=".indexer"
 TMP_DIRECTORY=".tmp"
index 6b4ad53090b38a0afca32cb476c1422a296d5337..1d75f40486b06dd527dae7001f93e0423b84c50e 100644 (file)
@@ -38,6 +38,9 @@ archiva-modules
     metadata-statistics-api
     metadata-repository-api
     metadata-model
+  maven
+    maven-common
+    maven-model