 maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
|
modified
, text changed
|
| maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/ModelUtils.java
|
modified
, text changed
|
| maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
|
modified
, text changed
|
| maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/ModelUtilsTest.java
|
modified
, text changed
|
| maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssemblerTest.java
|
modified
, text changed
|
 maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t12/
(Copied from maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t12, r638160)
|
added
|
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java
(Copied from maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/inheritance/t12/ProjectInheritanceTest.java, r638160)
|
replaced
|
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12/
(Copied from maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t12, r638160)
|
added
|
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12/p0/
(Copied from maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t12/p0, r638160)
|
replaced
|
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12/p0/p1/
(Copied from maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t12/p0/p1, r638160)
|
replaced
|
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml
(Copied from maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t12/p0/p1/pom.xml, r638160)
|
replaced
|
maven/components/trunk/maven-project/src/test/resources/inheritance-repo/t12/p0/pom.xml
(Copied from maven/components/branches/maven-2.0.x/maven-project/src/test/resources/inheritance-repo/t12/p0/pom.xml, r638160)
|
replaced
|
