Author: bentmann
Date: Sat Nov 6 12:37:11 2010
New Revision: 1032026
URL: http://svn.apache.org/viewvc?rev=1032026&view=rev
Log:
o Updated IT to use non-controversial classpath scenario
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/pom.xml
maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/validate.bsh
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/pom.xml?rev=1032026&r1=1032025&r2=1032026&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/pom.xml
(original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/pom.xml
Sat Nov 6 12:37:11 2010
@@ -39,11 +39,11 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
+ <artifactId>maven-profile</artifactId>
<version>2.0.6</version>
<exclusions>
<exclusion>
- <!-- NOTE: Excluded because of questionable handling of
dependencyManagement in maven-project:pom:2.0.6 -->
+ <!-- NOTE: Excluded because of questionable handling of
dependencyManagement in maven-profile:pom:2.0.6 -->
<groupId>classworlds</groupId>
<artifactId>classworlds</artifactId>
</exclusion>
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/validate.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/validate.bsh?rev=1032026&r1=1032025&r2=1032026&view=diff
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/validate.bsh
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/it/build-classpath/validate.bsh
Sat Nov 6 12:37:11 2010
@@ -10,18 +10,11 @@ classpath = StringUtils.replace( classpa
List actual = Arrays.asList( classpath.split( ":" ) );
List expected = new ArrayList();
-expected.add( "maven-project-2.0.6.jar" );
-expected.add( "maven-settings-2.0.6.jar" );
+expected.add( "maven-profile-2.0.6.jar" );
expected.add( "maven-model-2.0.6.jar" );
expected.add( "plexus-utils-1.4.1.jar" );
expected.add( "plexus-container-default-1.0-alpha-9-stable-1.jar" );
expected.add( "junit-3.8.1.jar" );
-expected.add( "maven-profile-2.0.6.jar" );
-expected.add( "maven-artifact-manager-2.0.6.jar" );
-expected.add( "maven-repository-metadata-2.0.6.jar" );
-expected.add( "maven-artifact-2.0.6.jar" );
-expected.add( "wagon-provider-api-1.0-beta-2.jar" );
-expected.add( "maven-plugin-registry-2.0.6.jar" );
System.out.println( "Checking classpath... " );
System.out.println( "Actual : " + actual );