-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
I can also add a unit test, but this scenario is tricky with multiple
levels of things that could go wrong, and I want to make sure it always
works.
- -j
Brett Porter wrote:
| I was really hoping for a unit test on this instead. There is a suite
| there already....
|
|
| [EMAIL PROTECTED] wrote:
|
|> Author: jdcasey
|> Date: Thu Nov 3 17:39:23 2005
|> New Revision: 330681
|>
|> URL: http://svn.apache.org/viewcvs?rev=330681&view=rev
|> Log:
|> Adding test case for preserving system scope on transitively resolved
|> deps.
|>
|> Added:
|> maven/components/trunk/maven-core-it/it0085/
|> maven/components/trunk/maven-core-it/it0085/dep/
|> maven/components/trunk/maven-core-it/it0085/dep/pom.xml (with
|> props)
|> maven/components/trunk/maven-core-it/it0085/expected-results.txt
|> (with props)
|> maven/components/trunk/maven-core-it/it0085/goals.txt (with props)
|> maven/components/trunk/maven-core-it/it0085/pom.xml (with props)
|> maven/components/trunk/maven-core-it/it0085/war/
|> maven/components/trunk/maven-core-it/it0085/war/pom.xml (with
|> props)
|> maven/components/trunk/maven-core-it/it0085/war/src/
|> maven/components/trunk/maven-core-it/it0085/war/src/main/
|> maven/components/trunk/maven-core-it/it0085/war/src/main/webapp/
|>
|> maven/components/trunk/maven-core-it/it0085/war/src/main/webapp/WEB-INF/
|>
|>
maven/components/trunk/maven-core-it/it0085/war/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
|>
|> Modified: maven/components/trunk/maven-core-it/README.txt
|> URL:
|>
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/README.txt?rev=330681&r1=330680&r2=330681&view=diff
|>
|>
==============================================================================
|>
|> --- maven/components/trunk/maven-core-it/README.txt (original)
|> +++ maven/components/trunk/maven-core-it/README.txt Thu Nov 3
|> 17:39:23 2005
|> @@ -229,6 +229,11 @@
|>
|> it0084: Verify that the collector selecting a particular version gets
|> the correct subtree
|>
|> +it0085: Verify that system-scoped dependencies get resolved with
|> system scope
|> + when they are resolved transitively via another (non-system)
|> + dependency. Inherited scope should not apply in the case of
|> + system-scoped dependencies, no matter where they are.
|> +
|>
-
-------------------------------------------------------------------------------
|>
|>
|> - 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=330681&r1=330680&r2=330681&view=diff
|>
|>
==============================================================================
|>
|> --- maven/components/trunk/maven-core-it/integration-tests.txt (original)
|> +++ maven/components/trunk/maven-core-it/integration-tests.txt Thu
|> Nov 3 17:39:23 2005
|> @@ -1,3 +1,4 @@
|> +it0085
|> it0084
|> it0083
|> it0082
|>
|> Added: maven/components/trunk/maven-core-it/it0085/dep/pom.xml
|> URL:
|>
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0085/dep/pom.xml?rev=330681&view=auto
|>
|>
==============================================================================
|>
|> --- maven/components/trunk/maven-core-it/it0085/dep/pom.xml (added)
|> +++ maven/components/trunk/maven-core-it/it0085/dep/pom.xml Thu Nov 3
|> 17:39:23 2005
|> @@ -0,0 +1,16 @@
|> +<project>
|> + <modelVersion>4.0.0</modelVersion>
|> + <parent>
|> + <groupId>org.apache.maven.it</groupId>
|> + <artifactId>it0085-parent</artifactId>
|> + <version>1.0</version>
|> + </parent>
|> + <artifactId>it0085-dep</artifactId>
|> +
|> + <dependencies>
|> + <dependency>
|> + <groupId>org.apache.maven.it</groupId>
|> + <artifactId>pom-dep</artifactId>
|> + </dependency>
|> + </dependencies>
|> +</project>
|>
|> Propchange: maven/components/trunk/maven-core-it/it0085/dep/pom.xml
|>
-
------------------------------------------------------------------------------
|>
|> svn:eol-style = native
|>
|> Propchange: maven/components/trunk/maven-core-it/it0085/dep/pom.xml
|>
-
------------------------------------------------------------------------------
|>
|> svn:keywords = "Author Date Id Revision"
|>
|> Added: maven/components/trunk/maven-core-it/it0085/expected-results.txt
|> URL:
|>
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0085/expected-results.txt?rev=330681&view=auto
|>
|>
==============================================================================
|>
|> --- maven/components/trunk/maven-core-it/it0085/expected-results.txt
|> (added)
|> +++ maven/components/trunk/maven-core-it/it0085/expected-results.txt
|> Thu Nov 3 17:39:23 2005
|> @@ -0,0 +1,3 @@
|> +!war/target/it0085-war-1.0/WEB-INF/lib/pom.xml
|> +!war/target/it0085-war-1.0/WEB-INF/lib/it0085-dep-1.0.jar
|> +war/target/it0085-war-1.0/WEB-INF/lib/junit-3.8.1.jar
|>
|> Propchange:
|> maven/components/trunk/maven-core-it/it0085/expected-results.txt
|>
-
------------------------------------------------------------------------------
|>
|> svn:eol-style = native
|>
|> Propchange:
|> maven/components/trunk/maven-core-it/it0085/expected-results.txt
|>
-
------------------------------------------------------------------------------
|>
|> svn:keywords = "Author Date Id Revision"
|>
|> Added: maven/components/trunk/maven-core-it/it0085/goals.txt
|> URL:
|>
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0085/goals.txt?rev=330681&view=auto
|>
|>
==============================================================================
|>
|> --- maven/components/trunk/maven-core-it/it0085/goals.txt (added)
|> +++ maven/components/trunk/maven-core-it/it0085/goals.txt Thu Nov 3
|> 17:39:23 2005
|> @@ -0,0 +1 @@
|> +package
|>
|> Propchange: maven/components/trunk/maven-core-it/it0085/goals.txt
|>
-
------------------------------------------------------------------------------
|>
|> svn:eol-style = native
|>
|> Propchange: maven/components/trunk/maven-core-it/it0085/goals.txt
|>
-
------------------------------------------------------------------------------
|>
|> svn:keywords = "Author Date Id Revision"
|>
|> Added: maven/components/trunk/maven-core-it/it0085/pom.xml
|> URL:
|>
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0085/pom.xml?rev=330681&view=auto
|>
|>
==============================================================================
|>
|> --- maven/components/trunk/maven-core-it/it0085/pom.xml (added)
|> +++ maven/components/trunk/maven-core-it/it0085/pom.xml Thu Nov 3
|> 17:39:23 2005
|> @@ -0,0 +1,24 @@
|> +<project>
|> + <modelVersion>4.0.0</modelVersion>
|> + <groupId>org.apache.maven.it</groupId>
|> + <artifactId>it0085-parent</artifactId>
|> + <version>1.0</version>
|> + <packaging>pom</packaging>
|> +
|> + <modules>
|> + <module>dep</module>
|> + <module>war</module>
|> + </modules>
|> +
|> + <dependencyManagement>
|> + <dependencies>
|> + <dependency>
|> + <groupId>org.apache.maven.it</groupId>
|> + <artifactId>pom-dep</artifactId>
|> + <version>1.4.2</version>
|> + <scope>system</scope>
|> + <systemPath>${basedir}/pom.xml</systemPath>
|> + </dependency>
|> + </dependencies>
|> + </dependencyManagement>
|> +</project>
|>
|> Propchange: maven/components/trunk/maven-core-it/it0085/pom.xml
|>
-
------------------------------------------------------------------------------
|>
|> svn:eol-style = native
|>
|> Propchange: maven/components/trunk/maven-core-it/it0085/pom.xml
|>
-
------------------------------------------------------------------------------
|>
|> svn:keywords = "Author Date Id Revision"
|>
|> Added: maven/components/trunk/maven-core-it/it0085/war/pom.xml
|> URL:
|>
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0085/war/pom.xml?rev=330681&view=auto
|>
|>
==============================================================================
|>
|> --- maven/components/trunk/maven-core-it/it0085/war/pom.xml (added)
|> +++ maven/components/trunk/maven-core-it/it0085/war/pom.xml Thu Nov 3
|> 17:39:23 2005
|> @@ -0,0 +1,24 @@
|> +<project>
|> + <modelVersion>4.0.0</modelVersion>
|> + <parent>
|> + <groupId>org.apache.maven.it</groupId>
|> + <artifactId>it0085-parent</artifactId>
|> + <version>1.0</version>
|> + </parent>
|> + <artifactId>it0085-war</artifactId>
|> + <packaging>war</packaging>
|> +
|> + <dependencies>
|> + <dependency>
|> + <groupId>junit</groupId>
|> + <artifactId>junit</artifactId>
|> + <version>3.8.1</version>
|> + </dependency>
|> + <dependency>
|> + <groupId>org.apache.maven.it</groupId>
|> + <artifactId>it0085-dep</artifactId>
|> + <version>1.0</version>
|> + <scope>provided</scope>
|> + </dependency>
|> + </dependencies>
|> +</project>
|>
|> Propchange: maven/components/trunk/maven-core-it/it0085/war/pom.xml
|>
-
------------------------------------------------------------------------------
|>
|> svn:eol-style = native
|>
|> Propchange: maven/components/trunk/maven-core-it/it0085/war/pom.xml
|>
-
------------------------------------------------------------------------------
|>
|> svn:keywords = "Author Date Id Revision"
|>
|> Added:
|>
maven/components/trunk/maven-core-it/it0085/war/src/main/webapp/WEB-INF/web.xml
|>
|> URL:
|>
http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0085/war/src/main/webapp/WEB-INF/web.xml?rev=330681&view=auto
|>
|>
==============================================================================
|>
|> ---
|>
maven/components/trunk/maven-core-it/it0085/war/src/main/webapp/WEB-INF/web.xml
|> (added)
|> +++
|>
maven/components/trunk/maven-core-it/it0085/war/src/main/webapp/WEB-INF/web.xml
|> Thu Nov 3 17:39:23 2005
|> @@ -0,0 +1,2 @@
|> +<web-xml>
|> +</web-xml>
|>
|> Propchange:
|>
maven/components/trunk/maven-core-it/it0085/war/src/main/webapp/WEB-INF/web.xml
|>
|>
-
------------------------------------------------------------------------------
|>
|> svn:eol-style = native
|>
|> Propchange:
|>
maven/components/trunk/maven-core-it/it0085/war/src/main/webapp/WEB-INF/web.xml
|>
|>
-
------------------------------------------------------------------------------
|>
|> svn:keywords = "Author Date Id Revision"
|>
|>
|
| ---------------------------------------------------------------------
| To unsubscribe, e-mail: [EMAIL PROTECTED]
| For additional commands, e-mail: [EMAIL PROTECTED]
|
|
|
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
iD8DBQFDa3V7K3h2CZwO/4URAupYAJ4t5OJxtKuEKIlyj3nJ2jrIEq6pMgCfTS8f
ngOIdiINteWJ59YqunUSQf8=
=dhN5
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
