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

o Made ITs use global settings for common setup 

git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@981712 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-08-03 00:36:19 +00:00
parent 6b1259ec75
commit 24d00c6eda
524 changed files with 1161 additions and 1049 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
its/core-it-suite/pom.xml
View File

@ -51,6 +51,9 @@ under the License.
ITs that don't require to fork Maven can also be run from the IDE using the Maven projects from the workspace if the
Maven dependencies are added to the test class path.
If you're behind a proxy, use the system properties proxy.host, proxy.port, proxy.user and proxy.pass to specify the
required proxy setup for the ITs.
-->
<scm>
@ -65,6 +68,13 @@ under the License.
<mavenHome>${maven.home}</mavenHome>
<!-- The (possibly instrumented copy of the) Maven distribution we actually use for the tests. -->
<preparedMavenHome>${mavenHome}</preparedMavenHome>
<!-- default properties used to filter the global settings -->
<proxy.active>false</proxy.active>
<proxy.host>localhost</proxy.host>
<proxy.port>80</proxy.port>
<proxy.type>none</proxy.type>
<proxy.user></proxy.user>
<proxy.pass></proxy.pass>
</properties>
<dependencies>
@ -111,6 +121,15 @@ under the License.
</dependencies>
<build>
<testResources>
<testResource>
<directory>src/test/resources</directory>
</testResource>
<testResource>
<directory>src/test/resources-filtered</directory>
<filtering>true</filtering>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -130,6 +149,10 @@ under the License.
<name>maven.home</name>
<value>${preparedMavenHome}</value>
</property>
<property>
<name>maven.test.global-settings</name>
<value>${project.build.testOutputDirectory}/settings.xml</value>
</property>
</systemProperties>
</configuration>
</plugin>
@ -210,7 +233,6 @@ under the License.
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>false</skip>
<forkMode>once</forkMode>
<argLine>${surefireMemory}</argLine>
<systemProperties combine.children="append">
@ -411,5 +433,17 @@ under the License.
</plugins>
</build>
</profile>
<profile>
<id>proxy</id>
<activation>
<property>
<name>proxy.host</name>
</property>
</activation>
<properties>
<proxy.type>http</proxy.type>
<proxy.active>true</proxy.active>
</properties>
</profile>
</profiles>
</project>

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
View File

@ -48,7 +48,9 @@ public class MavenIT0041ArtifactTypeFromPluginExtensionTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.2", "coreit-artifact" );
verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support", "1.2" );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

2
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0090EnvVarInterpolationTest.java
View File

@ -44,7 +44,7 @@ public class MavenIT0090EnvVarInterpolationTest
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0090" );
Verifier verifier = new Verifier( testDir.getAbsolutePath(), true );
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
Map envVars = new HashMap();
envVars.put( "MAVEN_TEST_ENVAR", "MAVEN_TEST_ENVAR_VALUE" );
verifier.setAutoclean( false );

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java
View File

@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest
@ -47,10 +45,8 @@ public class MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List cliOptions = new ArrayList();
cliOptions.add( "--settings" );
cliOptions.add( "settings.xml" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

5
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
View File

@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.Properties;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-294">MNG-294</a>.
@ -61,9 +60,7 @@ public class MavenITmng0294MergeGlobalAndUserSettingsTest
}
else
{
Properties systemProperties = new Properties();
systemProperties.put( "org.apache.maven.global-settings", "global-settings.xml" );
verifier.setSystemProperties( systemProperties );
verifier.setSystemProperty( "org.apache.maven.global-settings", "global-settings.xml" );
}
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.verifyErrorFreeLog();

5
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
View File

@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.Properties;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-377">MNG-377</a>.
@ -55,9 +54,7 @@ public class MavenITmng0377PluginLookupFromPrefixTest
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
Properties systemProperties = new Properties();
systemProperties.put( "touch.outputFile", "target/file.txt" );
verifier.setSystemProperties( systemProperties );
verifier.setSystemProperty( "touch.outputFile", "target/file.txt" );
verifier.executeGoal( "itprefix:touch" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
View File

@ -50,10 +50,10 @@ public class MavenITmng0507ArtifactRelocationTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.1", "jar" );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support", "1.1", "pom" );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support-old-location", "1.1", "jar" );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support-old-location", "1.1", "pom" );
verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support", "1.1" );
verifier.deleteArtifacts( "org.apache.maven", "maven-core-it-support-old-location", "1.1" );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

7
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
View File

