You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2008/05/31 16:51:07 UTC
svn commit: r662031 - in /maven/core-integration-testing/trunk:
core-integration-testing-plugins/
core-integration-testing-plugins/maven-it-plugin-uses-wagon/
core-integration-testing-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/pl...
Author: brett
Date: Sat May 31 07:51:07 2008
New Revision: 662031
URL: http://svn.apache.org/viewvc?rev=662031&view=rev
Log:
[MNG-3581] test the old behaviour of wagon extension loading
Added:
maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-uses-wagon/
- copied from r660857, maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-uses-properties/
maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java (with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3581PluginUsesWagonDependency.java
- copied, changed from r660857, maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0001Test.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3581-useWagonDependency/
- copied from r660857, maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/it0117-testUsesOfPropertiesInAMojo/
Removed:
maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java
Modified:
maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-uses-wagon/pom.xml
maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3581-useWagonDependency/pom.xml
Modified: maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-uses-wagon/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-uses-wagon/pom.xml?rev=662031&r1=660857&r2=662031&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-uses-wagon/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-uses-wagon/pom.xml Sat May 31 07:51:07 2008
@@ -24,20 +24,26 @@
<version>2.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>maven-it-plugin-uses-properties</artifactId>
+ <artifactId>maven-it-plugin-uses-wagon</artifactId>
<packaging>maven-plugin</packaging>
- <name>Maven Integration Test Plugin :: Uses Properties Plugin</name>
+ <name>Maven Integration Test Plugin :: Uses Wagon Plugin</name>
<inceptionYear>2006</inceptionYear>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>2.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-ssh</artifactId>
+ <version>1.0-beta-2</version>
+ </dependency>
</dependencies>
</project>
Added: maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java?rev=662031&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java (added)
+++ maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java Sat May 31 07:51:07 2008
@@ -0,0 +1,35 @@
+package org.apache.maven.plugin.coreit;
+
+import org.apache.maven.artifact.manager.WagonManager;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.wagon.Wagon;
+import org.apache.maven.wagon.providers.ssh.jsch.ScpWagon;
+
+/**
+ * @goal use-wagon
+ * @phase validate
+ */
+public class UsesWagonMojo
+ extends AbstractMojo
+{
+ /**
+ * @component
+ */
+ private WagonManager wagonManager;
+
+ public void execute()
+ throws MojoExecutionException
+ {
+ try
+ {
+ Wagon wagon = wagonManager.getWagon( "scp" );
+
+ ScpWagon myWagon = (ScpWagon) wagon;
+ }
+ catch( Exception e )
+ {
+ throw new MojoExecutionException( e.getMessage(), e );
+ }
+ }
+}
Propchange: maven/core-integration-testing/trunk/core-integration-testing-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml?rev=662031&r1=662030&r2=662031&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-testing-plugins/pom.xml Sat May 31 07:51:07 2008
@@ -23,6 +23,7 @@
<module>maven-it-plugin-setter</module>
<module>maven-it-plugin-touch</module>
<module>maven-it-plugin-uses-properties</module>
+ <module>maven-it-plugin-uses-wagon</module>
<module>maven-it-plugin-all</module>
</modules>
<scm>
Copied: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3581PluginUsesWagonDependency.java (from r660857, maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0001Test.java)
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3581PluginUsesWagonDependency.java?p2=maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3581PluginUsesWagonDependency.java&p1=maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0001Test.java&r1=660857&r2=662031&rev=662031&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0001Test.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3581PluginUsesWagonDependency.java Sat May 31 07:51:07 2008
@@ -1,28 +1,30 @@
package org.apache.maven.integrationtests;
+import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
-public class MavenIT0001Test
+public class MavenITmng3581PluginUsesWagonDependency
extends AbstractMavenIntegrationTestCase
{
+ public MavenITmng3581PluginUsesWagonDependency()
+ throws InvalidVersionSpecificationException
+ {
+ // Not 2.0.9
+ super( "(,2.0.9),(2.0.9,2.1-SNAPSHOT)" );
+ }
/**
- * Builds upon it0000: we add an application resource that is packaged
- * up in the resultant JAR.
+ * Test that a plugin using a wagon directly works
*/
- public void testit0001()
+ public void testmng3581()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0001" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3581-useWagonDependency" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.executeGoal( "package" );
- verifier.assertFilePresent( "target/classes/org/apache/maven/it0001/Person.class" );
- verifier.assertFilePresent( "target/test-classes/org/apache/maven/it0001/PersonTest.class" );
- verifier.assertFilePresent( "target/maven-it-it0001-1.0.jar" );
- verifier.assertFilePresent( "target/maven-it-it0001-1.0.jar!/it0001.properties" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3581-useWagonDependency/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3581-useWagonDependency/pom.xml?rev=662031&r1=660857&r2=662031&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3581-useWagonDependency/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng-3581-useWagonDependency/pom.xml Sat May 31 07:51:07 2008
@@ -1,26 +1,22 @@
<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.it0117</groupId>
+ <groupId>org.apache.maven.its.mng3581</groupId>
<artifactId>parent</artifactId>
<version>1.0-SNAPSHOT</version>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-uses-properties</artifactId>
+ <artifactId>maven-it-plugin-uses-wagon</artifactId>
<executions>
<execution>
<phase>validate</phase>
<goals>
- <goal>generate-properties</goal>
+ <goal>use-wagon</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
- <properties>
- <name>bastille</name>
- <occupation>sonambulist</occupation>
- </properties>
</project>