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 2005/10/19 05:56:19 UTC
svn commit: r326365 - in /maven/components/trunk: maven-core-it-support/1.3/
maven-core-it-support/1.3/src/ maven-core-it-support/1.4/
maven-core-it-support/1.4/src/ maven-core-it/ maven-core-it/it0034/
maven-core-it/it0083/ maven-core-it/it0083/test-c...
Author: brett
Date: Tue Oct 18 20:55:43 2005
New Revision: 326365
URL: http://svn.apache.org/viewcvs?rev=326365&view=rev
Log:
PR: MNG-1233
integration test for scope handling
Added:
maven/components/trunk/maven-core-it-support/1.3/
- copied from r326000, maven/components/trunk/maven-core-it-support/1.2/
maven/components/trunk/maven-core-it-support/1.3/pom.xml
- copied, changed from r326356, maven/components/trunk/maven-core-it-support/1.2/pom.xml
maven/components/trunk/maven-core-it-support/1.3/src/
- copied from r326356, maven/components/trunk/maven-core-it-support/1.2/src/
maven/components/trunk/maven-core-it-support/1.4/
- copied from r326000, maven/components/trunk/maven-core-it-support/1.2/
maven/components/trunk/maven-core-it-support/1.4/pom.xml
- copied, changed from r326356, maven/components/trunk/maven-core-it-support/1.2/pom.xml
maven/components/trunk/maven-core-it-support/1.4/src/
- copied from r326356, maven/components/trunk/maven-core-it-support/1.2/src/
maven/components/trunk/maven-core-it/it0083/
maven/components/trunk/maven-core-it/it0083/expected-results.txt (with props)
maven/components/trunk/maven-core-it/it0083/goals.txt (with props)
maven/components/trunk/maven-core-it/it0083/pom.xml (with props)
maven/components/trunk/maven-core-it/it0083/test-component-a/
maven/components/trunk/maven-core-it/it0083/test-component-a/pom.xml (with props)
maven/components/trunk/maven-core-it/it0083/test-component-a/src/
maven/components/trunk/maven-core-it/it0083/test-component-a/src/main/
maven/components/trunk/maven-core-it/it0083/test-component-a/src/main/java/
maven/components/trunk/maven-core-it/it0083/test-component-a/src/main/java/A.java (with props)
maven/components/trunk/maven-core-it/it0083/test-component-b/
maven/components/trunk/maven-core-it/it0083/test-component-b/pom.xml (with props)
maven/components/trunk/maven-core-it/it0083/test-component-b/src/
maven/components/trunk/maven-core-it/it0083/test-component-b/src/main/
maven/components/trunk/maven-core-it/it0083/test-component-b/src/main/java/
maven/components/trunk/maven-core-it/it0083/test-component-b/src/main/java/B.java (with props)
maven/components/trunk/maven-core-it/it0083/test-component-c/
maven/components/trunk/maven-core-it/it0083/test-component-c/pom.xml (with props)
maven/components/trunk/maven-core-it/it0083/test-component-c/src/
maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/
maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/java/
maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/java/C.java (with props)
maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/webapp/
maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/webapp/WEB-INF/
maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/webapp/WEB-INF/web.xml (with props)
Modified:
maven/components/trunk/maven-core-it/README.txt
maven/components/trunk/maven-core-it/integration-tests.txt
maven/components/trunk/maven-core-it/it0034/expected-results.txt
maven/components/trunk/maven-core-it/it0034/prebuild-hook.txt
maven/components/trunk/maven-plugins/maven-source-plugin/pom.xml
Copied: maven/components/trunk/maven-core-it-support/1.3/pom.xml (from r326356, maven/components/trunk/maven-core-it-support/1.2/pom.xml)
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it-support/1.3/pom.xml?p2=maven/components/trunk/maven-core-it-support/1.3/pom.xml&p1=maven/components/trunk/maven-core-it-support/1.2/pom.xml&r1=326356&r2=326365&rev=326365&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it-support/1.2/pom.xml (original)
+++ maven/components/trunk/maven-core-it-support/1.3/pom.xml Tue Oct 18 20:55:43 2005
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core-it-support</artifactId>
- <packaging>coreit-packaging</packaging>
- <version>1.2</version>
+ <packaging>jar</packaging>
+ <version>1.3</version>
<distributionManagement>
<repository>
<id>repo1</id>
@@ -28,4 +28,11 @@
<url>http://snapshots.maven.codehaus.org/maven2/</url>
</pluginRepository>
</pluginRepositories>
+ <dependencies>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
</model>
Copied: maven/components/trunk/maven-core-it-support/1.4/pom.xml (from r326356, maven/components/trunk/maven-core-it-support/1.2/pom.xml)
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it-support/1.4/pom.xml?p2=maven/components/trunk/maven-core-it-support/1.4/pom.xml&p1=maven/components/trunk/maven-core-it-support/1.2/pom.xml&r1=326356&r2=326365&rev=326365&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it-support/1.2/pom.xml (original)
+++ maven/components/trunk/maven-core-it-support/1.4/pom.xml Tue Oct 18 20:55:43 2005
@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core-it-support</artifactId>
- <packaging>coreit-packaging</packaging>
- <version>1.2</version>
+ <packaging>jar</packaging>
+ <version>1.4</version>
<distributionManagement>
<repository>
<id>repo1</id>
@@ -28,4 +28,11 @@
<url>http://snapshots.maven.codehaus.org/maven2/</url>
</pluginRepository>
</pluginRepositories>
+ <dependencies>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
</model>
Modified: maven/components/trunk/maven-core-it/README.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/README.txt?rev=326365&r1=326364&r2=326365&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/README.txt (original)
+++ maven/components/trunk/maven-core-it/README.txt Tue Oct 18 20:55:43 2005
@@ -225,6 +225,10 @@
it0082: Test that the reactor can establish the artifact location of known projects for dependencies
using process-sources to see that it works even when they aren't compiled
+it0083: Verify that overriding a compile time dependency as provided in a WAR ensures it is not included.
+
+it0084: Verify that the collector selecting a particular version gets the correct subtree
+
-------------------------------------------------------------------------------
- generated sources
Modified: maven/components/trunk/maven-core-it/integration-tests.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/integration-tests.txt?rev=326365&r1=326364&r2=326365&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/integration-tests.txt (original)
+++ maven/components/trunk/maven-core-it/integration-tests.txt Tue Oct 18 20:55:43 2005
@@ -1,3 +1,5 @@
+it0084
+it0083
it0082
it0081
it0080
Modified: maven/components/trunk/maven-core-it/it0034/expected-results.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0034/expected-results.txt?rev=326365&r1=326364&r2=326365&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it0034/expected-results.txt (original)
+++ maven/components/trunk/maven-core-it/it0034/expected-results.txt Tue Oct 18 20:55:43 2005
@@ -1,2 +1,2 @@
${artifact:junit:junit:3.8:jar}
-${artifact:org.apache.maven:maven-core-it-support:1.2:jar}
+${artifact:org.apache.maven:maven-core-it-support:1.4:jar}
Modified: maven/components/trunk/maven-core-it/it0034/prebuild-hook.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0034/prebuild-hook.txt?rev=326365&r1=326364&r2=326365&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/it0034/prebuild-hook.txt (original)
+++ maven/components/trunk/maven-core-it/it0034/prebuild-hook.txt Tue Oct 18 20:55:43 2005
@@ -1,2 +1,2 @@
-rm ${artifact:org.apache.maven:maven-core-it-support:1.2:jar}
+rm ${artifact:org.apache.maven:maven-core-it-support:1.4:jar}
rm ${artifact:junit:junit:3.8:jar}
Added: maven/components/trunk/maven-core-it/it0083/expected-results.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0083/expected-results.txt?rev=326365&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0083/expected-results.txt (added)
+++ maven/components/trunk/maven-core-it/it0083/expected-results.txt Tue Oct 18 20:55:43 2005
@@ -0,0 +1,6 @@
+test-component-a/target/test-component-a-0.1.jar
+test-component-b/target/test-component-b-0.1.jar
+test-component-c/target/test-component-c-0.1.war
+test-component-c/target/test-component-c-0.1.war!/WEB-INF/lib/test-component-b-0.1.jar
+!test-component-c/target/test-component-c-0.1/WEB-INF/lib/test-component-a-0.1.jar
+test-component-c/target/test-component-c-0.1/WEB-INF/lib/test-component-b-0.1.jar
Propchange: maven/components/trunk/maven-core-it/it0083/expected-results.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0083/expected-results.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0083/goals.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0083/goals.txt?rev=326365&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0083/goals.txt (added)
+++ maven/components/trunk/maven-core-it/it0083/goals.txt Tue Oct 18 20:55:43 2005
@@ -0,0 +1 @@
+package
Propchange: maven/components/trunk/maven-core-it/it0083/goals.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0083/goals.txt
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0083/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0083/pom.xml?rev=326365&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0083/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0083/pom.xml Tue Oct 18 20:55:43 2005
@@ -0,0 +1,14 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>test</groupId>
+ <artifactId>test-components</artifactId>
+ <version>0.1</version>
+ <name>Test Components</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>test-component-c</module>
+ <module>test-component-b</module>
+ <module>test-component-a</module>
+ </modules>
+</project>
Propchange: maven/components/trunk/maven-core-it/it0083/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0083/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0083/test-component-a/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0083/test-component-a/pom.xml?rev=326365&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0083/test-component-a/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0083/test-component-a/pom.xml Tue Oct 18 20:55:43 2005
@@ -0,0 +1,14 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>test-components</artifactId>
+ <groupId>test</groupId>
+ <version>0.1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>test-component-a</artifactId>
+ <version>0.1</version>
+ <name>Test Component A</name>
+ <packaging>jar</packaging>
+</project>
Propchange: maven/components/trunk/maven-core-it/it0083/test-component-a/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0083/test-component-a/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0083/test-component-a/src/main/java/A.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0083/test-component-a/src/main/java/A.java?rev=326365&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0083/test-component-a/src/main/java/A.java (added)
+++ maven/components/trunk/maven-core-it/it0083/test-component-a/src/main/java/A.java Tue Oct 18 20:55:43 2005
@@ -0,0 +1,3 @@
+public class A {
+}
+
Propchange: maven/components/trunk/maven-core-it/it0083/test-component-a/src/main/java/A.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0083/test-component-a/src/main/java/A.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0083/test-component-b/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0083/test-component-b/pom.xml?rev=326365&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0083/test-component-b/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0083/test-component-b/pom.xml Tue Oct 18 20:55:43 2005
@@ -0,0 +1,22 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>test-components</artifactId>
+ <groupId>test</groupId>
+ <version>0.1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>test-component-b</artifactId>
+ <version>0.1</version>
+ <name>Test Component B</name>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>test-component-a</artifactId>
+ <version>0.1</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/components/trunk/maven-core-it/it0083/test-component-b/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0083/test-component-b/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0083/test-component-b/src/main/java/B.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0083/test-component-b/src/main/java/B.java?rev=326365&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0083/test-component-b/src/main/java/B.java (added)
+++ maven/components/trunk/maven-core-it/it0083/test-component-b/src/main/java/B.java Tue Oct 18 20:55:43 2005
@@ -0,0 +1,5 @@
+public class B
+ extends A
+{
+}
+
Propchange: maven/components/trunk/maven-core-it/it0083/test-component-b/src/main/java/B.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0083/test-component-b/src/main/java/B.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0083/test-component-c/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0083/test-component-c/pom.xml?rev=326365&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0083/test-component-c/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0083/test-component-c/pom.xml Tue Oct 18 20:55:43 2005
@@ -0,0 +1,29 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>test-components</artifactId>
+ <groupId>test</groupId>
+ <version>0.1</version>
+ </parent>
+
+ <groupId>test</groupId>
+ <artifactId>test-component-c</artifactId>
+ <version>0.1</version>
+ <name>Test Component C</name>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>test-component-b</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>test</groupId>
+ <artifactId>test-component-a</artifactId>
+ <version>0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: maven/components/trunk/maven-core-it/it0083/test-component-c/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0083/test-component-c/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/java/C.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/java/C.java?rev=326365&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/java/C.java (added)
+++ maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/java/C.java Tue Oct 18 20:55:43 2005
@@ -0,0 +1,5 @@
+public class C
+ extends A
+{
+}
+
Propchange: maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/java/C.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/java/C.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/webapp/WEB-INF/web.xml?rev=326365&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/webapp/WEB-INF/web.xml (added)
+++ maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/webapp/WEB-INF/web.xml Tue Oct 18 20:55:43 2005
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app >
+</web-app>
Propchange: maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core-it/it0083/test-component-c/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/components/trunk/maven-plugins/maven-source-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-source-plugin/pom.xml?rev=326365&r1=326364&r2=326365&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-source-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-source-plugin/pom.xml Tue Oct 18 20:55:43 2005
@@ -8,7 +8,7 @@
<artifactId>maven-source-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Source Plug-In</name>
- <version>2.1-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
@@ -22,7 +22,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>