You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/06/11 00:02:56 UTC
svn commit: r783542 - in /maven/components/trunk:
maven-core/src/test/java/org/apache/maven/project/
maven-core/src/test/resources-project-builder/prerequisites-inheritance/
maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/...
Author: bentmann
Date: Wed Jun 10 22:02:56 2009
New Revision: 783542
URL: http://svn.apache.org/viewvc?rev=783542&view=rev
Log:
o Fixed inheritance of <prerequisites>
Added:
maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/ (with props)
maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/ (with props)
maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml (with props)
maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/pom.xml (with props)
Modified:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
Modified: maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=783542&r1=783541&r2=783542&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java Wed Jun 10 22:02:56 2009
@@ -1512,6 +1512,14 @@
}
}
+ /** MNG-3843 */
+ public void testPrerequisitesAreNotInherited()
+ throws Exception
+ {
+ PomTestWrapper pom = buildPom( "prerequisites-inheritance/child" );
+ assertSame( null, pom.getValue( "prerequisites" ) );
+ }
+
private void assertPathSuffixEquals( String expected, Object actual )
{
String a = actual.toString();
Propchange: maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Propchange: maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml?rev=783542&view=auto
==============================================================================
--- maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml (added)
+++ maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml Wed Jun 10 22:02:56 2009
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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>
+
+ <!--
+ This minimalistic POM tests mere inheritance from its parent. The <prerequisites> should not be inherited.
+ -->
+
+ <parent>
+ <groupId>org.apache.maven.its.mng3843</groupId>
+ <artifactId>parent-1</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <artifactId>child-1</artifactId>
+</project>
Propchange: maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/child/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added: maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/pom.xml?rev=783542&view=auto
==============================================================================
--- maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/pom.xml (added)
+++ maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/pom.xml Wed Jun 10 22:02:56 2009
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+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.maven.its.mng3843</groupId>
+ <artifactId>parent-1</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <prerequisites>
+ <maven>2.0</maven>
+ </prerequisites>
+</project>
Propchange: maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-core/src/test/resources-project-builder/prerequisites-inheritance/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java?rev=783542&r1=783541&r2=783542&view=diff
==============================================================================
--- maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java (original)
+++ maven/components/trunk/maven-model-builder/src/main/java/org/apache/maven/model/merge/MavenModelMerger.java Wed Jun 10 22:02:56 2009
@@ -167,6 +167,12 @@
}
@Override
+ protected void mergeModel_Prerequisites( Model target, Model source, boolean sourceDominant, Map<Object, Object> context )
+ {
+ // neither inherited nor injected
+ }
+
+ @Override
protected void mergeModelBase_Modules( ModelBase target, ModelBase source, boolean sourceDominant,
Map<Object, Object> context )
{