You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by jd...@apache.org on 2005/07/07 01:12:47 UTC

svn commit: r209538 - in /maven/components/trunk/maven-core-it: ./ it0030/ it0030/child-hierarchy/ it0030/child-hierarchy/project1/ it0030/child-hierarchy/project2/ it0030/child-hierarchy/project2/src/ it0030/child-hierarchy/project2/src/main/ it0030/c...

Author: jdcasey
Date: Wed Jul  6 16:12:44 2005
New Revision: 209538

URL: http://svn.apache.org/viewcvs?rev=209538&view=rev
Log:
Adding IT to cover a regression on dependencyManagement injection from parent-poms of a dependency's pom.

Added:
    maven/components/trunk/maven-core-it/it0030/
    maven/components/trunk/maven-core-it/it0030/child-hierarchy/
    maven/components/trunk/maven-core-it/it0030/child-hierarchy/pom.xml   (with props)
    maven/components/trunk/maven-core-it/it0030/child-hierarchy/project1/
    maven/components/trunk/maven-core-it/it0030/child-hierarchy/project1/pom.xml   (with props)
    maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/
    maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/pom.xml   (with props)
    maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/src/
    maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/src/main/
    maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/src/main/java/
    maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/src/main/java/org/
    maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/src/main/java/org/apache/
    maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/
    maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0001/
    maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0001/Person.java   (with props)
    maven/components/trunk/maven-core-it/it0030/expected-results.txt   (with props)
    maven/components/trunk/maven-core-it/it0030/goals.txt   (with props)
    maven/components/trunk/maven-core-it/it0030/pom.xml   (with props)
    maven/components/trunk/maven-core-it/it0030/prebuild-hook.txt   (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=209538&r1=209537&r2=209538&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/README.txt (original)
+++ maven/components/trunk/maven-core-it/README.txt Wed Jul  6 16:12:44 2005
@@ -90,6 +90,9 @@
 
 it0029: Test for pluginManagement injection of plugin configuration.
 
+it0030: Test for injection of dependencyManagement through parents of 
+        dependency poms.
+
 -------------------------------------------------------------------------------
 
 - 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=209538&r1=209537&r2=209538&view=diff
==============================================================================
--- maven/components/trunk/maven-core-it/integration-tests.txt (original)
+++ maven/components/trunk/maven-core-it/integration-tests.txt Wed Jul  6 16:12:44 2005
@@ -1,4 +1,5 @@
-it0029
+#it0030
+#it0029
 it0028
 it0027
 it0026

Added: maven/components/trunk/maven-core-it/it0030/child-hierarchy/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0030/child-hierarchy/pom.xml?rev=209538&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0030/child-hierarchy/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0030/child-hierarchy/pom.xml Wed Jul  6 16:12:44 2005
@@ -0,0 +1,26 @@
+<model>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.it</groupId>
+    <artifactId>maven-core-it0030</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.maven.it</groupId>
+  <artifactId>maven-core-it0030-child-hierarchy</artifactId>
+  <packaging>pom</packaging>
+  
+  <version>1.0-SNAPSHOT</version>
+  
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  
+  <modules>
+    <module>project1</module>
+    <module>project2</module>
+  </modules>
+</model>

Propchange: maven/components/trunk/maven-core-it/it0030/child-hierarchy/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core-it/it0030/child-hierarchy/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/trunk/maven-core-it/it0030/child-hierarchy/project1/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0030/child-hierarchy/project1/pom.xml?rev=209538&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0030/child-hierarchy/project1/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0030/child-hierarchy/project1/pom.xml Wed Jul  6 16:12:44 2005
@@ -0,0 +1,13 @@
+<model>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.it</groupId>
+    <artifactId>maven-core-it0030-child-hierarchy</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.maven.it</groupId>
+  <artifactId>maven-core-it0030-child-project1</artifactId>
+  
+  <version>1.0-SNAPSHOT</version>
+  
+</model>

Propchange: maven/components/trunk/maven-core-it/it0030/child-hierarchy/project1/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core-it/it0030/child-hierarchy/project1/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/pom.xml?rev=209538&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/pom.xml Wed Jul  6 16:12:44 2005
@@ -0,0 +1,20 @@
+<model>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.it</groupId>
+    <artifactId>maven-core-it0030-child-hierarchy</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.apache.maven.it</groupId>
+  <artifactId>maven-core-it0030-child-project2</artifactId>
+  
+  <version>1.0-SNAPSHOT</version>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.it</groupId>
+      <artifactId>maven-core-it0030-child-project1</artifactId>
+    </dependency>
+  </dependencies>
+  
+</model>

Propchange: maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0001/Person.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0001/Person.java?rev=209538&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0001/Person.java (added)
+++ maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0001/Person.java Wed Jul  6 16:12:44 2005
@@ -0,0 +1,18 @@
+package org.apache.maven.it0001;
+
+public class Person
+{
+    private String name;
+
+    public void setName( String newName )
+    {
+        assert true;
+
+        this.name = newName;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+}

Propchange: maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0001/Person.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core-it/it0030/child-hierarchy/project2/src/main/java/org/apache/maven/it0001/Person.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/trunk/maven-core-it/it0030/expected-results.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0030/expected-results.txt?rev=209538&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0030/expected-results.txt (added)
+++ maven/components/trunk/maven-core-it/it0030/expected-results.txt Wed Jul  6 16:12:44 2005
@@ -0,0 +1 @@
+child-hierarchy/project2/target/classes/org/apache/maven/it0001/Person.class

Propchange: maven/components/trunk/maven-core-it/it0030/expected-results.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core-it/it0030/expected-results.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/trunk/maven-core-it/it0030/goals.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0030/goals.txt?rev=209538&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0030/goals.txt (added)
+++ maven/components/trunk/maven-core-it/it0030/goals.txt Wed Jul  6 16:12:44 2005
@@ -0,0 +1 @@
+install

Propchange: maven/components/trunk/maven-core-it/it0030/goals.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core-it/it0030/goals.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/trunk/maven-core-it/it0030/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0030/pom.xml?rev=209538&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0030/pom.xml (added)
+++ maven/components/trunk/maven-core-it/it0030/pom.xml Wed Jul  6 16:12:44 2005
@@ -0,0 +1,28 @@
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.it</groupId>
+  <artifactId>maven-core-it0030</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <description>Test for dependencyManagement injection for parent-poms of transitively resolved poms.</description>
+
+  <modules>
+    <module>child-hierarchy</module>
+  </modules>
+  
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>3.8.1</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.it</groupId>
+        <artifactId>maven-core-it0030-child-project1</artifactId>
+        <version>1.0-SNAPSHOT</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+</project>

Propchange: maven/components/trunk/maven-core-it/it0030/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core-it/it0030/pom.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/components/trunk/maven-core-it/it0030/prebuild-hook.txt
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core-it/it0030/prebuild-hook.txt?rev=209538&view=auto
==============================================================================
--- maven/components/trunk/maven-core-it/it0030/prebuild-hook.txt (added)
+++ maven/components/trunk/maven-core-it/it0030/prebuild-hook.txt Wed Jul  6 16:12:44 2005
@@ -0,0 +1,4 @@
+rm ${artifact:org.apache.maven.it:maven-core-it0030:1.0-SNAPSHOT:jar}
+rm ${artifact:org.apache.maven.it:maven-core-it0030-child-hierarchy:1.0-SNAPSHOT:jar}
+rm ${artifact:org.apache.maven.it:maven-core-it0030-child-project1:1.0-SNAPSHOT:jar}
+rm ${artifact:org.apache.maven.it:maven-core-it0030-child-project2:1.0-SNAPSHOT:jar}

Propchange: maven/components/trunk/maven-core-it/it0030/prebuild-hook.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/components/trunk/maven-core-it/it0030/prebuild-hook.txt
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org