maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bentm...@apache.org
Subject svn commit: r744252 - in /maven/core-integration-testing/trunk/core-it-suite/src/test: java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java resources/mng-4034/pom.xml resources/mng-4034/sub/pom.xml
Date Fri, 13 Feb 2009 21:41:58 GMT
Author: bentmann
Date: Fri Feb 13 21:41:57 2009
New Revision: 744252

URL: http://svn.apache.org/viewvc?rev=744252&view=rev
Log:
[MNG-4034] dependency version is not inherited from parent dependencyManagement

o Extended IT to check more aspects of dependency management than just versioning

Modified:
    maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4034/pom.xml
    maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4034/sub/pom.xml

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java?rev=744252&r1=744251&r2=744252&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
Fri Feb 13 21:41:57 2009
@@ -23,6 +23,7 @@
 import org.apache.maven.it.util.ResourceExtractor;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -57,8 +58,11 @@
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
 
-        List artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" );
-        assertEquals( Collections.singletonList( "org.apache.maven.its:maven-core-it-support:jar:1.0"
), artifacts );
+        List artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" );
+        assertEquals( Arrays.asList( new String[0] ), artifacts );
+
+        artifacts = verifier.loadLines( "target/runtime.txt", "UTF-8" );
+        assertEquals( Collections.singletonList( "org.apache.maven.its:maven-core-it-support:jar:1.3"
), artifacts );
     }
 
 }

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4034/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4034/pom.xml?rev=744252&r1=744251&r2=744252&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4034/pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4034/pom.xml
Fri Feb 13 21:41:57 2009
@@ -29,8 +29,7 @@
 
   <name>Maven Integration Test :: MNG-4034</name> 
   <description>
-    Verify that dependencies defined in profiles get their version injected from the dependency
management of the
-    parent.
+    Verify that dependencies defined in profiles are subject to the dependency management
of the parent.
   </description>
 
   <modules>
@@ -42,7 +41,14 @@
       <dependency>
         <groupId>org.apache.maven.its</groupId>
         <artifactId>maven-core-it-support</artifactId>
-        <version>1.0</version>
+        <version>1.3</version>
+        <scope>runtime</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
     </dependencies>
   </dependencyManagement>

Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4034/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4034/sub/pom.xml?rev=744252&r1=744251&r2=744252&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4034/sub/pom.xml
(original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4034/sub/pom.xml
Fri Feb 13 21:41:57 2009
@@ -34,8 +34,7 @@
 
   <name>Maven Integration Test :: MNG-4034</name> 
   <description>
-    Verify that dependencies defined in profiles get their version injected from the dependency
management of the
-    parent.
+    Verify that dependencies defined in profiles are subject to the dependency management
of the parent.
   </description>
 
   <profiles>
@@ -48,7 +47,7 @@
         <dependency>
           <groupId>org.apache.maven.its</groupId>
           <artifactId>maven-core-it-support</artifactId>
-          <!-- version should be injected from dependency management of parent -->
+          <!-- version, scope and exclusions should be injected from dependency management
of parent -->
         </dependency>
       </dependencies>
       <build>
@@ -58,7 +57,8 @@
             <artifactId>maven-it-plugin-dependency-resolution</artifactId>
             <version>2.1-SNAPSHOT</version>
             <configuration>
-              <compileArtifacts>target/artifacts.txt</compileArtifacts>
+              <compileArtifacts>target/compile.txt</compileArtifacts>
+              <runtimeArtifacts>target/runtime.txt</runtimeArtifacts>
             </configuration>
             <executions>
               <execution>
@@ -66,6 +66,7 @@
                 <phase>validate</phase>
                 <goals>
                   <goal>compile</goal>
+                  <goal>runtime</goal>
                 </goals>
               </execution>
             </executions>



Mime
View raw message