[MNG-4102] [regression] Properties used for interpolation of inherited properties can't be customized by child

o Extended UT to check interaction with profile injection as well which is apparently key to reproduce the issue
o Removed interpolation step after profile injection to fix issue

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@757534 13f79535-47bb-0310-9956-ffa450edef68

maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java

@@ -90,10 +90,7 @@ public class ProcessorContext
         
         Model target = processModelsForInheritance(profileModels, processors, false);
         
-        PomClassicDomainModel m = convertToDomainModel( target, true );
-        interpolateModelProperties(m.getModelProperties(), new ArrayList<InterpolatorProperty>(), m); 
-        
-        return new PomClassicDomainModel(m.getModelProperties(), isMostSpecialized);  
+        return convertToDomainModel( target, isMostSpecialized );
     }
     
     private static Model attachProfileNodesToModel(Profile profile)

maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java

@@ -1189,16 +1189,25 @@ public class PomConstructionTest
     }
     //*/
 
-    /* FIXME: MNG-4102*/
-    public void testInheritedPropertiesInterpolatedWithValuesFromChild()
+    /* MNG-4102*/
+    public void testInheritedPropertiesInterpolatedWithValuesFromChildWithoutProfiles()
         throws Exception
     {
-        PomTestWrapper pom = buildPom( "inherited-properties-interpolation/sub" );
+        PomTestWrapper pom = buildPom( "inherited-properties-interpolation/no-profile/sub" );
 
         assertEquals( "CHILD", pom.getValue( "properties/overridden" ) );
         assertEquals( "CHILD", pom.getValue( "properties/interpolated" ) );
     }
-    //*/
+
+    /* MNG-4102 */
+    public void testInheritedPropertiesInterpolatedWithValuesFromChildWithActiveProfiles()
+        throws Exception
+    {
+        PomTestWrapper pom = buildPom( "inherited-properties-interpolation/active-profile/sub" );
+        buildPomFromMavenProject( "inherited-properties-interpolation/active-profile/sub", "it-parent", "it-child" );
+        assertEquals( "CHILD", pom.getValue( "properties/overridden" ) );
+        assertEquals( "CHILD", pom.getValue( "properties/interpolated" ) );
+    }
 
 
     private void assertPathSuffixEquals( String expected, Object actual )

maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/pom.xml

@@ -0,0 +1,50 @@
+<?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>
+
+  <profiles>
+    <profile>
+      <id>it-parent</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+    </profile>
+  </profiles>
+</project>

maven-project/src/test/resources-project-builder/inherited-properties-interpolation/active-profile/sub/pom.xml

@@ -0,0 +1,54 @@
+<?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>
+
+  <profiles>
+    <profile>
+      <id>it-child</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+    </profile>
+  </profiles>
+</project>