Index: test/java/org/apache/ivy/core/resolve/ResolveTest.java
===================================================================
--- test/java/org/apache/ivy/core/resolve/ResolveTest.java	(revision 1042299)
+++ test/java/org/apache/ivy/core/resolve/ResolveTest.java	(working copy)
@@ -86,14 +86,19 @@
     }
 
     protected void setUp() throws Exception {
+
         cache = new File("build/cache");
+        CacheCleaner.deleteDir(cache);
+
         System.setProperty("ivy.cache.dir", cache.getAbsolutePath());
         createCache();
-        
+
         deliverDir = new File("build/test/deliver");
+        FileUtil.forceDelete(deliverDir);
         deliverDir.mkdirs();
 
         workDir = new File("build/test/work");
+        FileUtil.forceDelete(workDir);
         workDir.mkdirs();
 
         ivy = Ivy.newInstance();
@@ -104,12 +109,6 @@
         cache.mkdirs();
     }
 
-    protected void tearDown() throws Exception {
-        CacheCleaner.deleteDir(cache);
-        FileUtil.forceDelete(deliverDir);
-        FileUtil.forceDelete(workDir);
-    }
-
     public void testResolveWithRetainingArtifactName() throws Exception {
         ((DefaultRepositoryCacheManager) ivy.getSettings().getDefaultRepositoryCacheManager())
                 .setArtifactPattern(ivy.substitute("[module]/[originalname].[ext]"));
@@ -4196,6 +4195,7 @@
 
     public void testResolveMaven2GetSources() throws Exception {
         Ivy ivy = new Ivy();
+
         ivy.configure(new File("test/repositories/m2/ivysettings.xml").toURL());
         ResolveReport report = ivy.resolve(
             ResolveTest.class.getResource("ivy-m2-with-sources.xml"), 
@@ -4237,7 +4237,7 @@
 
     public void testResolveMaven2GetSourcesAndJavadocAuto() throws Exception {
         Ivy ivy = new Ivy();
-        ivy.configure(new File("test/repositories/m2/ivysettings.xml").toURL());
+        ivy.configure(new File("./test/repositories/m2/ivysettings.xml").toURL());
         ResolveReport report = ivy.resolve(
             ResolveTest.class.getResource("ivy-m2-with-sources-and-javadoc-auto.xml"), 
             getResolveOptions(new String[] {"*"}));
@@ -4259,6 +4259,7 @@
         assertTrue(jarFileInCache.length() != javadocFileInCache.length());
     }
 
+
     public void testResolveMaven2WithVersionProperty() throws Exception {
         Ivy ivy = new Ivy();
         ivy.configure(new File("test/repositories/m2/ivysettings.xml").toURL());
@@ -5293,4 +5294,17 @@
         report = ivy.resolve(url, option);
         assertFalse(report.hasError());
     }
+
+    public void testResolveMaven2TransitiveFromChildThatHasParentWithTwoDependencyManagementScopes() throws Exception {
+        Ivy ivy = new Ivy();
+        ivy.configure(new File("test/repositories/m2/ivysettings.xml").toURL());
+
+        ResolveReport report = ivy.resolve(
+            ResolveTest.class.getResource("ivy-m2-with-dependency-management.xml"),
+            getResolveOptions(new String[] {"*"}));
+        assertNotNull(report);
+        assertFalse(report.hasError());
+        final ConfigurationResolveReport testConfigurationReport = report.getConfigurationReport("default");
+        assertNotNull(testConfigurationReport.getDependency(ModuleRevisionId.newInstance("org.apache.test-multiple-dependency-management-scopes", "transitive", "1.0")));
+    }
 }
Index: test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/child/1.0/child-1.0.pom
===================================================================
--- test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/child/1.0/child-1.0.pom	(revision 0)
+++ test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/child/1.0/child-1.0.pom	(revision 0)
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.test-multiple-dependency-management-scopes</groupId>
+    <artifactId>child</artifactId>
+    <version>1.0</version>
+    <parent>
+        <groupId>org.apache.test-multiple-dependency-management-scopes</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.0</version>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.test-multiple-dependency-management-scopes</groupId>
+            <artifactId>transitive</artifactId>
+        </dependency>
+    </dependencies>
+</project>
Index: test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/child/1.0/child-1.0.jar
===================================================================
--- test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/child/1.0/child-1.0.jar	(revision 0)
+++ test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/child/1.0/child-1.0.jar	(revision 0)
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.test-multiple-dependency-management-scopes</groupId>
+    <artifactId>direct</artifactId>
+    <name>Test Module for Ivy M2 parsing</name>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <url>http://ant.apache.org/ivy</url>
+    <organization>
+        <name>Jayasoft</name>
+        <url>http://www.apache.org/</url>
+    </organization>
+    <parent>
+        <groupId>org.apache.test-multiple-dependency-management-scopes</groupId>
+        <artifactId>parent</artifactId>
+        <version>1.0</version>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.test-multiple-dependency-management-scopes</groupId>
+            <artifactId>transitive</artifactId>
+        </dependency>
+    </dependencies>
+</project>
Index: test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/transitive/1.0/transitive-1.0.jar
===================================================================
--- test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/transitive/1.0/transitive-1.0.jar	(revision 0)
+++ test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/transitive/1.0/transitive-1.0.jar	(revision 0)
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.test-multiple-dependency-management-scopes</groupId>
+  <artifactId>transitive</artifactId>
+  <name>Test Module for Ivy M2 parsing</name>
+  <version>1.0</version>
+  <packaging>jar</packaging>
+  <url>http://ant.apache.org/ivy</url>
+  <organization>
+    <name>Jayasoft</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+</project>
Index: test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/transitive/1.0/transitive-1.0.pom
===================================================================
--- test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/transitive/1.0/transitive-1.0.pom	(revision 0)
+++ test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/transitive/1.0/transitive-1.0.pom	(revision 0)
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.test-multiple-dependency-management-scopes</groupId>
+  <artifactId>transitive</artifactId>
+  <version>1.0</version>
+</project>
Index: test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/parent/1.0/parent-1.0.pom
===================================================================
--- test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/parent/1.0/parent-1.0.pom	(revision 0)
+++ test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/parent/1.0/parent-1.0.pom	(revision 0)
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.test-multiple-dependency-management-scopes</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0</version>
+    <packaging>pom</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.test-multiple-dependency-management-scopes</groupId>
+                <artifactId>transitive</artifactId>
+                <version>1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.test-multiple-dependency-management-scopes</groupId>
+                <artifactId>transitive</artifactId>
+                <version>1.0</version>
+                <type>test-jar</type>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
Index: test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/parent/1.0/parent-1.0.jar
===================================================================
--- test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/parent/1.0/parent-1.0.jar	(revision 0)
+++ test/repositories/m2/org/apache/test-multiple-dependency-management-scopes/parent/1.0/parent-1.0.jar	(revision 0)
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.test-multiple-dependency-management-scopes</groupId>
+  <artifactId>parent</artifactId>
+  <name>Test Module for Ivy M2 parsing</name>
+  <version>1.0</version>
+  <packaging>pom</packaging>
+  <url>http://ant.apache.org/ivy</url>
+  <organization>
+    <name>Jayasoft</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.test-multiple-dependency-management-scopes</groupId>
+                <artifactId>transitive</artifactId>
+                <version>1.0</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
Index: test/repositories/m2/ivysettings.xml
===================================================================
--- test/repositories/m2/ivysettings.xml	(revision 1042299)
+++ test/repositories/m2/ivysettings.xml	(working copy)
@@ -19,7 +19,7 @@
 <ivysettings>
 	<settings defaultCache="${ivy.basedir}/build/cache" defaultResolver="m2"/>
 	<resolvers>
-		<ibiblio name="m2" m2compatible="true" useMavenMetadata="true" 
-		         root="${ivy.settings.dir}" />
+		<ibiblio name="m2" m2compatible="true" useMavenMetadata="true"
+		         root="file:${ivy.basedir}/test/repositories/m2" />
 	</resolvers>
 </ivysettings>