updates to get tests running again

git-svn-id: https://svn.apache.org/repos/asf/maven/repository-manager/trunk@379709 13f79535-47bb-0310-9956-ffa450edef68

maven-repository-converter/src/test/expected-files/converted-v3-snapshot.pom

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>test</groupId>

maven-repository-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>test</groupId>

maven-repository-converter/src/test/expected-files/converted-v3-warnings.pom

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>test</groupId>

maven-repository-converter/src/test/expected-files/converted-v3.pom

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>test</groupId>

maven-repository-converter/src/test/expected-files/newversion-artifact-metadata.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <metadata>
   <groupId>test</groupId>
   <artifactId>newversion-artifact</artifactId>

maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <metadata>
   <groupId>test</groupId>
   <artifactId>v3artifact</artifactId>

maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <metadata>
   <groupId>test</groupId>
   <artifactId>v3artifact</artifactId>

maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml

@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <metadata>
   <groupId>test</groupId>
   <artifactId>v3artifact</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <versioning />
+  <versioning/>
 </metadata>

maven-repository-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <metadata>
   <groupId>test</groupId>
   <artifactId>v3artifact</artifactId>

maven-repository-converter/src/test/expected-files/v3-version-metadata.xml

@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <metadata>
   <groupId>test</groupId>
   <artifactId>v3artifact</artifactId>
   <version>1.0.0</version>
-  <versioning />
+  <versioning/>
 </metadata>

maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <metadata>
   <groupId>test</groupId>
   <artifactId>v4artifact</artifactId>

maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <metadata>
   <groupId>test</groupId>
   <artifactId>v4artifact</artifactId>

maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml

@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <metadata>
   <groupId>test</groupId>
   <artifactId>v4artifact</artifactId>
   <version>1.0.0-SNAPSHOT</version>
-  <versioning />
+  <versioning/>
 </metadata>

maven-repository-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <metadata>
   <groupId>test</groupId>
   <artifactId>v4artifact</artifactId>

maven-repository-converter/src/test/expected-files/v4-version-metadata.xml

@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <metadata>
   <groupId>test</groupId>
   <artifactId>v4artifact</artifactId>
   <version>1.0.0</version>
-  <versioning />
+  <versioning/>
 </metadata>

maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java

@@ -841,7 +841,8 @@ public class RepositoryConverterTest
     {
         String expectedContent = normalizeString( FileUtils.fileRead( expectedPomFile ) );
         String targetContent = normalizeString( FileUtils.fileRead( pomFile ) );
-        assertEquals( "Check file match", expectedContent, targetContent );
+        assertEquals( "Check file match between " + expectedPomFile + " and " + pomFile, expectedContent,
+                      targetContent );
     }
 
     private static String normalizeString( String path )

maven-repository-proxy/pom.xml

@@ -40,7 +40,6 @@
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-file</artifactId>
-      <version>1.0-alpha-7</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java

@@ -275,7 +275,10 @@ public class DefaultProxyManager
 
                     disconnectWagon( wagon );
 
-                    copyTempToTarget( temp, target );
+                    if ( temp.exists() )
+                    {
+                        copyTempToTarget( temp, target );
+                    }
 
                     return target;
                 }

maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java

@@ -251,4 +251,8 @@ public class MockArtifact
     {
         return 0;
     }
+
+    public void setOptional( boolean b )
+    {
+    }
 }

maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java

@@ -83,4 +83,10 @@ public class MockArtifactFactory
     {
         return null;
     }
+
+    public Artifact createDependencyArtifact( String string, String string1, VersionRange versionRange, String string2,
+                                              String string3, String string4, boolean b )
+    {
+        return null;
+    }
 }