diff options
20 files changed, 35 insertions, 7 deletions
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 9134c3cdf..e5f4e8d1b 100644 --- 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 46eacaf2e..3d85b011c 100644 --- 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 e07664932..490016884 100644 --- 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 29ba92771..eb0b522b1 100644 --- 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 00456f214..5833c83f8 100644 --- 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 6fa4f9566..81b38b39b 100644 --- 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 fdd112904..9433fb2dd 100644 --- 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 d8e55eadb..832597761 100644 --- 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 2dceed432..ffdff26e0 100644 --- 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 19aa03853..8b007e2d0 100644 --- 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 026103429..1a543290c 100644 --- 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 efc4f47bc..c7ff5356a 100644 --- 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 97cc13ec4..37697524e 100644 --- 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 cd2d1b5dc..357c136bb 100644 --- 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 92003ee75..93a159566 100644 --- 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 eaaf7cd8f..046b8ad44 100644 --- 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 e4fb69ad2..9915c56f1 100644 --- a/maven-repository-proxy/pom.xml +++ b/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>
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 a3627a912..cf4d9dc03 100644 --- 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 f5658a1f3..a9f3cd3f2 100644 --- 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 3052a12c9..7bdc708a9 100644 --- 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; + } } |