Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Brett Porter 2006-02-22 06:25:11 +00:00
parent c2868b5625
commit 281b7c59f7
20 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -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>

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

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

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

@ -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>

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

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

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

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

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

@ -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>

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

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

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

@ -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>

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

@ -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 )

1
maven-repository-proxy/pom.xml
View File

@ -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>

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

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

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

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

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

@ -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;
}
}