You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by si...@apache.org on 2009/01/09 20:44:20 UTC
svn commit: r733133 - in /maven/components/trunk:
maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
Author: sisbell
Date: Fri Jan 9 11:44:19 2009
New Revision: 733133
URL: http://svn.apache.org/viewvc?rev=733133&view=rev
Log:
Fix: MNG-3978
Modified:
maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
Modified: maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java?rev=733133&r1=733132&r2=733133&view=diff
==============================================================================
--- maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java (original)
+++ maven/components/trunk/maven-project-builder/src/main/java/org/apache/maven/project/builder/PomTransformer.java Fri Jan 9 11:44:19 2009
@@ -406,7 +406,27 @@
List<ModelProperty> tmp = domainModel.getModelProperties();
List clearedProperties = new ArrayList<ModelProperty>();
-
+
+ //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 )
{
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java?rev=733133&r1=733132&r2=733133&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t10/ProjectInheritanceTest.java Fri Jan 9 11:44:19 2009
@@ -82,7 +82,7 @@
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"));