mirror of https://github.com/apache/maven.git
o Moved repository declarations to settings
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@750836 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann
parent
e7b87bc4f9
commit
cfb21a42a4
|
|
@ -118,7 +118,6 @@ public class MavenITmng3461MirrorMatchingTest
|
||||||
Properties filterProps = verifier.newDefaultFilterProperties();
|
Properties filterProps = verifier.newDefaultFilterProperties();
|
||||||
filterProps.setProperty( "@test.port@", Integer.toString( port ) );
|
filterProps.setProperty( "@test.port@", Integer.toString( port ) );
|
||||||
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
|
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps );
|
||||||
verifier.filterFile( "pom-template.xml", "pom.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" );
|
||||||
|
|
@ -148,7 +147,7 @@ public class MavenITmng3461MirrorMatchingTest
|
||||||
verifier.setAutoclean( false );
|
verifier.setAutoclean( false );
|
||||||
verifier.deleteArtifacts( "org.apache.maven.its.mng3461" );
|
verifier.deleteArtifacts( "org.apache.maven.its.mng3461" );
|
||||||
Properties filterProps = verifier.newDefaultFilterProperties();
|
Properties filterProps = verifier.newDefaultFilterProperties();
|
||||||
verifier.filterFile( "pom.xml", "pom.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" );
|
||||||
|
|
|
||||||
|
|
@ -40,19 +40,6 @@ under the License.
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>maven-core-it</id>
|
|
||||||
<url>http://maven.apache.org/null</url>
|
|
||||||
<releases>
|
|
||||||
<checksumPolicy>ignore</checksumPolicy>
|
|
||||||
</releases>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>false</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,27 @@ under the License.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<settings>
|
<settings>
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>maven-core-it-repo</id>
|
||||||
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
<id>maven-core-it</id>
|
||||||
|
<url>http://maven.apache.org/null</url>
|
||||||
|
<releases>
|
||||||
|
<checksumPolicy>ignore</checksumPolicy>
|
||||||
|
</releases>
|
||||||
|
<snapshots>
|
||||||
|
<enabled>false</enabled>
|
||||||
|
</snapshots>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
<activeProfiles>
|
||||||
|
<activeProfile>maven-core-it-repo</activeProfile>
|
||||||
|
</activeProfiles>
|
||||||
|
|
||||||
<mirrors>
|
<mirrors>
|
||||||
<mirror>
|
<mirror>
|
||||||
<id>test-a</id>
|
<id>test-a</id>
|
||||||
|
|
|
||||||
|
|
@ -50,39 +50,6 @@ under the License.
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>maven-core-it-file</id>
|
|
||||||
<url>@baseurl@/repo-1</url>
|
|
||||||
<releases>
|
|
||||||
<checksumPolicy>ignore</checksumPolicy>
|
|
||||||
</releases>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>false</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</repository>
|
|
||||||
<repository>
|
|
||||||
<id>maven-core-it-localhost</id>
|
|
||||||
<url>http://localhost:@test.port@/repo-2</url>
|
|
||||||
<releases>
|
|
||||||
<checksumPolicy>ignore</checksumPolicy>
|
|
||||||
</releases>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>false</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</repository>
|
|
||||||
<repository>
|
|
||||||
<id>maven-core-it-ext</id>
|
|
||||||
<url>http://maven.apache.org/null</url>
|
|
||||||
<releases>
|
|
||||||
<checksumPolicy>ignore</checksumPolicy>
|
|
||||||
</releases>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>false</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|
@ -20,10 +20,52 @@ under the License.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<settings>
|
<settings>
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>maven-core-it-repo</id>
|
||||||
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
<id>maven-core-it-file</id>
|
||||||
|
<url>@baseurl@/repo-1</url>
|
||||||
|
<releases>
|
||||||
|
<checksumPolicy>ignore</checksumPolicy>
|
||||||
|
</releases>
|
||||||
|
<snapshots>
|
||||||
|
<enabled>false</enabled>
|
||||||
|
</snapshots>
|
||||||
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>maven-core-it-localhost</id>
|
||||||
|
<url>http://localhost:@test.port@/repo-2</url>
|
||||||
|
<releases>
|
||||||
|
<checksumPolicy>ignore</checksumPolicy>
|
||||||
|
</releases>
|
||||||
|
<snapshots>
|
||||||
|
<enabled>false</enabled>
|
||||||
|
</snapshots>
|
||||||
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>maven-core-it-ext</id>
|
||||||
|
<url>http://maven.apache.org/null</url>
|
||||||
|
<releases>
|
||||||
|
<checksumPolicy>ignore</checksumPolicy>
|
||||||
|
</releases>
|
||||||
|
<snapshots>
|
||||||
|
<enabled>false</enabled>
|
||||||
|
</snapshots>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
<activeProfiles>
|
||||||
|
<activeProfile>maven-core-it-repo</activeProfile>
|
||||||
|
</activeProfiles>
|
||||||
|
|
||||||
<mirrors>
|
<mirrors>
|
||||||
<mirror>
|
<mirror>
|
||||||
<id>test-a</id>
|
<id>test-a</id>
|
||||||
<url>@baseurl@/repo-3</url>
|
<url>@baseurl@/repo-3</url>
|
||||||
|
<!-- should not match anything but maven-core-it-ext -->
|
||||||
<mirrorOf>external:*</mirrorOf>
|
<mirrorOf>external:*</mirrorOf>
|
||||||
</mirror>
|
</mirror>
|
||||||
</mirrors>
|
</mirrors>
|
||||||
|
|
|
||||||
|
|
@ -40,19 +40,6 @@ under the License.
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>maven-core-it</id>
|
|
||||||
<url>@baseurl@/repo</url>
|
|
||||||
<releases>
|
|
||||||
<checksumPolicy>ignore</checksumPolicy>
|
|
||||||
</releases>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>false</enabled>
|
|
||||||
</snapshots>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|
|
||||||
|
|
@ -20,6 +20,27 @@ under the License.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<settings>
|
<settings>
|
||||||
|
<profiles>
|
||||||
|
<profile>
|
||||||
|
<id>maven-core-it-repo</id>
|
||||||
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
<id>maven-core-it</id>
|
||||||
|
<url>@baseurl@/repo</url>
|
||||||
|
<releases>
|
||||||
|
<checksumPolicy>ignore</checksumPolicy>
|
||||||
|
</releases>
|
||||||
|
<snapshots>
|
||||||
|
<enabled>false</enabled>
|
||||||
|
</snapshots>
|
||||||
|
</repository>
|
||||||
|
</repositories>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
<activeProfiles>
|
||||||
|
<activeProfile>maven-core-it-repo</activeProfile>
|
||||||
|
</activeProfiles>
|
||||||
|
|
||||||
<mirrors>
|
<mirrors>
|
||||||
<mirror>
|
<mirror>
|
||||||
<id>test-a</id>
|
<id>test-a</id>
|
||||||
Loading…
Reference in New Issue