Author: brett
Date: Tue Feb 21 22:25:11 2006
New Revision: 379709
URL: http://svn.apache.org/viewcvs?rev=379709&view=rev
Log:
updates to get tests running again
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-snapshot.pom
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-warnings.pom
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3.pom
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/newversion-artifact-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml
maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
maven/repository-manager/trunk/maven-repository-proxy/pom.xml
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-snapshot.pom
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-snapshot.pom?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-snapshot.pom
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-snapshot.pom
Tue Feb 21 22:25:11 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>test</groupId>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-timestamped-snapshot.pom
Tue Feb 21 22:25:11 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>test</groupId>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-warnings.pom
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-warnings.pom?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-warnings.pom
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3-warnings.pom
Tue Feb 21 22:25:11 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>test</groupId>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3.pom
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3.pom?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3.pom
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/converted-v3.pom
Tue Feb 21 22:25:11 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>test</groupId>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/newversion-artifact-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/newversion-artifact-metadata.xml?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/newversion-artifact-metadata.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/newversion-artifact-metadata.xml
Tue Feb 21 22:25:11 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
<metadata>
<groupId>test</groupId>
<artifactId>newversion-artifact</artifactId>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-artifact-metadata.xml
Tue Feb 21 22:25:11 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>test</groupId>
<artifactId>v3artifact</artifactId>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-artifact-metadata.xml
Tue Feb 21 22:25:11 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>test</groupId>
<artifactId>v3artifact</artifactId>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-snapshot-metadata.xml
Tue Feb 21 22:25:11 2006
@@ -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>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-timestamped-snapshot-metadata.xml
Tue Feb 21 22:25:11 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>test</groupId>
<artifactId>v3artifact</artifactId>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v3-version-metadata.xml
Tue Feb 21 22:25:11 2006
@@ -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>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-artifact-metadata.xml
Tue Feb 21 22:25:11 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>test</groupId>
<artifactId>v4artifact</artifactId>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-artifact-metadata.xml
Tue Feb 21 22:25:11 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>test</groupId>
<artifactId>v4artifact</artifactId>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-snapshot-metadata.xml
Tue Feb 21 22:25:11 2006
@@ -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>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-timestamped-snapshot-metadata.xml
Tue Feb 21 22:25:11 2006
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>test</groupId>
<artifactId>v4artifact</artifactId>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/expected-files/v4-version-metadata.xml
Tue Feb 21 22:25:11 2006
@@ -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>
Modified:
maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-converter/src/test/java/org/apache/maven/repository/converter/RepositoryConverterTest.java
Tue Feb 21 22:25:11 2006
@@ -841,7 +841,8 @@
{
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 )
Modified: maven/repository-manager/trunk/maven-repository-proxy/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/pom.xml?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
--- maven/repository-manager/trunk/maven-repository-proxy/pom.xml (original)
+++ maven/repository-manager/trunk/maven-repository-proxy/pom.xml Tue Feb 21
22:25:11 2006
@@ -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>
Modified:
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
(original)
+++
maven/repository-manager/trunk/maven-repository-proxy/src/main/java/org/apache/maven/repository/proxy/DefaultProxyManager.java
Tue Feb 21 22:25:11 2006
@@ -275,7 +275,10 @@
disconnectWagon( wagon );
- copyTempToTarget( temp, target );
+ if ( temp.exists() )
+ {
+ copyTempToTarget( temp, target );
+ }
return target;
}
Modified:
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java
(original)
+++
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifact.java
Tue Feb 21 22:25:11 2006
@@ -251,4 +251,8 @@
{
return 0;
}
+
+ public void setOptional( boolean b )
+ {
+ }
}
Modified:
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java
URL:
http://svn.apache.org/viewcvs/maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java?rev=379709&r1=379708&r2=379709&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java
(original)
+++
maven/repository-manager/trunk/maven-repository-reports-standard/src/test/java/org/apache/maven/repository/reporting/MockArtifactFactory.java
Tue Feb 21 22:25:11 2006
@@ -83,4 +83,10 @@
{
return null;
}
+
+ public Artifact createDependencyArtifact( String string, String string1,
VersionRange versionRange, String string2,
+ String string3, String string4,
boolean b )
+ {
+ return null;
+ }
}
