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/02/13 22:47:45 UTC
svn commit: r744254 - in /maven/components/trunk/maven-project/src/test:
java/org/apache/maven/project/builder/
resources-project-builder/managed-profile-dependency/
resources-project-builder/managed-profile-dependency/sub/
Author: bentmann
Date: Fri Feb 13 21:47:45 2009
New Revision: 744254
URL: http://svn.apache.org/viewvc?rev=744254&view=rev
Log:
[MNG-4034] dependency version is not inherited from parent dependencyManagement
o Added UT
Added:
maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/ (with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/pom.xml (with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/ (with props)
maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml (with props)
Modified:
maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
Modified: maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java?rev=744254&r1=744253&r2=744254&view=diff
==============================================================================
--- maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java (original)
+++ maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/builder/PomConstructionTest.java Fri Feb 13 21:47:45 2009
@@ -819,7 +819,7 @@
}
/** MNG-4027
- public void testProjectInjectedDependencies()
+ public void testProfileInjectedDependencies()
throws Exception
{
PomTestWrapper pom = buildPom( "profile-injected-dependencies" );
@@ -831,6 +831,21 @@
}
//*/
+ /** MNG-4034
+ public void testManagedProfileDependency()
+ throws Exception
+ {
+ PomTestWrapper pom = buildPom( "managed-profile-dependency/sub" );
+ assertEquals( 1, ( (List<?>) pom.getValue( "dependencies" ) ).size() );
+ assertEquals( "org.apache.maven.its", pom.getValue( "dependencies[1]/groupId" ) );
+ assertEquals( "maven-core-it-support", pom.getValue( "dependencies[1]/artifactId" ) );
+ assertEquals( "1.3", pom.getValue( "dependencies[1]/version" ) );
+ assertEquals( "runtime", pom.getValue( "dependencies[1]/scope" ) );
+ assertEquals( 1, ( (List<?>) pom.getValue( "dependencies[1]/exclusions" ) ).size() );
+ assertEquals( "commons-lang", pom.getValue( "dependencies[1]/exclusions[1]/groupId" ) );
+ }
+ //*/
+
private void assertPathWithNormalizedFileSeparators( Object value )
{
assertEquals( new File( value.toString() ).getPath(), value.toString() );
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/pom.xml?rev=744254&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/pom.xml Fri Feb 13 21:47:45 2009
@@ -0,0 +1,55 @@
+<?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.mng4034</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>Maven Integration Test :: MNG-4034</name>
+ <description>
+ Verify that dependencies defined in profiles are subject to the dependency management of the parent.
+ </description>
+
+ <modules>
+ <module>sub</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-core-it-support</artifactId>
+ <version>1.3</version>
+ <scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+</project>
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Added: maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml?rev=744254&view=auto
==============================================================================
--- maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml (added)
+++ maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml Fri Feb 13 21:47:45 2009
@@ -0,0 +1,55 @@
+<?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.mng4034</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.maven.its.mng4034</groupId>
+ <artifactId>child</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <name>Maven Integration Test :: MNG-4034</name>
+ <description>
+ Verify that dependencies defined in profiles are subject to the dependency management of the parent.
+ </description>
+
+ <profiles>
+ <profile>
+ <id>maven-core-it</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its</groupId>
+ <artifactId>maven-core-it-support</artifactId>
+ <!-- version should be injected from dependency management of parent -->
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+</project>
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-project/src/test/resources-project-builder/managed-profile-dependency/sub/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision