ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gscok...@apache.org
Subject svn commit: r606458 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java test/java/org/apache/ivy/core/resolve/ResolveTest.java
Date Sat, 22 Dec 2007 15:01:55 GMT
Author: gscokart
Date: Sat Dec 22 07:01:54 2007
New Revision: 606458

URL: http://svn.apache.org/viewvc?rev=606458&view=rev
Log:
FIX: Maven test scope includes all runtime dependencies (IVY-682)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
    ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=606458&r1=606457&r2=606458&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Sat Dec 22 07:01:54 2007
@@ -67,7 +67,7 @@
 - FIX: latest compatible conflict manager fails with circular dependencies and dynamic revision
(IVY-663)
 - FIX: Strict conflictmanager seems to not support dynamic revisions (IVY-474)
 - FIX: NPE in namespace transformation during the ivy:findrevision and ivy:resolve task execution
(IVY-659) (thanks to Andrea Bernardo Ciddio)
-
+- FIX: Maven test scope includes all runtime dependencies (IVY-682)
 
    2.0.0-beta1
 =====================================

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java?rev=606458&r1=606457&r2=606458&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorParser.java
Sat Dec 22 07:01:54 2007
@@ -109,7 +109,7 @@
                     "this scope indicates that the dependency is not required for normal
use of "
                     + "the application, and is only available for the test compilation and
"
                     + "execution phases.",
-                    new String[0], true, null),
+                    new String[] {"runtime"}, true, null),
             new Configuration(
                     "system",
                     Visibility.PUBLIC,
@@ -364,7 +364,13 @@
                     Message.verbose("Relocated module will be considered as a dependency");
                     dd = new DefaultDependencyDescriptor(md, relocationeModuleRev,
                         true, false, true);
-                    dd.addDependencyConfiguration("*", "@");
+                    /*Map all public dependencies */
+                    dd.addDependencyConfiguration("compile","compile");
+                    dd.addDependencyConfiguration("runtime","runtime");
+                    dd.addDependencyConfiguration("default","default");
+                    dd.addDependencyConfiguration("master","master");
+                    dd.addDependencyConfiguration("provided","provided");
+                    dd.addDependencyConfiguration("system","system");
                     md.addDependency(dd);
                     dd = null;
                 }

Modified: ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java?rev=606458&r1=606457&r2=606458&view=diff
==============================================================================
--- ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java (original)
+++ ant/ivy/core/trunk/test/java/org/apache/ivy/core/resolve/ResolveTest.java Sat Dec 22 07:01:54
2007
@@ -2953,7 +2953,7 @@
         ivy.configure(new File("test/repositories/m2/ivysettings.xml"));
         ResolveReport report = ivy.resolve(new File(
                 "test/repositories/m2/org/apache/test3/1.0/test3-1.0.pom").toURL(),
-            getResolveOptions(new String[] {"*"}));
+            getResolveOptions(new String[] {"test"}));
         assertNotNull(report);
         ModuleDescriptor md = report.getModuleDescriptor();
         assertNotNull(md);
@@ -2971,7 +2971,7 @@
         assertTrue(ivy.getCacheManager(cache).getIvyFileInCache(
             ModuleRevisionId.newInstance("org.apache", "test", "1.0")).exists());
         assertTrue(TestHelper.getArchiveFileInCache(ivy, cache, "org.apache", "test", "1.0",
-            "test", "jar", "jar").exists());
+            "test", "jar", "jar").exists());        
     }
 
     public void testResolveMaven2RelocationOfGroupId() throws Exception {



Mime
View raw message