Author: brett
Date: Sun Jul 6 23:20:26 2008
New Revision: 674406
URL: http://svn.apache.org/viewvc?rev=674406&view=rev
Log:
now that external:* is available (and relied on for other tests), we don't need
to jump through settings hoops for repository managers.
Removed:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0059/settings.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0092/settings.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0110-pluginDependenciesComeFromPluginRepos/settings.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2744-checksumVerification/settings.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3372-directInvocationOfPlugins/dependency-tree/settings.xml
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0059Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0110PluginDependenciesComeFromPluginReposTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2744checksumVerificationTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3372DirectInvocationOfPlugins.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/MNG-2861/B/pom.xml
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0059Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0059Test.java?rev=674406&r1=674405&r2=674406&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0059Test.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0059Test.java
Sun Jul 6 23:20:26 2008
@@ -21,9 +21,6 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0059" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "--settings settings.xml" );
- verifier.setCliOptions( cliOptions );
Properties verifierProperties = new Properties();
verifierProperties.put( "failOnErrorOutput", "false" );
verifier.setVerifierProperties( verifierProperties );
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java?rev=674406&r1=674405&r2=674406&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0092Test.java
Sun Jul 6 23:20:26 2008
@@ -25,9 +25,6 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0092" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "--settings settings.xml" );
- verifier.setCliOptions( cliOptions );
verifier.deleteArtifact( "org.apache.maven", "maven-core-it-support",
"1.0-SNAPSHOT", "jar" );
verifier.executeGoal( "compile" );
verifier.assertArtifactPresent( "org.apache.maven",
"maven-core-it-support", "1.0-SNAPSHOT", "jar" );
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0110PluginDependenciesComeFromPluginReposTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0110PluginDependenciesComeFromPluginReposTest.java?rev=674406&r1=674405&r2=674406&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0110PluginDependenciesComeFromPluginReposTest.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0110PluginDependenciesComeFromPluginReposTest.java
Sun Jul 6 23:20:26 2008
@@ -16,9 +16,6 @@
File testDir =
ResourceExtractor.simpleExtractResources( getClass(),
"/it0110-pluginDependenciesComeFromPluginRepos" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "--settings settings.xml" );
- verifier.setCliOptions( cliOptions );
verifier.deleteArtifact( "org.apache.maven.it", "mail", "1.3.2", "jar"
);
verifier.executeGoal( "clean" );
verifier.verifyErrorFreeLog();
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2744checksumVerificationTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2744checksumVerificationTest.java?rev=674406&r1=674405&r2=674406&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2744checksumVerificationTest.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2744checksumVerificationTest.java
Sun Jul 6 23:20:26 2008
@@ -31,9 +31,6 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-2744-checksumVerification" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "--settings settings.xml" );
- verifier.setCliOptions( cliOptions );
verifier.deleteArtifact( "org.apache.maven.its.mng2744", "a", "1",
"pom" );
verifier.deleteArtifact( "org.apache.maven.its.mng2744", "a", "1",
"jar" );
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java?rev=674406&r1=674405&r2=674406&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2861RelocationsAndRanges.java
Sun Jul 6 23:20:26 2008
@@ -35,10 +35,10 @@
* makes it easy to do this.
*/
verifier = new Verifier( new
File(testDir,"MNG-2861").getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.its.mng2123", "MNG-2861",
"1.0-SNAPSHOT", "pom" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2123", "A",
"1.0-SNAPSHOT", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2123", "B",
"1.0-SNAPSHOT", "jar" );
- verifier.deleteArtifact( "org.apache.maven.its.mng2123", "C",
"1.0-SNAPSHOT", "jar" );
+ verifier.deleteArtifact( "org.apache.maven.its.mng2861", "MNG-2861",
"1.0-SNAPSHOT", "pom" );
+ verifier.deleteArtifact( "org.apache.maven.its.mng2861", "A",
"1.0-SNAPSHOT", "jar" );
+ verifier.deleteArtifact( "org.apache.maven.its.mng2861", "B",
"1.0-SNAPSHOT", "jar" );
+ verifier.deleteArtifact( "org.apache.maven.its.mng2861", "C",
"1.0-SNAPSHOT", "jar" );
verifier.executeGoal( "install" );
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3372DirectInvocationOfPlugins.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3372DirectInvocationOfPlugins.java?rev=674406&r1=674405&r2=674406&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3372DirectInvocationOfPlugins.java
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3372DirectInvocationOfPlugins.java
Sun Jul 6 23:20:26 2008
@@ -63,13 +63,10 @@
// The testdir is computed from the location of this
// file.
File testBaseDir = ResourceExtractor.simpleExtractResources(
getClass(), "/mng-3372-directInvocationOfPlugins/dependency-tree" );
- File settingsFile = new File( testBaseDir, "settings.xml" );
Verifier verifier = new Verifier( testBaseDir.getAbsolutePath() );
List cliOptions = new ArrayList();
- cliOptions.add( "-s" );
- cliOptions.add( settingsFile.getAbsolutePath() );
cliOptions.add( "-U" );
verifier.setCliOptions( cliOptions );
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/MNG-2861/B/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/MNG-2861/B/pom.xml?rev=674406&r1=674405&r2=674406&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/MNG-2861/B/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-2861relocationsAndRanges/MNG-2861/B/pom.xml
Sun Jul 6 23:20:26 2008
@@ -19,7 +19,7 @@
<repositories>
<repository>
<id>id</id>
- <url>file:///${basedir}/../../repository</url>
+ <url>file://localhost/${basedir}/../../repository</url>
<releases><enabled>true</enabled></releases>
</repository>
</repositories>