@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-557">MNG-557</a>.
@ -51,9 +49,8 @@ public class MavenITmng0557UserSettingsCliOptionTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List cliOptions = new ArrayList();
cliOptions.add( "--settings settings.xml" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
View File

@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-773">MNG-773</a>.
@ -50,10 +48,8 @@ public class MavenITmng0773SettingsProfileReactorPollutionTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
List cliOptions = new ArrayList();
cliOptions.add( "--settings" );
cliOptions.add( "settings.xml" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

7
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
View File

@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.Properties;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-786">MNG-786</a>.
@ -52,10 +51,8 @@ public class MavenITmng0786ProfileAwareReactorTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "sub1/target" );
verifier.deleteDirectory( "sub2/target" );
Properties systemProperties = new Properties();
systemProperties.put( "expression.outputFile", "target/expression.properties" );
systemProperties.put( "activate", "anything" );
verifier.setSystemProperties( systemProperties );
verifier.setSystemProperty( "expression.outputFile", "target/expression.properties" );
verifier.setSystemProperty( "activate", "anything" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );
verifier.assertFilePresent( "sub1/target/expression.properties" );
verifier.assertFilePresent( "sub2/target/expression.properties" );

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java
View File

@ -51,9 +51,7 @@ public class MavenITmng0848SystemPropOverridesDefaultValueTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
Properties sysProps = new Properties();
sysProps.setProperty( "config.aliasDefaultExpressionParam", "PASSED" );
verifier.setSystemProperties( sysProps );
verifier.setSystemProperty( "config.aliasDefaultExpressionParam", "PASSED" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

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

@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
/**
@ -51,9 +49,7 @@ public class MavenITmng1415QuotedSystemPropertiesTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List cliOptions = new ArrayList();
cliOptions.add( "-Dtest.property=\"Test Property\"" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-Dtest.property=\"Test Property\"" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java
View File

@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import java.text.SimpleDateFormat;
import java.util.Collections;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
@ -53,8 +52,7 @@ public class MavenITmng1830ShowVersionTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
List cliOptions = Collections.singletonList( "-X" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-X" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
View File

@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class MavenITmng2052InterpolateWithSettingsProfilePropertiesTest
extends AbstractMavenIntegrationTestCase
@ -46,10 +44,8 @@ public class MavenITmng2052InterpolateWithSettingsProfilePropertiesTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
List cliOptions = new ArrayList();
cliOptions.add( "--settings" );
cliOptions.add( "settings.xml" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

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

@ -46,10 +46,8 @@ public class MavenITmng2136ActiveByDefaultProfileTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
Properties systemProperties = new Properties();
systemProperties.put( "expression.outputFile", new File( testDir, "target/expression.properties" ).getPath() );
systemProperties.put( "expression.expressions", "project/properties" );
verifier.setSystemProperties( systemProperties );
verifier.setSystemProperty( "expression.outputFile", new File( testDir, "target/expression.properties" ).getPath() );
verifier.setSystemProperty( "expression.expressions", "project/properties" );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" );

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2234ActiveProfilesFromSettingsTest.java
View File

@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-2234">MNG-2234</a>.
@ -51,10 +49,8 @@ public class MavenITmng2234ActiveProfilesFromSettingsTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List cliOptions = new ArrayList();
cliOptions.add( "-s" );
cliOptions.add( "settings.xml" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

10
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java
View File

@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class MavenITmng2339BadProjectInterpolationTest
extends AbstractMavenIntegrationTestCase
@ -44,9 +42,7 @@ public class MavenITmng2339BadProjectInterpolationTest
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
List cliOptions = new ArrayList();
cliOptions.add( "-Dversion=foo" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-Dversion=foo" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@ -78,9 +74,7 @@ public class MavenITmng2339BadProjectInterpolationTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List cliOptions = new ArrayList();
cliOptions.add( "-Dversion=2" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-Dversion=2" );
verifier.setLogFileName( "log-cli-specified.txt" );
verifier.executeGoal( "initialize" );

33
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2883LegacyRepoOfflineTest.java
View File

@ -65,13 +65,10 @@ public class MavenITmng2883LegacyRepoOfflineTest
File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8",
verifier.newDefaultFilterProperties() );
List cliOptions = new ArrayList();
// used to inject the remote repository
cliOptions.add( "-s" );
cliOptions.add( settings.getName() );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( settings.getName() );
// execute once just to make sure this test works at all!
try
@ -86,9 +83,7 @@ public class MavenITmng2883LegacyRepoOfflineTest
}
// the centerpiece of these tests!
cliOptions.add( "-o" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-o" );
// re-run in offline mode, should still succeed by using local repo
verifier.setLogFileName( "log-parent-b.txt" );
@ -162,16 +157,12 @@ public class MavenITmng2883LegacyRepoOfflineTest
verifier.deleteDirectory( "target" );
verifier.deleteArtifacts( "org.apache.maven.its.mng2883" );
List cliOptions = new ArrayList();
File settings = verifier.filterFile( "../settings-template.xml", "settings.xml", "UTF-8",
verifier.newDefaultFilterProperties() );
// used to inject the remote repository
cliOptions.add( "-s" );
cliOptions.add( settings.getName() );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( settings.getName() );
// execute once just to make sure this test works at all!
try
@ -186,9 +177,7 @@ public class MavenITmng2883LegacyRepoOfflineTest
}
// the centerpiece of these tests!
cliOptions.add( "-o" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-o" );
// re-run in offline mode, should still succeed by using local repo
verifier.setLogFileName( "log-dep-b.txt" );
@ -270,18 +259,14 @@ public class MavenITmng2883LegacyRepoOfflineTest
verifier.newDefaultFilterProperties() );
// used to inject the remote repository
cliOptions.add( "-s" );
cliOptions.add( settings.getName() );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( settings.getName() );
verifier.setLogFileName( "log-plugin-a.txt" );
verifier.executeGoal( "org.apache.maven.its.mng2883:plugin:1.0-SNAPSHOT:run" );
// the centerpiece of these tests!
cliOptions.add( "-o" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-o" );
// re-run in offline mode, should still succeed by using local repo
verifier.setLogFileName( "log-plugin-b.txt" );

20
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
View File

@ -56,9 +56,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
verifier.deleteDirectory( "subproject3/target" );
verifier.getCliOptions().add( "--fail-fast" );
verifier.setLogFileName( "log-ff-mt1.txt" );
Properties systemProperties = new Properties();
systemProperties.setProperty( "maven.threads.experimental", "1" );
verifier.setSystemProperties( systemProperties );
verifier.setSystemProperty( "maven.threads.experimental", "1" );
try
{
@ -94,9 +92,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
verifier.deleteDirectory( "subproject3/target" );
verifier.getCliOptions().add( "--fail-never" );
verifier.setLogFileName( "log-fn-mt1.txt" );
Properties systemProperties = new Properties();
systemProperties.setProperty( "maven.threads.experimental", "1" );
verifier.setSystemProperties( systemProperties );
verifier.setSystemProperty( "maven.threads.experimental", "1" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.resetStreams();
@ -124,9 +120,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
verifier.deleteDirectory( "subproject3/target" );
verifier.getCliOptions().add( "--fail-at-end" );
verifier.setLogFileName( "log-fae-mt1.txt" );
Properties systemProperties = new Properties();
systemProperties.setProperty( "maven.threads.experimental", "1" );
verifier.setSystemProperties( systemProperties );
verifier.setSystemProperty( "maven.threads.experimental", "1" );
try
{
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
@ -161,9 +155,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
verifier.deleteDirectory( "subproject3/target" );
verifier.getCliOptions().add( "--fail-never" );
verifier.setLogFileName( "log-fn-mt2.txt" );
Properties systemProperties = new Properties();
systemProperties.setProperty( "maven.threads.experimental", "2" );
verifier.setSystemProperties( systemProperties );
verifier.setSystemProperty( "maven.threads.experimental", "2" );
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.resetStreams();
@ -191,9 +183,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
verifier.deleteDirectory( "subproject3/target" );
verifier.getCliOptions().add( "--fail-at-end" );
verifier.setLogFileName( "log-fae-mt2.txt" );
Properties systemProperties = new Properties();
systemProperties.setProperty( "maven.threads.experimental", "2" );
verifier.setSystemProperties( systemProperties );
verifier.setSystemProperty( "maven.threads.experimental", "2" );
try
{
verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );

14
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java
View File

@ -46,7 +46,6 @@ public class MavenITmng3057VersionExprTransformationsTest
public MavenITmng3057VersionExprTransformationsTest()
{
// TODO: port to 3.x
super( "[2.1.0,2.1.1)" ); // only test in 2.1.0
}
@ -71,16 +70,9 @@ public class MavenITmng3057VersionExprTransformationsTest
verifier.filterFile( "pom.xml", "pom-filtered.xml", "UTF-8", properties );
List cliOptions = new ArrayList();
cliOptions.add( "-V" );
cliOptions.add( "-DtestVersion=1" );
cliOptions.add( "-f pom-filtered.xml" );
verifier.setCliOptions( cliOptions );
// Map envars = new HashMap();
// envars.put( "MAVEN_OPTS", "-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=5005 -Djava.compiler=NONE" );
// verifier.executeGoal( "deploy", envars );
verifier.getCliOptions().add( "-V" );
verifier.getCliOptions().add( "-DtestVersion=1" );
verifier.getCliOptions().add( "-f pom-filtered.xml" );
verifier.executeGoal( "generate-sources" );
verifier.verifyErrorFreeLog();

9
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java
View File

@ -20,8 +20,6 @@ package org.apache.maven.it;
*/
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
@ -55,18 +53,13 @@ public class MavenITmng3106ProfileMultipleActivatorsTest
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List cliOptions = new ArrayList();
cliOptions.add( "-Dprofile1.on=true" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-Dprofile1.on=true" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.assertFilePresent( "target/profile1/touch.txt" );
verifier.assertFilePresent( "target/profile2/touch.txt" );
verifier.resetStreams();
}
}

10
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
View File

@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class MavenITmng3221InfiniteForkingTest
extends AbstractMavenIntegrationTestCase
@ -57,9 +55,7 @@ public class MavenITmng3221InfiniteForkingTest
verifier = newVerifier( projectDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Psite" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-Psite" );
verifier.setLogFileName( "mng-3221-a-log.txt" );
verifier.executeGoal( "site" );
@ -97,9 +93,7 @@ public class MavenITmng3221InfiniteForkingTest
verifier = newVerifier( projectDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Pplugin" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-Pplugin" );
verifier.setLogFileName( "mng-3221-b-log.txt" );
verifier.executeGoal( "package" );

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

@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
/**
* This is a test set for <a href="http://jira.codehaus.org/browse/MNG-3259">MNG-3259</a>.
@ -53,10 +51,6 @@ public class MavenITmng3259DepsDroppedInMultiModuleBuildTest
verifier = newVerifier( new File( testDir, "parent" ).getAbsolutePath() );
List cliOptions = new ArrayList();
verifier.setCliOptions( cliOptions );
verifier.executeGoal( "install" );
verifier.verifyErrorFreeLog();

12
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleDashPCommandLineTest.java
View File

@ -23,12 +23,11 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class MavenITmng3268MultipleDashPCommandLineTest
extends AbstractMavenIntegrationTestCase
{
public MavenITmng3268MultipleDashPCommandLineTest()
{
super( "(2.0.9,)" );
@ -43,11 +42,9 @@ public class MavenITmng3268MultipleDashPCommandLineTest
verifier = newVerifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Pprofile1,profile2" );
cliOptions.add( "-Pprofile3" );
cliOptions.add( "-P profile4" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-Pprofile1,profile2" );
verifier.getCliOptions().add( "-Pprofile3" );
verifier.getCliOptions().add( "-P profile4" );
verifier.executeGoal( "package" );
verifier.verifyErrorFreeLog();
@ -57,4 +54,5 @@ public class MavenITmng3268MultipleDashPCommandLineTest
verifier.assertFilePresent( "target/profile4/touch.txt" );
verifier.resetStreams();
}
}

9
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java
View File

@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class MavenITmng3355TranslatedPathInterpolationTest
extends AbstractMavenIntegrationTestCase
@ -37,16 +35,13 @@ public class MavenITmng3355TranslatedPathInterpolationTest
public void testitMNG3355()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-3355" );
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3355" );
Verifier verifier;
verifier = newVerifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dversion=foo" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-Dversion=foo" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();

12
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
View File

@ -23,9 +23,7 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
* This is a sample integration test. The IT tests typically
@ -69,11 +67,9 @@ public class MavenITmng3372DirectInvocationOfPluginsTest
verifier = newVerifier( project.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-s" );
cliOptions.add( "\"" + settingsFile.getAbsolutePath() + "\"" );
verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( "\"" + settingsFile.getAbsolutePath() + "\"" );
verifier.setCliOptions( cliOptions );
verifier.executeGoal( "mng3372:test" );
verifier.verifyErrorFreeLog();
@ -90,10 +86,8 @@ public class MavenITmng3372DirectInvocationOfPluginsTest
Verifier verifier = newVerifier( testBaseDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-U" );
verifier.getCliOptions().add( "-U" );
verifier.setCliOptions( cliOptions );
verifier.executeGoal( "dependency:tree" );
verifier.verifyErrorFreeLog();

17
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
View File

@ -110,12 +110,10 @@ public class MavenITmng3415JunkRepositoryMetadataTest
filterProps.put( "@port@", "0" );
File settings = verifier.filterFile( "settings-template.xml", "settings-a.xml", "UTF-8", filterProps );
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
cliOptions.add( "-s" );
cliOptions.add( settings.getName() );
verifier.getCliOptions().add( "-X" );
verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( settings.getName() );
verifier.setCliOptions( cliOptions );
verifier.setLogFileName( "log-" + methodName + "-firstBuild.txt" );
verifier.executeGoal( "validate" );
@ -206,12 +204,9 @@ public class MavenITmng3415JunkRepositoryMetadataTest
filterProps.put( "@port@", Integer.toString( port ) );
File settings = verifier.filterFile( "settings-template.xml", "settings-b.xml", "UTF-8", filterProps );
List cliOptions = new ArrayList();
cliOptions.add( "-X" );
cliOptions.add( "-s" );
cliOptions.add( settings.getName() );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-X" );
verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( settings.getName() );
setupDummyDependency( testDir, localRepo, true );

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
View File

@ -29,8 +29,6 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
public class MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest
extends AbstractMavenIntegrationTestCase
@ -54,10 +52,8 @@ public class MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest
verifier = newVerifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-s" );
cliOptions.add( "settings.xml" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( "settings.xml" );
verifier.executeGoal( "deploy" );
verifier.verifyErrorFreeLog();

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3482DependencyPomInterpolationTest.java
View File

@ -74,12 +74,8 @@ public class MavenITmng3482DependencyPomInterpolationTest
* recurse. We are only installing the parent pom to
* the local repo here.
*/
List cliOptions = new ArrayList();
cliOptions.add( "-s" );
cliOptions.add( "\"" + settings.getAbsolutePath() + "\"" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-s" );
verifier.getCliOptions().add( "\"" + settings.getAbsolutePath() + "\"" );
verifier.executeGoal( "compile" );

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
View File

@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class MavenITmng3485OverrideWagonExtensionTest
extends AbstractMavenIntegrationTestCase
@ -43,8 +41,6 @@ public class MavenITmng3485OverrideWagonExtensionTest
verifier = newVerifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
verifier.setCliOptions( cliOptions );
verifier.executeGoal( "deploy" );
verifier.assertFilePresent( "target/wagon-data" );

10
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
View File

@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class MavenITmng3535SelfReferentialPropertiesTest
extends AbstractMavenIntegrationTestCase
@ -43,9 +41,7 @@ public class MavenITmng3535SelfReferentialPropertiesTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
List opts = new ArrayList();
opts.add( "-X" );
verifier.setCliOptions( opts );
verifier.getCliOptions().add( "-X" );
verifier.setAutoclean( false );
verifier.executeGoal( "verify" );
@ -62,9 +58,7 @@ public class MavenITmng3535SelfReferentialPropertiesTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
List opts = new ArrayList();
opts.add( "-X" );
verifier.setCliOptions( opts );
verifier.getCliOptions().add( "-X" );
verifier.setAutoclean( false );

38
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java
View File

@ -20,8 +20,6 @@ package org.apache.maven.it;
*/
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
@ -53,9 +51,6 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log1.txt" );
List cliOptions = new ArrayList();
verifier.setCliOptions( cliOptions );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@ -82,13 +77,10 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log2.txt" );
List cliOptions = new ArrayList();
// Deactivate active by default profiles
cliOptions.add( "-P-profile1" );
cliOptions.add( "-P -profile2" );
verifier.getCliOptions().add( "-P-profile1" );
verifier.getCliOptions().add( "-P -profile2" );
verifier.setCliOptions( cliOptions );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@ -107,13 +99,10 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log3.txt" );
List cliOptions = new ArrayList();
// Deactivate active by default profiles
cliOptions.add( "-P!profile1" );
cliOptions.add( "-P !profile2" );
verifier.getCliOptions().add( "-P!profile1" );
verifier.getCliOptions().add( "-P !profile2" );
verifier.setCliOptions( cliOptions );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@ -137,13 +126,10 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log4.txt" );
List cliOptions = new ArrayList();
// Activate with a prop, then deactivate
cliOptions.add( "-Dprofile3-active-by-property=true" );
cliOptions.add( "-P-profile3" );
verifier.getCliOptions().add( "-Dprofile3-active-by-property=true" );
verifier.getCliOptions().add( "-P-profile3" );
verifier.setCliOptions( cliOptions );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@ -170,13 +156,10 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log5.txt" );
List cliOptions = new ArrayList();
// Activate then deactivate
cliOptions.add( "-Pprofile4" );
cliOptions.add( "-P-profile4" );
verifier.getCliOptions().add( "-Pprofile4" );
verifier.getCliOptions().add( "-P-profile4" );
verifier.setCliOptions( cliOptions );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@ -203,12 +186,9 @@ public class MavenITmng3545ProfileDeactivationTest
verifier.deleteDirectory( "target" );
verifier.setLogFileName( "log6.txt" );
List cliOptions = new ArrayList();
// Activate
cliOptions.add( "-Pprofile4" );
verifier.getCliOptions().add( "-Pprofile4" );
verifier.setCliOptions( cliOptions );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();

20
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
View File

@ -21,8 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
@ -157,12 +155,9 @@ public class MavenITmng3599useHttpProxyForWebDAVTest
verifier = newVerifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--settings" );
cliOptions.add( "settings.xml" );
cliOptions.add( "-X" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
verifier.getCliOptions().add( "-X" );
verifier.deleteArtifact( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "pom" );
@ -206,12 +201,9 @@ public class MavenITmng3599useHttpProxyForWebDAVTest
verifier = newVerifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--settings" );
cliOptions.add( "settings.xml" );
cliOptions.add( "-X" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
verifier.getCliOptions().add( "-X" );
verifier.deleteArtifact( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" );
verifier.deleteArtifact( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "pom" );

16
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
View File

@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
public class MavenITmng3600DeploymentModeDefaultsTest
@ -45,8 +43,6 @@ public class MavenITmng3600DeploymentModeDefaultsTest
verifier = newVerifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
verifier.setCliOptions( cliOptions );
verifier.setLogFileName( "log-no-settings.txt" );
verifier.executeGoal( "deploy" );
@ -69,10 +65,8 @@ public class MavenITmng3600DeploymentModeDefaultsTest
verifier = newVerifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--settings" );
cliOptions.add( "settings-server-defaults.xml" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings-server-defaults.xml" );
verifier.setLogFileName( "log-server-defaults.txt" );
verifier.executeGoal( "deploy" );
@ -95,10 +89,8 @@ public class MavenITmng3600DeploymentModeDefaultsTest
verifier = newVerifier( testDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "--settings" );
cliOptions.add( "settings-modes-set.xml" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings-modes-set.xml" );
verifier.setLogFileName( "log-modes-set.txt" );
verifier.executeGoal( "deploy" );

13
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3641ProfileActivationWarningTest.java
View File

@ -20,7 +20,6 @@ package org.apache.maven.it;
*/
import java.io.File;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.regex.Pattern;
@ -52,7 +51,7 @@ public class MavenITmng3641ProfileActivationWarningTest
verifier.deleteArtifact( "org.apache.maven.its.mng3641", "parent", "1.0", "pom" );
// (1) make sure the profile is found. Must not contain a warning.
verifier.setCliOptions( Collections.singletonList( "-P mng-3641-it-provided-profile" ) );
verifier.getCliOptions().add( "-P mng-3641-it-provided-profile" );
verifier.setLogFileName( "log-1.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@ -63,7 +62,7 @@ public class MavenITmng3641ProfileActivationWarningTest
// (2) make sure the profile was not found and a warning was printed.
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setCliOptions( Collections.singletonList( "-P mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" ) );
verifier.getCliOptions().add( "-P mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" );
verifier.setLogFileName( "log-2.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@ -75,7 +74,7 @@ public class MavenITmng3641ProfileActivationWarningTest
// (3) make sure the first profile is found while the other is not and a warning was printed
// accordingly.
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setCliOptions( Collections.singletonList( "-P mng-3641-it-provided-profile,mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" ) );
verifier.getCliOptions().add( "-P mng-3641-it-provided-profile,mng-3641-TWlzdGVyIFQgd2FzIGhlcmUuICheX14p" );
verifier.setLogFileName( "log-3.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@ -87,7 +86,7 @@ public class MavenITmng3641ProfileActivationWarningTest
// (4) make sure the warning is only printed when the profile is missing in all projects
verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setCliOptions( Collections.singletonList( "-P mng-3641-it-provided-profile-child" ) );
verifier.getCliOptions().add( "-P mng-3641-it-provided-profile-child" );
verifier.setLogFileName( "log-4.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@ -98,7 +97,7 @@ public class MavenITmng3641ProfileActivationWarningTest
// (5) make sure the profile is found in subproject. Must not contain a warning.
verifier = newVerifier( new File( testDir, "child1" ).getAbsolutePath() );
verifier.setCliOptions( Collections.singletonList( "-P mng-3641-it-provided-profile-child" ) );
verifier.getCliOptions().add( "-P mng-3641-it-provided-profile-child" );
verifier.setLogFileName( "log-5.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
@ -109,7 +108,7 @@ public class MavenITmng3641ProfileActivationWarningTest
// (6) make sure the profile is found from parent in subproject. Must not contain a warning.
verifier = newVerifier( new File( testDir, "child1" ).getAbsolutePath() );
verifier.setCliOptions( Collections.singletonList( "-P mng-3641-it-provided-profile" ) );
verifier.getCliOptions().add( "-P mng-3641-it-provided-profile" );
verifier.setLogFileName( "log-6.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();

37
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
View File

@ -21,7 +21,6 @@ package org.apache.maven.it;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.ServletException;
@ -109,10 +108,8 @@ public class MavenITmng3652UserAgentHeaderTest
verifier = newVerifier( projectDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-DtestPort=" + port );
cliOptions.add( "-X" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-DtestPort=" + port );
verifier.getCliOptions().add( "-X" );
verifier.setLogFileName( "log-unConfiguredHttp.txt" );
verifier.executeGoal( "validate" );
@ -156,11 +153,9 @@ public class MavenITmng3652UserAgentHeaderTest
verifier = newVerifier( projectDir.getAbsolutePath() );
// test webdav
List cliOptions = new ArrayList();
cliOptions.add( "-DtestPort=" + port );
cliOptions.add( "-DtestProtocol=dav:http" );
cliOptions.add( "-X" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-DtestPort=" + port );
verifier.getCliOptions().add( "-DtestProtocol=dav:http" );
verifier.getCliOptions().add( "-X" );
verifier.setLogFileName( "log-unConfiguredDAV.txt" );
verifier.executeGoal( "validate" );
@ -205,12 +200,10 @@ public class MavenITmng3652UserAgentHeaderTest
// test settings with no config
List cliOptions = new ArrayList();
cliOptions.add( "-DtestPort=" + port );
cliOptions.add( "--settings" );
cliOptions.add( "settings-no-config.xml" );
cliOptions.add( "-X" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-DtestPort=" + port );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings-no-config.xml" );
verifier.getCliOptions().add( "-X" );
verifier.setLogFileName( "log-configWithoutUserAgent.txt" );
verifier.executeGoal( "validate" );
@ -255,12 +248,10 @@ public class MavenITmng3652UserAgentHeaderTest
// test settings with config
List cliOptions = new ArrayList();
cliOptions.add( "-DtestPort=" + port );
cliOptions.add( "--settings" );
cliOptions.add( "settings.xml" );
cliOptions.add( "-X" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-DtestPort=" + port );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
verifier.getCliOptions().add( "-X" );
verifier.setLogFileName( "log-configWithUserAgent.txt" );
verifier.executeGoal( "validate" );
@ -270,7 +261,7 @@ public class MavenITmng3652UserAgentHeaderTest
String userAgent = this.userAgent;
assertNotNull( userAgent );
// System.out.println( "Comparing User-Agent: '" + userAgent + "' to 'Maven Fu'" );
assertEquals( "Maven Fu", userAgent );
}
}

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

@ -23,8 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
/**
@ -63,9 +61,7 @@ public class MavenITmng3714ToolchainsCliOptionTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List cliOptions = new ArrayList();
cliOptions.add( "--toolchains toolchains.xml" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "--toolchains toolchains.xml" );
verifier.executeGoal( "initialize" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

8
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java
View File

@ -71,10 +71,12 @@ public class MavenITmng3732ActiveProfilesTest
ids.add( props.getProperty( "project.activeProfiles.0.id", "" ) );
ids.add( props.getProperty( "project.activeProfiles.1.id", "" ) );
ids.add( props.getProperty( "project.activeProfiles.2.id", "" ) );
ids.add( props.getProperty( "project.activeProfiles.3.id", "" ) );
ids.remove( "it-defaults" );
Collections.sort( ids );
assertEquals( Arrays.asList( new String[] { "pom", "profiles", "settings" } ), ids );
assertEquals( "3", props.getProperty( "project.activeProfiles" ) );
assertEquals( "4", props.getProperty( "project.activeProfiles" ) );
assertEquals( "PASSED-1", props.getProperty( "project.properties.pomProperty" ) );
assertEquals( "PASSED-2", props.getProperty( "project.properties.settingsProperty" ) );
@ -84,10 +86,12 @@ public class MavenITmng3732ActiveProfilesTest
{
ids.add( props.getProperty( "project.activeProfiles.0.id", "" ) );
ids.add( props.getProperty( "project.activeProfiles.1.id", "" ) );
ids.add( props.getProperty( "project.activeProfiles.2.id", "" ) );
ids.remove( "it-defaults" );
Collections.sort( ids );
assertEquals( Arrays.asList( new String[] { "pom", "settings" } ), ids );
assertEquals( "2", props.getProperty( "project.activeProfiles" ) );
assertEquals( "3", props.getProperty( "project.activeProfiles" ) );
assertEquals( "PASSED-1", props.getProperty( "project.properties.pomProperty" ) );
assertEquals( "PASSED-2", props.getProperty( "project.properties.settingsProperty" ) );

11
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java
View File

@ -20,8 +20,6 @@ package org.apache.maven.it;
*/
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
@ -81,12 +79,9 @@ public class MavenITmng3746POMPropertyOverrideTest
verifier = newVerifier( projectDir.getAbsolutePath() );
List cliOptions = new ArrayList();
cliOptions.add( "-Dtest.verification=cli" );
cliOptions.add( "-Dtest.usingCliValue=true" );
cliOptions.add( "-Djava.version=cli" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-Dtest.verification=cli" );
verifier.getCliOptions().add( "-Dtest.usingCliValue=true" );
verifier.getCliOptions().add( "-Djava.version=cli" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();

4
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
View File

@ -20,7 +20,6 @@ package org.apache.maven.it;
*/
import java.io.File;
import java.util.Collections;
import java.util.List;
import java.util.Properties;
@ -71,8 +70,7 @@ public class MavenITmng3760BaseUriPropertyTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List cliOptions = Collections.singletonList( "-DbaseUri=myBaseUri" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-DbaseUri=myBaseUri" );
verifier.setLogFileName( "log-sysprop.txt" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();

3
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java
View File

@ -23,7 +23,6 @@ import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.util.Collections;
import java.util.Properties;
/**
@ -56,7 +55,7 @@ public class MavenITmng3853ProfileInjectedDistReposTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
verifier.setCliOptions( Collections.singletonList( "-Pcoreit" ) );
verifier.getCliOptions().add( "-Pcoreit" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();

30
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
View File

@ -23,8 +23,6 @@ import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
/**
@ -52,11 +50,8 @@ public class MavenITmng4254SelectableWagonProvidersTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List cliOptions = new ArrayList();
cliOptions.add( "-Dmaven.wagon.provider.http=coreit" );
cliOptions.add( "-V" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-Dmaven.wagon.provider.http=coreit" );
verifier.getCliOptions().add( "-V" );
verifier.setLogFileName( "log-cli.txt" );
verifier.executeGoal( "validate" );
@ -77,12 +72,9 @@ public class MavenITmng4254SelectableWagonProvidersTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List cliOptions = new ArrayList();
cliOptions.add( "--settings" );
cliOptions.add( "settings.xml" );
cliOptions.add( "-V" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
verifier.getCliOptions().add( "-V" );
verifier.setLogFileName( "log-settings.txt" );
verifier.executeGoal( "validate" );
@ -103,10 +95,7 @@ public class MavenITmng4254SelectableWagonProvidersTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List cliOptions = new ArrayList();
cliOptions.add( "-V" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-V" );
verifier.setLogFileName( "log-default-http.txt" );
verifier.executeGoal( "validate" );
@ -127,11 +116,8 @@ public class MavenITmng4254SelectableWagonProvidersTest
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
List cliOptions = new ArrayList();
cliOptions.add( "-V" );
cliOptions.add( "-DwagonProtocol=https" );
verifier.setCliOptions( cliOptions );
verifier.getCliOptions().add( "-V" );
verifier.getCliOptions().add( "-DwagonProtocol=https" );
verifier.setLogFileName( "log-default-https.txt" );
verifier.executeGoal( "validate" );

69
its/core-it-suite/src/test/resources-filtered/settings.xml Normal file
View File

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<settings>
<proxies>
<proxy>
<id>it-proxy</id>
<active>${proxy.active}</active>
<protocol>${proxy.type}</protocol>
<host>${proxy.host}</host>
<port>${proxy.port}</port>
<username>${proxy.user}</username>
<password>${proxy.pass}</password>
<nonProxyHosts>localhost</nonProxyHosts>
</proxy>
</proxies>
<profiles>
<profile>
<id>it-defaults</id>
<repositories>
<repository>
<id>central</id>
<name>Apache Maven Integration Testing Repository</name>
<url>http://repository.sonatype.org/content/repositories/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<name>Apache Maven Integration Testing Repository</name>
<url>http://repository.sonatype.org/content/repositories/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>it-defaults</activeProfile>
</activeProfiles>
</settings>

39
its/core-it-suite/src/test/resources/bootstrap/settings.xml
View File

@ -22,24 +22,12 @@ under the License.
<settings>
<profiles>
<profile>
<id>maven-core-it-repo</id>
<!-- TODO: Remove once IT support plugins/artifacts have been released -->
<id>it-defaults</id>
<repositories>
<repository>
<id>maven.it</id>
<name>Apache Maven Integration Testing Snapshot Repository</name>
<url>http://repository.sonatype.org/content/repositories/maven.snapshots</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>http://repository.apache.org/snapshots</url>
<id>central</id>
<name>Apache Maven Integration Testing Repository</name>
<url>http://repository.sonatype.org/content/repositories/public</url>
<releases>
<enabled>true</enabled>
</releases>
@ -50,20 +38,9 @@ under the License.
</repositories>
<pluginRepositories>
<pluginRepository>
<id>maven.it</id>
<name>Apache Maven Integration Testing Snapshot Repository</name>
<url>http://repository.sonatype.org/content/repositories/maven.snapshots</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
<url>http://repository.apache.org/snapshots</url>
<id>central</id>
<name>Apache Maven Integration Testing Repository</name>
<url>http://repository.sonatype.org/content/repositories/public</url>
<releases>
<enabled>true</enabled>
</releases>
@ -75,6 +52,6 @@ under the License.
</profile>
</profiles>
<activeProfiles>
<activeProfile>maven-core-it-repo</activeProfile>
<activeProfile>it-defaults</activeProfile>
</activeProfiles>
</settings>

55
its/core-it-suite/src/test/resources/it0041/settings.xml Normal file
View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<settings>
<profiles>
<profile>
<id>it-defaults</id>
<repositories>
<repository>
<id>central</id>
<url>http://repo1.maven.org/maven2</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<url>http://repo1.maven.org/maven2</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>it-defaults</activeProfile>
</activeProfiles>
</settings>

53
its/core-it-suite/src/test/resources/mng-0294/user-settings.xml
View File

@ -1,5 +1,58 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<settings>
<activeProfiles>
<activeProfile>test-profile</activeProfile>
<activeProfile>it-defaults</activeProfile>
</activeProfiles>
<profiles>
<profile>
<id>it-defaults</id>
<repositories>
<repository>
<id>central</id>
<name>Apache Maven Integration Testing Repository</name>
<url>http://repository.sonatype.org/content/repositories/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<name>Apache Maven Integration Testing Repository</name>
<url>http://repository.sonatype.org/content/repositories/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
</settings>

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

@ -22,8 +22,8 @@ under the License.
<settings>
<mirrors>
<mirror>
<!-- make sure central isn't touched -->
<id>test-mirror</id>
<!-- disable remote trips to speed things up -->
<id>central</id>
<url>@baseurl@/repo-null</url>
<mirrorOf>central</mirrorOf>
</mirror>

2
its/core-it-suite/src/test/resources/mng-0479/test/settings.xml
View File

@ -25,7 +25,7 @@ under the License.
<!--
Make sure we also override the repo definition in case a repo manager is setup.
-->
<id>it0043</id>
<id>it-defaults</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>

11
its/core-it-suite/src/test/resources/mng-0505/settings-template.xml
View File

@ -20,13 +20,20 @@ under the License.
-->
<settings>
<mirrors>
<mirror>
<!-- disable remote trips to speed things up -->
<id>central</id>
<mirrorOf>central</mirrorOf>
<url>@baseurl@/target/null</url>
</mirror>
</mirrors>
<profiles>
<profile>
<id>maven-core-it-repo</id>
<repositories>
<repository>
<!-- NOTE: Override central to make sure the test queries only the test repo -->
<id>central</id>
<id>maven-core-it</id>
<url>@baseurl@/repo</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>

55
its/core-it-suite/src/test/resources/mng-0507/settings.xml Normal file
View File

@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
<settings>
<profiles>
<profile>
<id>it-defaults</id>
<repositories>
<repository>
<id>central</id>
<url>http://repo1.maven.org/maven2</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<url>http://repo1.maven.org/maven2</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>it-defaults</activeProfile>
</activeProfiles>
</settings>

10
its/core-it-suite/src/test/resources/mng-2387/settings-template.xml
View File

@ -20,6 +20,14 @@ under the License.
-->
<settings>
<mirrors>
<mirror>
<!-- disable remote trips to speed things up -->
<id>central</id>
<url>@baseurl@/repo-null</url>
<mirrorOf>central</mirrorOf>
</mirror>
</mirrors>
<proxies>
<proxy>
<!-- NOTE: Set as inactive so should not be used, even if the one and only proxy configured -->
@ -38,7 +46,7 @@ under the License.
</activation>
<repositories>
<repository>
<id>central</id>
<id>maven-core-it</id>
<url>http://@host@:@port@/</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>

4
its/core-it-suite/src/test/resources/mng-2741/settings.xml
View File

@ -25,7 +25,7 @@ under the License.
</pluginGroups>
<profiles>
<profile>
<id>maven-core-it-repo</id>
<id>it-defaults</id>
<repositories>
<repository>
<id>central</id>
@ -53,6 +53,6 @@ under the License.
</profile>
</profiles>
<activeProfiles>
<activeProfile>maven-core-it-repo</activeProfile>
<activeProfile>it-defaults</activeProfile>
</activeProfiles>
</settings>

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

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

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

@ -48,7 +48,7 @@ under the License.
from central fail, too.
-->
<mirror>
<id>central-mirror</id>
<id>central</id>
<url>@baseurl@/null</url>
<mirrorOf>central</mirrorOf>
</mirror>

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

@ -48,7 +48,7 @@ under the License.
from central fail, too.
-->
<mirror>
<id>central-mirror</id>
<id>central</id>
<url>@baseurl@/null</url>
<mirrorOf>central</mirrorOf>
</mirror>

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

@ -48,7 +48,7 @@ under the License.
from central fail, too.
-->
<mirror>
<id>central-mirror</id>
<id>central</id>
<url>@baseurl@/null</url>
<mirrorOf>central</mirrorOf>
</mirror>

2
its/core-it-suite/src/test/resources/mng-3461/test-1/settings-template.xml
View File

@ -43,7 +43,7 @@ under the License.
<mirrors>
<mirror>
<id>test-a</id>
<id>central</id>
<url>@baseurl@/null0</url>
<mirrorOf>*</mirrorOf>
</mirror>

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

@ -63,7 +63,7 @@ under the License.
<mirrors>
<mirror>
<id>test-a</id>
<id>central</id>
<url>@baseurl@/repo-3</url>
<!-- should not match anything but maven-core-it-ext -->
<mirrorOf>external:*</mirrorOf>

2
its/core-it-suite/src/test/resources/mng-3461/test-3/settings-template.xml
View File

@ -43,7 +43,7 @@ under the License.
<mirrors>
<mirror>
<id>test-a</id>
<id>central</id>
<url>http://maven.apache.org/null</url>
<!--
The explicit mismatch with maven-core-it should be dominant over the wildcard, even if the wildcard

9
its/core-it-suite/src/test/resources/mng-3477/settings.xml
View File

@ -20,12 +20,19 @@ under the License.
-->
<settings>
<mirrors>
<mirror>
<id>central</id>
<url>http://localhost:54312/repo</url>
<mirrorOf>central</mirrorOf>
</mirror>
</mirrors>
<profiles>
<profile>
<id>maven-core-it-repo</id>
<repositories>
<repository>
<id>central</id>
<id>maven-core-it</id>
<url>http://localhost:54312/repo</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>

9
its/core-it-suite/src/test/resources/mng-4068/settings-template.xml
View File

@ -25,9 +25,14 @@ under the License.
<!-- NOTE: The id of the mirror should be used to lookup the credentials, not the id of the original repository. -->
<id>maven-core-it-mng-4068</id>
<name>Test Mirror</name>
<mirrorOf>central</mirrorOf>
<mirrorOf>mng-4068</mirrorOf>
<url>http://localhost:@mirrorPort@/</url>
</mirror>
<mirror>
<id>central</id>
<mirrorOf>central</mirrorOf>
<url>@baseurl@/target/null</url>
</mirror>
</mirrors>
<servers>
<server>
@ -41,7 +46,7 @@ under the License.
<id>mng-4068</id>
<repositories>
<repository>
<id>central</id>
<id>mng-4068</id>
<url>file://null</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>

10
its/core-it-suite/src/test/resources/mng-4150/settings-template.xml
View File

@ -20,13 +20,21 @@ under the License.
-->
<settings>
<mirrors>
<mirror>
<!-- disable remote trips to speed things up -->
<id>central</id>
<url>@baseurl@/target/null</url>
<mirrorOf>central</mirrorOf>
</mirror>
</mirrors>
<profiles>
<profile>
<id>maven-core-it-repo</id>
<repositories>
<repository>
<!-- NOTE: Override central to make sure the test queries only the test repo -->
<id>central</id>
<id>maven-core-it</id>
<url>@baseurl@/repo</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>

4
its/core-it-suite/src/test/resources/mng-4190/pom.xml
View File

@ -28,7 +28,9 @@ under the License.
<name>Maven Integration Test :: MNG-4190</name>
<description>
Test that
Test that artifact repositories are merged if they are mirrored by the same repo. If n repos map to one
mirror, there is no point in making n trips to the same mirror. However, the effective/merged repo needs
to account for possibly different policies of the original repos.
</description>
<repositories>

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

@ -22,7 +22,7 @@ under the License.
<settings>
<mirrors>
<mirror>
<id>maven-core-it-repo</id>
<id>central</id>
<url>@baseurl@/repo</url>
<mirrorOf>*</mirrorOf>
</mirror>

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

@ -22,7 +22,7 @@ under the License.
<settings>
<mirrors>
<mirror>
<id>central-blocker</id>
<id>central</id>
<mirrorOf>central</mirrorOf>
<url>@baseurl@/void</url>
</mirror>

16
its/core-it-suite/src/test/resources/mng-4347/settings-template.xml
View File

@ -23,7 +23,7 @@ under the License.
<!-- if this profile is used, the import-scoped POM will be resolvable. -->
<profiles>
<profile>
<id>central-override</id>
<id>it-defaults</id>
<repositories>
<repository>
<id>central</id>
@ -36,9 +36,21 @@ under the License.
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<url>@baseurl@/remote-repository</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>central-override</activeProfile>
<activeProfile>it-defaults</activeProfile>
</activeProfiles>
</settings>

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

@ -24,7 +24,7 @@ under the License.
<mirror>
<id>test</id>
<url>@mirrorurl@</url>
<mirrorOf>*</mirrorOf>
<mirrorOf>*,!central</mirrorOf>
<mirrorOfLayouts>@layouts@</mirrorOfLayouts>
</mirror>
</mirrors>

22
its/core-it-suite/src/test/resources/mng-4401/settings-template.xml
View File

@ -26,10 +26,15 @@ under the License.
<mirrorOf>central</mirrorOf>
<url>@baseurl@/repo-2</url>
</mirror>
<mirror>
<id>central</id>
<mirrorOf>maven.it</mirrorOf>
<url>http://repository.sonatype.org/content/repositories/public</url>
</mirror>
</mirrors>
<profiles>
<profile>
<id>maven-core-it-repo</id>
<id>it-defaults</id>
<repositories>
<!-- repo-1 has the right parent POM, repo-2 the unwanted one -->
<repository>
@ -53,9 +58,22 @@ under the License.
</snapshots>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>maven.it</id>
<name>Apache Maven Integration Testing Repository</name>
<url>http://localhost</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</profile>
</profiles>
<activeProfiles>
<activeProfile>maven-core-it-repo</activeProfile>
<activeProfile>it-defaults</activeProfile>
</activeProfiles>
</settings>

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

@ -27,7 +27,7 @@ under the License.
<url>http://localhost:@port@/</url>
</mirror>
<mirror>
<id>central-mirror</id>
<id>central</id>
<mirrorOf>central</mirrorOf>
<url>@baseurl@/target/null</url>
</mirror>

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

@ -33,7 +33,7 @@ under the License.
<url>http://mng4489.bad.host/repo-b</url>
</mirror>
<mirror>
<id>central-mirror</id>
<id>central</id>
<mirrorOf>central</mirrorOf>
<url>@baseurl@/target/null</url>
</mirror>

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

@ -22,7 +22,7 @@ under the License.
<settings>
<mirrors>
<mirror>
<id>central-mirror</id>
<id>central</id>
<mirrorOf>central</mirrorOf>
<url>@baseurl@/target/null</url>
</mirror>

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

@ -25,7 +25,7 @@ under the License.
</pluginGroups>
<mirrors>
<mirror>
<id>mng4554</id>
<id>central</id>
<mirrorOf>central</mirrorOf>
<url>http://localhost:@port@/@repo@</url>
</mirror>

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

@ -33,7 +33,7 @@ under the License.
<url>http://mng4561.bad.host/repo-b</url>
</mirror>
<mirror>
<id>central-mirror</id>
<id>central</id>
<mirrorOf>central</mirrorOf>
<url>@baseurl@/target/null</url>
</mirror>

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

@ -33,7 +33,7 @@ under the License.
<url>http://mng4729.bad.host/repo-b</url>
</mirror>
<mirror>
<id>central-mirror</id>
<id>central</id>
<mirrorOf>central</mirrorOf>
<url>@baseurl@/target/null</url>
</mirror>

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

@ -22,8 +22,8 @@ under the License.
<settings>
<mirrors>
<mirror>
<!-- make sure central isn't touched -->
<id>test-mirror</id>
<!-- disable remote trips to speed things up -->
<id>central</id>
<url>@baseurl@/repo-null</url>
<mirrorOf>central</mirrorOf>
</mirror>