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

diff --git a/maven-repository-converter/src/test/expected-files/converted-v3-snapshot.pom b/maven-repository-converter/src/test/expected-files/converted-v3-snapshot.pom
index 9134c3cdfc9f0353aebd58624cfc8bfb8563cebd..e5f4e8d1b5209759029aad1ea0f32f9e0916a709 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/converted-v3-snapshot.pom
+++ b/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>

diff --git a/maven-repository-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom b/maven-repository-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
index 46eacaf2eb26ce6a209bf6072dc4e80d033e874a..3d85b011cfc8679018d5a5f8c7fd5e8301bf1b53 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
+++ b/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>

diff --git a/maven-repository-converter/src/test/expected-files/converted-v3-warnings.pom b/maven-repository-converter/src/test/expected-files/converted-v3-warnings.pom
index e076649320ecd40dd3ead4f8b5bf028bd23c6a24..4900168841d9ad03f0a88ea90a0281c84a745547 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/converted-v3-warnings.pom
+++ b/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>

diff --git a/maven-repository-converter/src/test/expected-files/converted-v3.pom b/maven-repository-converter/src/test/expected-files/converted-v3.pom
index 29ba92771d3973f4871cab887ad6071ab92112ff..eb0b522b1f40166c636d6e75a9a473d491dea10f 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/converted-v3.pom
+++ b/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>

diff --git a/maven-repository-converter/src/test/expected-files/newversion-artifact-metadata.xml b/maven-repository-converter/src/test/expected-files/newversion-artifact-metadata.xml
index 00456f21434df095f6f3c870688a9d3f810d6cab..5833c83f8a7656fb0f0e57eef7b736ca7aa7ac4d 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/newversion-artifact-metadata.xml
+++ b/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>

diff --git a/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml b/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml
index 6fa4f9566e1abffdf957044a62cce44bf4fec568..81b38b39b49de998d9560156b733b4147be02d29 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml
+++ b/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>

diff --git a/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml b/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
index fdd1129040bb042adbb66fadcf440f1457d2801c..9433fb2dd4fba6bb77500b95faf2107439c2b71e 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
+++ b/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>

diff --git a/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml b/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml
index d8e55eadba9bde3ea97a79022ece6acc40cb23ff..832597761d42df1cb596a04ce768d1d5c8552322 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml
+++ b/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>
\ No newline at end of file

diff --git a/maven-repository-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml b/maven-repository-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
index 2dceed432b0d8f80e6c2f89aad9216438e40285c..ffdff26e0a9d370b8f769e2e70c4d559b725377e 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
+++ b/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>

diff --git a/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml b/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml
index 19aa03853c7e3b1eb90f9e72fb1ba750cf65014c..8b007e2d01eb5bb855ee778314ef7d8bc9dc632c 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml
+++ b/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>
\ No newline at end of file

diff --git a/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml b/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml
index 0261034297ad789a77d4ce2e6512912babfc4d1e..1a543290c9873b3cb04e1d014d6ae6f43052e9d7 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml
+++ b/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>

diff --git a/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml b/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
index efc4f47bc72cf505e7ef0873fff450ca5fb16d0b..c7ff5356a8fb14b2d0b77ea58d0b355c3407224e 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
+++ b/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>

diff --git a/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml b/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml
index 97cc13ec4b1721d7b0849896e5a19ce6299d1b4c..37697524e3390a188dc0ea8c4b235e1e835755d5 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml
+++ b/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>
\ No newline at end of file

diff --git a/maven-repository-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml b/maven-repository-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
index cd2d1b5dc25e34a2709e4ce9ccb3912bb55eac23..357c136bbb8bdc0687947fecfcad46d0a37b531a 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
+++ b/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>

diff --git a/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml b/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml
index 92003ee753de02459a6aa0764b55f949c9e3f73d..93a159566ec634074a7d6607c3188eba33e612e7 100644 (file)
--- a/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml
+++ b/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>
\ No newline at end of file

diff --git a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java b/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
index eaaf7cd8f5a1469d2d21a51348a843f85eba6314..046b8ad4472a2dbc7307db5b8fe631c251b38b9b 100644 (file)
--- a/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
+++ b/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 )

diff --git a/maven-repository-proxy/pom.xml b/maven-repository-proxy/pom.xml
index e4fb69ad20431ad4d329710d459eca803d67753b..9915c56f169d4309fc9ae6a6c6e2f3c0fe44ac7b 100644 (file)
--- a/maven-repository-proxy/pom.xml
+++ b/maven-repository-proxy/pom.xml
@@ -40,7 +40,6 @@
     <dependency>\r
       <groupId>org.apache.maven.wagon</groupId>\r
       <artifactId>wagon-file</artifactId>\r
-      <version>1.0-alpha-7</version>\r
       <scope>test</scope>\r
     </dependency>\r
   </dependencies>\r

diff --git a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java b/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
index a3627a912c0ecb4c944bef1e01c87d91eb183f58..cf4d9dc03548f0a2d531a0986e07a8f3347dd92d 100644 (file)
--- a/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
+++ b/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;
                 }

diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java b/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java
index f5658a1f31ec707bded097ca930d8426476d5365..a9f3cd3f2c50ba2ac27586bc5cbb9d6084099d5a 100644 (file)
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java
+++ b/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 )
+    {
+    }
 }

diff --git a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java b/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java
index 3052a12c9995af0e5069db31138353b5532951dd..7bdc708a9fe969552f9c22bd5c80b675fb1dcc69 100644 (file)
--- a/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java
+++ 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;
+    }
 }