Author: bentmann
Date: Sun Mar 22 21:30:37 2009
New Revision: 757260
URL: http://svn.apache.org/viewvc?rev=757260&view=rev
Log:
o Added UT to exhibit properties inheritance issue
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/pom.xml
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/sub/
(with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/sub/pom.xml
(with props)
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/ProcessorContextTest.java
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=757260&r1=757259&r2=757260&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
Sun Mar 22 21:30:37 2009
@@ -373,7 +373,7 @@
private Model inject( Profile profile, Model model ) throws IOException
{
- return ProcessorContext.mergeProfileIntoModel( Arrays.asList(profile),
model, false ).getModel();
+ return ProcessorContext.mergeProfilesIntoModel(
Arrays.asList(profile), model, false ).getModel();
}
private MavenProject readModelFromLocalPath( String projectId, File
pomFile, ArtifactRepository localRepository, List<ArtifactRepository>
remoteRepositories, ProjectBuilderConfiguration config )
@@ -531,7 +531,7 @@
{
ProfileContext profileContext1 = new ProfileContext(
dm.getModel().getProfiles(), activeProfileIds,
inactiveProfileIds, properties );
- profileModels.add(ProcessorContext.mergeProfileIntoModel(
profileContext1.getActiveProfiles(), dm.getModel(),
+ profileModels.add(ProcessorContext.mergeProfilesIntoModel(
profileContext1.getActiveProfiles(), dm.getModel(),
dm.isMostSpecialized() ));
}
else
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java?rev=757260&r1=757259&r2=757260&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/processor/ProcessorContext.java
Sun Mar 22 21:30:37 2009
@@ -71,7 +71,7 @@
ProjectUri.Build.Filters.filter,
ProjectUri.Reporting.outputDirectory ) ) );
- public static PomClassicDomainModel
mergeProfileIntoModel(Collection<Profile> profiles, Model model, boolean
isMostSpecialized) throws IOException
+ public static PomClassicDomainModel
mergeProfilesIntoModel(Collection<Profile> profiles, Model model, boolean
isMostSpecialized) throws IOException
{
List<Model> profileModels = new ArrayList<Model>();
profileModels.add( model );
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=757260&r1=757259&r2=757260&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 21:30:37 2009
@@ -1180,6 +1180,18 @@
}
//*/
+ /* FIXME
+ public void testPropertiesInheritance()
+ throws Exception
+ {
+ PomTestWrapper pom = buildPom( "properties-inheritance/sub" );
+
+ assertEquals( "parent-property", pom.getValue(
"properties/parentProperty" ) );
+ assertEquals( "child-property", pom.getValue(
"properties/childProperty" ) );
+ assertEquals( "child-override", pom.getValue(
"properties/overriddenProperty" ) );
+ }
+ //*/
+
private void assertPathSuffixEquals( String expected, Object actual )
{
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/ProcessorContextTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/ProcessorContextTest.java?rev=757260&r1=757259&r2=757260&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/ProcessorContextTest.java
(original)
+++
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/processor/ProcessorContextTest.java
Sun Mar 22 21:30:37 2009
@@ -43,7 +43,7 @@
Profile profile = new Profile();
profile.setModules( Arrays.asList( "m1", "m2" ) );
- PomClassicDomainModel m = ProcessorContext.mergeProfileIntoModel(
Arrays.asList( profile ), model, false );
+ PomClassicDomainModel m = ProcessorContext.mergeProfilesIntoModel(
Arrays.asList( profile ), model, false );
assertEquals(2, m.getModel().getModules().size());
}
@@ -77,7 +77,7 @@
profile.setBuild( b);
- PomClassicDomainModel m = ProcessorContext.mergeProfileIntoModel(
Arrays.asList( profile ), model, false );
+ PomClassicDomainModel m = ProcessorContext.mergeProfilesIntoModel(
Arrays.asList( profile ), model, false );
assertEquals(1,
m.getModel().getBuild().getPluginManagement().getPlugins().size());
}
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/pom.xml?rev=757260&view=auto
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/pom.xml
(added)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/pom.xml
Sun Mar 22 21:30:37 2009
@@ -0,0 +1,34 @@
+<?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>
+
+ <properties>
+ <parentProperty>parent-property</parentProperty>
+ <overriddenProperty>parent-property</overriddenProperty>
+ </properties>
+</project>
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/sub/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/sub/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/sub/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/sub/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/sub/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/sub/pom.xml?rev=757260&view=auto
==============================================================================
---
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/sub/pom.xml
(added)
+++
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/sub/pom.xml
Sun Mar 22 21:30:37 2009
@@ -0,0 +1,40 @@
+<?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.mng3843</groupId>
+ <artifactId>parent-1</artifactId>
+ <version>0.1</version>
+ </parent>
+
+ <groupId>org.apache.maven.its.mng3843.child</groupId>
+ <artifactId>child-2</artifactId>
+ <version>0.2</version>
+ <packaging>jar</packaging>
+
+ <properties>
+ <childProperty>child-property</childProperty>
+ <overriddenProperty>child-override</overriddenProperty>
+ </properties>
+</project>
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/sub/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/components/trunk/maven-project/src/test/resources-project-builder/properties-inheritance/sub/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
