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 2007/10/29 02:24:30 UTC
svn commit: r589460 - in
/maven/core-integration-testing/trunk/core-integration-tests/src/test:
java/org/apache/maven/integrationtests/ resources/mng2277aggregatorPlugins/
resources/mng2277aggregatorPlugins/assembly/
resources/mng2277aggregatorPlugins/...
Author: brianf
Date: Sun Oct 28 18:24:29 2007
New Revision: 589460
URL: http://svn.apache.org/viewvc?rev=589460&view=rev
Log:
IT for MNG-2277
Added:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/assembly/ (with props)
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/assembly/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/mvn
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/readme.txt
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/pom.xml
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/src/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/src/main/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/src/main/java/
maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/src/main/java/Class.java
Modified:
maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=589460&r1=589459&r2=589460&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Sun Oct 28 18:24:29 2007
@@ -141,7 +141,7 @@
suite.addTestSuite( MavenIT0087Test.class );
suite.addTestSuite( MavenIT0088Test.class );
suite.addTestSuite( MavenIT0089Test.class );
- suite.addTestSuite(MavenIT0090Test.class);
+ suite.addTestSuite( MavenIT0090Test.class);
suite.addTestSuite( MavenIT0092Test.class );
suite.addTestSuite( MavenIT0094Test.class );
suite.addTestSuite( MavenIT0095Test.class );
@@ -162,6 +162,7 @@
suite.addTestSuite( MavenITmng2254PomEncodingTest.class);
suite.addTestSuite( MavenIT0129ResourceProvidedToAPluginAsAPluginDependency.class );
suite.addTestSuite( MavenITmng2045testJarDependenciesBrokenInReactorTest.class);
+ suite.addTestSuite( MavenITmng2277AggregatorAndResolutionPluginsTest.class);
// ----------------------------------------------------------------------------------------------------
// Tests that need to be fixed.
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java?rev=589460&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng2277AggregatorAndResolutionPluginsTest.java Sun Oct 28 18:24:29 2007
@@ -0,0 +1,53 @@
+package org.apache.maven.integrationtests;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.maven.integrationtests.AbstractMavenIntegrationTestCase;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
+/**
+ * @author <a href="mailto:brianf@apache.org">Brian Fox</a>
+ *
+ */
+public class MavenITmng2277AggregatorAndResolutionPluginsTest
+ extends AbstractMavenIntegrationTestCase
+{
+ public void testitMNG2277 ()
+ throws Exception
+ {
+
+ // The testdir is computed from the location of this
+ // file.
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng2277aggregatorPlugins" );
+
+ Verifier verifier;
+
+ /*
+ * We must first make sure that any artifact created
+ * by this test has been removed from the local
+ * repository. Failing to do this could cause
+ * unstable test results. Fortunately, the verifier
+ * makes it easy to do this.
+ */
+ verifier = new Verifier( testDir.getAbsolutePath() );
+ verifier.deleteArtifact( "org.apache.maven.its.mng2277", "parent", "1.0", "pom" );
+ verifier.deleteArtifact( "org.apache.maven.its.mng2277", "test", "1.0", "jar" );
+ verifier.deleteArtifact( "org.apache.maven.its.mng2277", "assembly", "1.0", "jar" );
+
+ /*
+ * The Command Line Options (CLI) are passed to the
+ * verifier as a list. This is handy for things like
+ * redefining the local repository if needed. In
+ * this case, we use the -N flag so that Maven won't
+ * recurse. We are only installing the parent pom to
+ * the local repo here.
+ */
+ List cliOptions = new ArrayList();
+ verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-all:aggregator-dependencies" );
+
+ verifier.verifyErrorFreeLog();
+ }
+}
Propchange: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/assembly/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 28 18:24:29 2007
@@ -0,0 +1 @@
+target
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/assembly/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/assembly/pom.xml?rev=589460&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/assembly/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/assembly/pom.xml Sun Oct 28 18:24:29 2007
@@ -0,0 +1,12 @@
+<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>
+ <parent>
+ <groupId>org.apache.maven.its.mng2277</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ </parent>
+ <name>assembly</name>
+ <artifactId>assembly</artifactId>
+ <version>1.0</version>
+</project>
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/mvn
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/mvn?rev=589460&view=auto
==============================================================================
(empty)
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/pom.xml?rev=589460&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/pom.xml Sun Oct 28 18:24:29 2007
@@ -0,0 +1,13 @@
+<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.mng2277</groupId>
+ <artifactId>parent</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0</version>
+ <name>MNG-2277</name>
+
+ <modules>
+ <module>assembly</module>
+ <module>test</module>
+ </modules>
+</project>
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/readme.txt
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/readme.txt?rev=589460&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/readme.txt (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/readme.txt Sun Oct 28 18:24:29 2007
@@ -0,0 +1,2 @@
+This test checks that Maven doesn't crash when a plugin that has both @aggregator and @requiresDependencyResolution is run on a new project with sibling dependencies.
+See MNG-2277
\ No newline at end of file
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/pom.xml?rev=589460&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/pom.xml (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/pom.xml Sun Oct 28 18:24:29 2007
@@ -0,0 +1,17 @@
+<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>
+ <parent>
+ <groupId>org.apache.maven.its.mng2277</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0</version>
+ </parent>
+ <artifactId>test</artifactId>
+ <name>Test</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.mng2277</groupId>
+ <artifactId>assembly</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+</project>
Added: maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/src/main/java/Class.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/src/main/java/Class.java?rev=589460&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/src/main/java/Class.java (added)
+++ maven/core-integration-testing/trunk/core-integration-tests/src/test/resources/mng2277aggregatorPlugins/test/src/main/java/Class.java Sun Oct 28 18:24:29 2007
@@ -0,0 +1,9 @@
+public class Class
+{
+
+public static void main(String[] args)
+{
+ System.out.println("hello");
+ }
+
+}
\ No newline at end of file