svn commit: r756964 - in /maven/components/trunk/maven-project/src: main/java/org/apache/maven/project/processor/ test/java/org/apache/maven/project/

[bentmann]

Author: bentmann
Date: Sat Mar 21 16:23:09 2009
New Revision: 756964

URL: http://svn.apache.org/viewvc?rev=756964&view=rev
Log:
o Fixed dependency processing

Modified:
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java
    
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java
    
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java?rev=756964&r1=756963&r2=756964&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyManagementProcessor.java
 Sat Mar 21 16:23:09 2009
@@ -96,6 +96,8 @@
                 }
             }
         }
+
+        targetDependency.setOptional( dependency.isOptional() );
     }
 
     private static boolean containsExclusion( Exclusion exclusion, 
List<Exclusion> exclusions )

Modified: 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java?rev=756964&r1=756963&r2=756964&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java
 (original)
+++ 
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/DependencyProcessor.java
 Sat Mar 21 16:23:09 2009
@@ -164,6 +164,8 @@
                 }
             }
         }
+
+        targetDependency.setOptional( source.isOptional() );
     }
 
     private static boolean containsExclusion( Exclusion exclusion, 
List<Exclusion> exclusions )

Modified: 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=756964&r1=756963&r2=756964&view=diff
==============================================================================
--- 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
 (original)
+++ 
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
 Sat Mar 21 16:23:09 2009
@@ -1046,6 +1046,36 @@
         assertEquals( "reloc-aid", pom.getValue( 
"distributionManagement/relocation/artifactId" ) );
         assertEquals( "reloc-version", pom.getValue( 
"distributionManagement/relocation/version" ) );
         assertEquals( "project-reloc-msg", pom.getValue( 
"distributionManagement/relocation/message" ) );
+
+        assertEquals( 1, ( (List<?>) pom.getValue( "modules" ) ).size() );
+        assertEquals( "sub", pom.getValue( "modules[1]" ) );
+
+        assertEquals( 1, ( (Map<?, ?>) pom.getValue( "properties" ) ).size() );
+        assertEquals( "project-property", pom.getValue( 
"properties[1]/itProperty" ) );
+
+        assertEquals( 1, ( (List<?>) pom.getValue( 
"dependencyManagement/dependencies" ) ).size() );
+        assertEquals( "org.apache.maven.its", pom.getValue( 
"dependencyManagement/dependencies[1]/groupId" ) );
+        assertEquals( "managed-dep", pom.getValue( 
"dependencyManagement/dependencies[1]/artifactId" ) );
+        assertEquals( "0.1", pom.getValue( 
"dependencyManagement/dependencies[1]/version" ) );
+        assertEquals( "war", pom.getValue( 
"dependencyManagement/dependencies[1]/type" ) );
+        assertEquals( "runtime", pom.getValue( 
"dependencyManagement/dependencies[1]/scope" ) );
+        assertEquals( Boolean.FALSE, pom.getValue( 
"dependencyManagement/dependencies[1]/optional" ) );
+        assertEquals( 1, ( (List<?>) pom.getValue( 
"dependencyManagement/dependencies[1]/exclusions" ) ).size() );
+        assertEquals( "org.apache.maven.its",
+                      pom.getValue( 
"dependencyManagement/dependencies[1]/exclusions[1]/groupId" ) );
+        assertEquals( "excluded-managed-dep",
+                      pom.getValue( 
"dependencyManagement/dependencies[1]/exclusions[1]/artifactId" ) );
+
+        assertEquals( 1, ( (List<?>) pom.getValue( "dependencies" ) ).size() );
+        assertEquals( "org.apache.maven.its", pom.getValue( 
"dependencies[1]/groupId" ) );
+        assertEquals( "dep", pom.getValue( "dependencies[1]/artifactId" ) );
+        assertEquals( "0.2", pom.getValue( "dependencies[1]/version" ) );
+        assertEquals( "ejb", pom.getValue( "dependencies[1]/type" ) );
+        assertEquals( "test", pom.getValue( "dependencies[1]/scope" ) );
+        assertEquals( Boolean.TRUE, pom.getValue( "dependencies[1]/optional" ) 
);
+        assertEquals( 1, ( (List<?>) pom.getValue( 
"dependencies[1]/exclusions" ) ).size() );
+        assertEquals( "org.apache.maven.its", pom.getValue( 
"dependencies[1]/exclusions[1]/groupId" ) );
+        assertEquals( "excluded-dep", pom.getValue( 
"dependencies[1]/exclusions[1]/artifactId" ) );
     }