Author: bentmann
Date: Tue Dec 16 03:20:59 2008
New Revision: 727020
URL: http://svn.apache.org/viewvc?rev=727020&view=rev
Log:
o Removed CLI option "--no-plugin-registry" which was deprecated and finally
removed from Maven 3.x (i.e. now causes CLI parsing errors)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0053Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051Test.java?rev=727020&r1=727019&r2=727020&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051Test.java
Tue Dec 16 03:20:59 2008
@@ -23,8 +23,6 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
public class MavenIT0051Test
extends AbstractMavenIntegrationTestCase
@@ -42,9 +40,6 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0051" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "--no-plugin-registry -DperformRelease=true" );
- verifier.setCliOptions( cliOptions );
verifier.executeGoal( "package" );
verifier.assertFilePresent( "target/source-jar.txt" );
verifier.assertFilePresent( "target/javadoc-jar.txt" );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052Test.java?rev=727020&r1=727019&r2=727020&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0052Test.java
Tue Dec 16 03:20:59 2008
@@ -23,8 +23,6 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
public class MavenIT0052Test
extends AbstractMavenIntegrationTestCase
@@ -39,9 +37,6 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0052" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "--no-plugin-registry" );
- verifier.setCliOptions( cliOptions );
verifier.executeGoal( "package" );
verifier.assertFilePresent( "target/maven-it-it0052-1.0.jar" );
verifier.assertFileNotPresent( "target/source-jar.txt" );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0053Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0053Test.java?rev=727020&r1=727019&r2=727020&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0053Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0053Test.java
Tue Dec 16 03:20:59 2008
@@ -23,8 +23,6 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
public class MavenIT0053Test
extends AbstractMavenIntegrationTestCase
@@ -40,9 +38,6 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0053" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- List cliOptions = new ArrayList();
- cliOptions.add( "--no-plugin-registry" );
- verifier.setCliOptions( cliOptions );
verifier.executeGoal( "package" );
verifier.assertFilePresent( "target/maven-it-it0053-1.0-SNAPSHOT.jar"
);
verifier.assertFileNotPresent(
"target/maven-it-it0053-1.0-SNAPSHOT-sources.jar" );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java?rev=727020&r1=727019&r2=727020&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
Tue Dec 16 03:20:59 2008
@@ -47,7 +47,7 @@
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.plugins",
"maven-it-it-plugin", "1.0", "maven-plugin" );
List cliOptions = new ArrayList();
- cliOptions.add( "--no-plugin-registry --fail-never" );
+ cliOptions.add( "--fail-never" );
verifier.setCliOptions( cliOptions );
verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-touch:touch" );
verifier.assertFilePresent( "target/touch.txt" );
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java?rev=727020&r1=727019&r2=727020&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
Tue Dec 16 03:20:59 2008
@@ -23,8 +23,6 @@
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-282";>MNG-282</a>.
@@ -45,9 +43,6 @@
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/mng-0282" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
verifier.deleteArtifact( "org.apache.maven.its.plugins",
"maven-it-plugin-no-project", "1.0", "maven-plugin" );
- List cliOptions = new ArrayList();
- cliOptions.add( "--no-plugin-registry" );
- verifier.setCliOptions( cliOptions );
verifier.executeGoal(
"org.apache.maven.its.plugins:maven-it-plugin-no-project:light-touch" );
verifier.assertFilePresent( "target/touch.txt" );
verifier.assertFileNotPresent( "subproject/target/touch.txt" );
