added different expected result for M3 than for M2 since M3 gives more details when dependencyManagement is used and we won't improve output with M2 but improve output with M3 when it is not as good as expected
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1468721 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/it/maven-version/expected.txt b/src/it/maven-version/expected-M2.txt
similarity index 86%
rename from src/it/maven-version/expected.txt
rename to src/it/maven-version/expected-M2.txt
index 65e2f92..fb7ca63 100644
--- a/src/it/maven-version/expected.txt
+++ b/src/it/maven-version/expected-M2.txt
@@ -2,13 +2,12 @@
\- org.apache.maven:maven-project:jar:2.0.6:compile
+- org.apache.maven:maven-settings:jar:2.0.6:compile
+- org.apache.maven:maven-profile:jar:2.0.6:compile
- +- org.apache.maven:maven-model:jar:2.0.6:compile
+ +- org.apache.maven:maven-model:jar:2.0.5:compile
+- org.apache.maven:maven-artifact-manager:jar:2.0.6:compile
| +- org.apache.maven:maven-repository-metadata:jar:2.0.6:compile
| \- org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-2:compile
+- org.apache.maven:maven-plugin-registry:jar:2.0.6:compile
+- org.codehaus.plexus:plexus-utils:jar:1.4.1:compile
- +- org.apache.maven:maven-artifact:jar:2.0.6:compile
\- org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile
+- junit:junit:jar:3.8.1:compile
\- classworlds:classworlds:jar:1.1-alpha-2:compile
diff --git a/src/it/maven-version/expected.txt b/src/it/maven-version/expected-M3.txt
similarity index 86%
copy from src/it/maven-version/expected.txt
copy to src/it/maven-version/expected-M3.txt
index 65e2f92..5c037cd 100644
--- a/src/it/maven-version/expected.txt
+++ b/src/it/maven-version/expected-M3.txt
@@ -2,13 +2,12 @@
\- org.apache.maven:maven-project:jar:2.0.6:compile
+- org.apache.maven:maven-settings:jar:2.0.6:compile
+- org.apache.maven:maven-profile:jar:2.0.6:compile
- +- org.apache.maven:maven-model:jar:2.0.6:compile
+ +- org.apache.maven:maven-model:jar:2.0.5:compile (version managed from 2.0.6)
+- org.apache.maven:maven-artifact-manager:jar:2.0.6:compile
| +- org.apache.maven:maven-repository-metadata:jar:2.0.6:compile
| \- org.apache.maven.wagon:wagon-provider-api:jar:1.0-beta-2:compile
+- org.apache.maven:maven-plugin-registry:jar:2.0.6:compile
+- org.codehaus.plexus:plexus-utils:jar:1.4.1:compile
- +- org.apache.maven:maven-artifact:jar:2.0.6:compile
\- org.codehaus.plexus:plexus-container-default:jar:1.0-alpha-9-stable-1:compile
+- junit:junit:jar:3.8.1:compile
\- classworlds:classworlds:jar:1.1-alpha-2:compile
diff --git a/src/it/maven-version/invoker.properties b/src/it/maven-version/invoker.properties
index 6448eca..2200036 100644
--- a/src/it/maven-version/invoker.properties
+++ b/src/it/maven-version/invoker.properties
@@ -1 +1 @@
-invoker.goals = dependency:tree
+invoker.goals = clean dependency:tree
diff --git a/src/it/maven-version/pom.xml b/src/it/maven-version/pom.xml
index 5e17352..b545c77 100644
--- a/src/it/maven-version/pom.xml
+++ b/src/it/maven-version/pom.xml
@@ -34,14 +34,36 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <outputFile>target/tree-M2.txt</outputFile>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
<version>2.0.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+ <!-- dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-profile</artifactId>
+ <version>2.0.5</version>
+ </dependency-->
</dependencies>
<build>
@@ -51,6 +73,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.6</version>
+ <configuration>
+ <outputFile>${outputFile}</outputFile>
+ </configuration>
<dependencies>
<dependency>
<groupId>@project.groupId@</groupId>
@@ -62,4 +87,19 @@
</plugins>
</pluginManagement>
</build>
+
+ <profiles>
+ <profile>
+ <id>maven-3</id>
+ <activation>
+ <file>
+ <!-- This employs that the basedir expression is only recognized by Maven 3.x (see MNG-2363) -->
+ <exists>${basedir}</exists>
+ </file>
+ </activation>
+ <properties>
+ <outputFile>target/tree-M3.txt</outputFile>
+ </properties>
+ </profile>
+ </profiles>
</project>
diff --git a/src/it/maven-version/test.properties b/src/it/maven-version/test.properties
deleted file mode 100644
index 62752d7..0000000
--- a/src/it/maven-version/test.properties
+++ /dev/null
@@ -1 +0,0 @@
-outputFile = target/tree.txt
diff --git a/src/it/maven-version/verify.bsh b/src/it/maven-version/verify.bsh
index 8bad5d4..401c65f 100644
--- a/src/it/maven-version/verify.bsh
+++ b/src/it/maven-version/verify.bsh
@@ -2,8 +2,16 @@
import org.codehaus.plexus.util.*;
-String actual = FileUtils.fileRead( new File( basedir, "target/tree.txt" ) );
-String expected = FileUtils.fileRead( new File( basedir, "expected.txt" ) );
+File outputFile = new File( basedir, "target/tree-M2.txt" );
+File expectedFile = new File( basedir, "expected-M2.txt" );
+if ( ! outputFile.exists() )
+{
+ outputFile = new File( basedir, "target/tree-M3.txt" );
+ expectedFile = new File( basedir, "expected-M3.txt" );
+}
+
+String actual = FileUtils.fileRead( outputFile );
+String expected = FileUtils.fileRead( expectedFile );
actual = actual.replaceAll( "[\n\r]+", "\n" );
expected = expected.replaceAll( "[\n\r]+", "\n" );
