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

o Moved repository declarations to settings 

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@750816 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-03-06 09:23:04 +00:00
parent 307fd98017
commit 834f51d7fd
7 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
View File

@ -52,7 +52,7 @@ public class MavenITmng2865MirrorWildcardTest
verifier.setAutoclean( false ); verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng2865" ); verifier.deleteArtifacts( "org.apache.maven.its.mng2865" );
Properties filterProps = verifier.newDefaultFilterProperties(); Properties filterProps = verifier.newDefaultFilterProperties();
verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", filterProps ); verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.getCliOptions().add( "--settings" ); verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" ); verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" ); verifier.executeGoal( "validate" );
@ -70,13 +70,13 @@ public class MavenITmng2865MirrorWildcardTest
public void testitCentralRepo() public void testitCentralRepo()
throws Exception throws Exception
{ {
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2865/test-2" ); File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2865/test-4" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() ); Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false ); verifier.setAutoclean( false );
verifier.deleteArtifacts( "org.apache.maven.its.mng2865" ); verifier.deleteArtifacts( "org.apache.maven.its.mng2865" );
Properties filterProps = verifier.newDefaultFilterProperties(); Properties filterProps = verifier.newDefaultFilterProperties();
verifier.filterFile( "settings.xml", "settings.xml", "UTF-8", filterProps ); verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
verifier.getCliOptions().add( "--settings" ); verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" ); verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" ); verifier.executeGoal( "validate" );

0
its/core-it-suite/src/test/resources/mng-2865/test-2/repo/org/apache/maven/its/mng2865/a/0.1/a-0.1.jar → its/core-it-suite/src/test/resources/mng-2865/repo/org/apache/maven/its/mng2865/a/0.1/a-0.1.jar
View File

0
its/core-it-suite/src/test/resources/mng-2865/test-2/repo/org/apache/maven/its/mng2865/a/0.1/a-0.1.pom → its/core-it-suite/src/test/resources/mng-2865/repo/org/apache/maven/its/mng2865/a/0.1/a-0.1.pom
View File

0
its/core-it-suite/src/test/resources/mng-2865/test-2/repo/org/apache/maven/its/mng2865/a/maven-metadata.xml → its/core-it-suite/src/test/resources/mng-2865/repo/org/apache/maven/its/mng2865/a/maven-metadata.xml
View File

0
its/core-it-suite/src/test/resources/mng-2865/test-1/settings.xml → its/core-it-suite/src/test/resources/mng-2865/test-1/settings-template.xml
View File

0
its/core-it-suite/src/test/resources/mng-2865/test-2/pom.xml → its/core-it-suite/src/test/resources/mng-2865/test-4/pom.xml
View File

2
its/core-it-suite/src/test/resources/mng-2865/test-2/settings.xml → its/core-it-suite/src/test/resources/mng-2865/test-4/settings-template.xml
View File

@ -23,7 +23,7 @@ under the License.
<mirrors> <mirrors>
<mirror> <mirror>
<id>test-mirror</id> <id>test-mirror</id>
<url>@baseurl@/repo</url> <url>@baseurl@/../repo</url>
<mirrorOf>*</mirrorOf> <mirrorOf>*</mirrorOf>
</mirror> </mirror>
</mirrors> </mirrors>