You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/01/03 13:35:48 UTC

svn commit: r730978 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/ resources/it0113/maven-it0113-plugin/ resources/it0113/test-project/ resources/it0113/test-project/src/

Author: bentmann
Date: Sat Jan  3 04:35:48 2009
New Revision: 730978

URL: http://svn.apache.org/viewvc?rev=730978&view=rev
Log:
o Accelerated IT

Removed:
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0113/test-project/src/
Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0113/maven-it0113-plugin/pom.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0113/test-project/pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java?rev=730978&r1=730977&r2=730978&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0113ServerAuthzAvailableToWagonMgrInPluginTest.java Sat Jan  3 04:35:48 2009
@@ -36,24 +36,23 @@
 
         Verifier verifier;
 
-        // Install the parent POM
-        verifier = new Verifier( testDir.getAbsolutePath() );
-        verifier.deleteArtifact( "org.apache.maven.its.it0113", "maven-it0113-plugin", "1.0-SNAPSHOT", "jar" );
-        verifier.deleteArtifact( "org.apache.maven.its.it0113", "test-project", "1.0-SNAPSHOT", "jar" );
-
         // Install the plugin to test for Authz info in the WagonManager
-        verifier = new Verifier( new File( testDir.getAbsolutePath(), "maven-it0113-plugin" ).getAbsolutePath() );
+        verifier = new Verifier( new File( testDir, "maven-it0113-plugin" ).getAbsolutePath() );
+        verifier.setAutoclean( false );
+        verifier.deleteArtifacts( "org.apache.maven.its.it0113" );
+        verifier.deleteDirectory( "target" );
         verifier.executeGoal( "install" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
         // Build the test project that uses the plugin.
-        verifier = new Verifier( new File( testDir.getAbsolutePath(), "test-project" ).getAbsolutePath() );
+        verifier = new Verifier( new File( testDir, "test-project" ).getAbsolutePath() );
+        verifier.setAutoclean( false );
         List cliOptions = new ArrayList();
         cliOptions.add( "--settings" );
         cliOptions.add( "settings.xml" );
         verifier.setCliOptions( cliOptions );
-        verifier.executeGoal( "install" );
+        verifier.executeGoal( "initialize" );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
     }

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0113/maven-it0113-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0113/maven-it0113-plugin/pom.xml?rev=730978&r1=730977&r2=730978&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0113/maven-it0113-plugin/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0113/maven-it0113-plugin/pom.xml Sat Jan  3 04:35:48 2009
@@ -1,11 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <groupId>org.apache.maven.its.it0113</groupId>
   <artifactId>maven-it0113-plugin</artifactId>
-  <packaging>maven-plugin</packaging>
   <version>1.0-SNAPSHOT</version>
+  <packaging>maven-plugin</packaging>
+
   <name>maven-it0113-plugin Maven Mojo</name>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0113/test-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0113/test-project/pom.xml?rev=730978&r1=730977&r2=730978&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0113/test-project/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0113/test-project/pom.xml Sat Jan  3 04:35:48 2009
@@ -1,26 +1,21 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
+
   <groupId>org.apache.maven.its.it0113</groupId>
   <artifactId>test-project</artifactId>
-  <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
   <name>test-project</name>
   <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
 
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.its.it0113</groupId>
         <artifactId>maven-it0113-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
         <executions>
           <execution>
             <id>test</id>