From e3bde472f931429648c74574c2827da61ae2c4cc Mon Sep 17 00:00:00 2001 From: Britton Isbell Date: Fri, 9 Jan 2009 19:44:19 +0000 Subject: [PATCH] Fix: MNG-3978 git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@733133 13f79535-47bb-0310-9956-ffa450edef68 --- .../maven/project/builder/PomTransformer.java | 20 +++++++++++++++++++ .../t10/ProjectInheritanceTest.java | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java b/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java index 6bf3738425..b6149462f7 100644 --- a/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java +++ b/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java @@ -406,7 +406,27 @@ public final List transformToModelProperties(List tmp = domainModel.getModelProperties(); List clearedProperties = new ArrayList(); + + //Default Dependency Scope Rule + ModelDataSource s = new DefaultModelDataSource(); + s.init( tmp, Arrays.asList( new ArtifactModelContainerFactory()) ); + for(ModelContainer mc : s.queryFor(ProjectUri.Dependencies.Dependency.xUri)) + { + boolean containsScope = false; + for(ModelProperty mp :mc.getProperties()) + { + if(mp.getUri().equals(ProjectUri.Dependencies.Dependency.scope)) { + containsScope = true; + break; + } + } + if(!containsScope) + { + tmp.add(tmp.indexOf(mc.getProperties().get(0)) + 1, new ModelProperty(ProjectUri.Dependencies.Dependency.scope, "compile")); + } + } + //Missing Version Rule if ( getPropertyFor( ProjectUri.version, tmp ) == null ) { diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java index 74e4e5b75b..a41ffc26fa 100644 --- a/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java +++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java @@ -82,7 +82,7 @@ public void testDependencyManagementOverridesTransitiveDependencyVersion() assertNotNull( c ); // inherited from depMgmt - assertTrue("Incorrect scope for " + a.getDependencyConflictId(), a.getScope().equals("test")); + assertTrue("Incorrect scope for " + a.getDependencyConflictId(), a.getScope().equals("compile")); // transitive dep, overridden b depMgmt assertTrue("Incorrect scope for " + b.getDependencyConflictId(), b.getScope().equals("runtime"));