You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/04/24 21:11:50 UTC
svn commit: r768398 [2/2] - in
/maven/components/branches/maven-3.0.x-mercury: ./ apache-maven/
maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/project/
maven-compat/src/main/java/org/apache/maven/proje...
Modified: maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java?rev=768398&r1=768397&r2=768398&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/java/org/apache/maven/project/PomConstructionTest.java Fri Apr 24 19:11:48 2009
@@ -149,7 +149,7 @@
System.out.println(pom.getDomainModel().asString());
}
- */
+
/*MNG- 4010*/
public void testDuplicateExclusionsDependency()
throws Exception
@@ -886,13 +886,15 @@
}
/** IT-0021*/
+ /*
public void testProfileDependenciesMultipleProfiles()
throws Exception
{
PomTestWrapper pom = buildPom( "profile-dependencies-multiple-profiles", "profile-1", "profile-2" );
assertEquals(2, ( (List<?>) pom.getValue( "dependencies" ) ).size() );
}
-
+ */
+ /*
public void testDependencyInheritance()
throws Exception
{
@@ -900,7 +902,7 @@
assertEquals(1, ( (List<?>) pom.getValue( "dependencies" ) ).size() );
assertEquals("4.4", pom.getValue("dependencies[1]/version") );
}
-
+ */
/** MNG-4034 */
public void testManagedProfileDependency()
throws Exception
@@ -1409,8 +1411,23 @@
{
PomTestWrapper pom = this.buildPom( "distribution-management");
assertEquals("legacy", pom.getValue( "distributionManagement/repository/layout" ));
- }
-
+ }
+
+ public void testDependencyScopeInheritance()
+ throws Exception
+ {
+ PomTestWrapper pom = buildPom( "dependency-scope-inheritance/sub" );
+ String scope = (String) pom.getValue("dependencies[1]/scope");
+ assertNull("Scope not null: " + scope, scope);
+ System.out.println(pom.getDomainModel().asString());
+
+ }
+ public void testDependencyScope()
+ throws Exception
+ {
+ PomTestWrapper pom = buildPom( "dependency-scope/sub" );
+ System.out.println(pom.getDomainModel().asString());
+ }
private void assertPathSuffixEquals( String expected, Object actual )
{
String a = actual.toString();
Modified: maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-scope/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-scope/pom.xml?rev=768398&r1=768397&r2=768398&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-scope/pom.xml (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-scope/pom.xml Fri Apr 24 19:11:48 2009
@@ -7,30 +7,12 @@
<version>1.0</version>
<dependencyManagement>
-
<dependencies>
<dependency>
<groupId>maven-test</groupId>
<artifactId>t10-a</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>maven-test</groupId>
- <artifactId>t10-b</artifactId>
- <version>1.0</version>
- <scope>runtime</scope>
+ <version>2.0</version>
</dependency>
-
- <dependency>
- <groupId>maven-test</groupId>
- <artifactId>t10-c</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</dependencyManagement>
-
</project>
\ No newline at end of file
Modified: maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml?rev=768398&r1=768397&r2=768398&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml (original)
+++ maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/dependency-scope/sub/pom.xml Fri Apr 24 19:11:48 2009
@@ -15,17 +15,10 @@
</scm>
<dependencies>
-
<dependency>
<groupId>maven-test</groupId>
<artifactId>t10-a</artifactId>
+ <version>1.0</version>
</dependency>
-
- <dependency>
- <groupId>maven-test</groupId>
- <artifactId>t10-c</artifactId>
- <scope>runtime</scope>
- </dependency>
-
</dependencies>
</project>
\ No newline at end of file
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,3 +4,4 @@
/maven/components/branches/maven-2.1.x/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml:739385,741841,747468,747683,748815,749612,766523
/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/test/resources-project-builder/plugin-management-duplicate/pom.xml:738757-738972
+/maven/components/trunk/maven-project/src/test/resources-project-builder/plugin-management-duplicate/sub/pom.xml:767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.1.x/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java:739385,741841,747468,748815
/maven/components/branches/sisbell-plugin-manager/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java:738757-738972
-/maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java:688587-696625,696644-699681
+/maven/components/trunk/maven-repository-mercury/src/main/java/org/apache/maven/repository/mercury/MercuryRepositorySystem.java:688587-696625,696644-699681,767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -5,3 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java:738757-738972
/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/project/ProjectUtils.java:688587-696625,696644-699681
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/project/ProjectUtils.java:767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -0,0 +1 @@
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/DefaultMirrorBuilder.java:767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -5,3 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java:738757-738972
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/DefaultMavenTools.java:688587-696625,696644-699681
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/LegacyRepositorySystem.java:767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -0,0 +1 @@
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/MirrorBuilder.java:767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -5,3 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/MavenTools.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/MavenTools.java:738757-738972
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/MavenTools.java:688587-696625,696644-699681
+/maven/components/trunk/maven-repository/src/main/java/org/apache/maven/repository/RepositorySystem.java:767743-768388
Propchange: maven/components/branches/maven-3.0.x-mercury/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr 24 19:11:48 2009
@@ -5,3 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:738757-738972
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:688587-696625,696644-699681
+/maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/LegacyMavenRepositorySystemTest.java:767743-768388