Author: bentmann
Date: Sun Mar 22 22:06:42 2009
New Revision: 757263
URL: http://svn.apache.org/viewvc?rev=757263&view=rev
Log:
[MNG-4102] [regression] Properties used for interpolation of inherited
properties can't be customized by child
o Added UT
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/pom.xml
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/sub/
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/sub/pom.xml
(with props)
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=757263&r1=757262&r2=757263&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
Sun Mar 22 22:06:42 2009
@@ -1192,6 +1192,17 @@
}
//*/
+ /* FIXME: MNG-4102
+ public void testInheritedPropertiesInterpolatedWithValuesFromChild()
+ throws Exception
+ {
+ PomTestWrapper pom = buildPom(
"inherited-properties-interpolation/sub" );
+
+ assertEquals( "CHILD", pom.getValue( "properties/overridden" ) );
+ assertEquals( "CHILD", pom.getValue( "properties/interpolated" ) );
+ }
+ //*/
+
private void assertPathSuffixEquals( String expected, Object actual )
{
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/pom.xml?rev=757263&view=auto
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/pom.xml
(added)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/pom.xml
Sun Mar 22 22:06:42 2009
@@ -0,0 +1,41 @@
+<?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.mng4102</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-4102</name>
+ <description>
+ Verify that the effective value of an inherited property reflects the
values of any nested property
+ as defined by the child. This boils down to the order of inheritance and
(parent) interpolation.
+ </description>
+
+ <properties>
+ <overridden>PARENT</overridden>
+ <!-- Test the effective value of this property in the child when
"overridden" is defined by child as well -->
+ <interpolated>${overridden}</interpolated>
+ </properties>
+</project>
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/sub/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/sub/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/sub/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/sub/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/sub/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/sub/pom.xml?rev=757263&view=auto
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/sub/pom.xml
(added)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/sub/pom.xml
Sun Mar 22 22:06:42 2009
@@ -0,0 +1,45 @@
+<?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>
+
+ <parent>
+ <groupId>org.apache.maven.its.mng4102</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <groupId>org.apache.maven.its.mng4102</groupId>
+ <artifactId>test</artifactId>
+ <version>0.1</version>
+ <packaging>jar</packaging>
+
+ <name>Maven Integration Test :: MNG-4102 :: Child</name>
+ <description>
+ Verify that the effective value of an inherited property reflects the
values of any nested property
+ as defined by the child. This boils down to the order of inheritance and
(parent) interpolation.
+ </description>
+
+ <properties>
+ <overridden>CHILD</overridden>
+ </properties>
+</project>
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/sub/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/inherited-properties-interpolation/sub/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
