You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2014/05/19 22:49:45 UTC
svn commit: r1596055 - in
/maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test:
expected-tree.txt module-x/ module-x/pom.xml module-y-deps-x/
module-y-deps-x/pom.xml module-z-deps-y/ moduleX/ moduleYDepsX/
moduleZDepsY/ pom.xml verify.bsh
Author: hboutemy
Date: Mon May 19 20:49:44 2014
New Revision: 1596055
URL: http://svn.apache.org/r1596055
Log:
make IT follow convention: module id = artifact id
Added:
maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/module-x/
- copied from r1595964, maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/moduleX/
maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/module-y-deps-x/
- copied from r1595964, maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/moduleYDepsX/
maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/module-z-deps-y/
- copied from r1595964, maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/moduleZDepsY/
Removed:
maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/moduleX/
maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/moduleYDepsX/
maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/moduleZDepsY/
Modified:
maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/expected-tree.txt
maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/module-x/pom.xml
maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/module-y-deps-x/pom.xml
maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/pom.xml
maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/verify.bsh
Modified: maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/expected-tree.txt
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/expected-tree.txt?rev=1596055&r1=1596054&r2=1596055&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/expected-tree.txt (original)
+++ maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/expected-tree.txt Mon May 19 20:49:44 2014
@@ -1,3 +1,6 @@
org.apache.maven.its.dependency-tree:module-z-deps-y:jar:1.0-SNAPSHOT
\- org.apache.maven.its.dependency-tree:module-y-deps-x:jar:1.0-SNAPSHOT:compile
- \- org.apache.maven.its.dependency-tree:module-x:jar:1.0-SNAPSHOT:compile
+ +- commons-net:commons-net:jar:3.2:compile
+ +- org.apache.maven.its.dependency-tree:module-x:jar:1.0-SNAPSHOT:compile
+ | \- org.apache.commons:commons-lang3:jar:3.0:compile
+ \- commons-io:commons-io:jar:2.2:compile
Modified: maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/module-x/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/module-x/pom.xml?rev=1596055&r1=1595964&r2=1596055&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/module-x/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/module-x/pom.xml Mon May 19 20:49:44 2014
@@ -31,12 +31,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <dependencyManagement>
- </dependencyManagement>
-
<dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.0</version>
+ </dependency>
</dependencies>
-
- <build>
- </build>
</project>
Modified: maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/module-y-deps-x/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/module-y-deps-x/pom.xml?rev=1596055&r1=1595964&r2=1596055&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/module-y-deps-x/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/module-y-deps-x/pom.xml Mon May 19 20:49:44 2014
@@ -43,44 +43,18 @@
<dependencies>
<dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven.its.dependency-tree</groupId>
<artifactId>module-x</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.2</version>
+ </dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- <dependencies>
- <dependency>
- <groupId>@project.groupId@</groupId>
- <artifactId>@project.artifactId@</artifactId>
- <version>@project.version@</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <id>default</id>
- <phase>validate</phase>
- <configuration>
- <outputFile>target/tree.txt</outputFile>
- </configuration>
- <goals>
- <goal>tree</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.its.dependency-tree</groupId>
- <artifactId>multi-module-test-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- </build>
</project>
Modified: maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/pom.xml?rev=1596055&r1=1596054&r2=1596055&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/pom.xml Mon May 19 20:49:44 2014
@@ -28,25 +28,19 @@
<version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>VerboseTest</name>
+ <name>Reactor Resolution Test</name>
<description>
- Test verbose dependency-tree with actual Maven version through old dependency:tree 2.4, before the feature was removed.
+ Test that dependency-tree with dependencies from reactor can be displayed.
</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
- <dependencyManagement>
- </dependencyManagement>
-
- <dependencies>
- </dependencies>
-
<modules>
- <module>moduleX</module>
- <module>moduleYDepsX</module>
- <module>moduleZDepsY</module>
+ <module>module-x</module>
+ <module>module-y-deps-x</module>
+ <module>module-z-deps-y</module>
</modules>
</project>
Modified: maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/verify.bsh
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/verify.bsh?rev=1596055&r1=1596054&r2=1596055&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/verify.bsh (original)
+++ maven/shared/trunk/maven-dependency-tree/src/it/multi-module-test/verify.bsh Mon May 19 20:49:44 2014
@@ -21,13 +21,13 @@ import java.io.*;
import org.codehaus.plexus.util.*;
-String actual = FileUtils.fileRead( new File( basedir, "moduleZDepsY/target/tree.txt" ) );
+String actual = FileUtils.fileRead( new File( basedir, "module-z-deps-y/target/tree.txt" ) );
String expected = FileUtils.fileRead( new File( basedir, "expected-tree.txt" ) );
actual = actual.replaceAll( "[\n\r]+", "\n" );
expected = expected.replaceAll( "[\n\r]+", "\n" );
-System.out.println( "Checking dependency tree..." );
+System.out.println( "Checking module-z-deps-y dependency tree..." );
if ( !actual.equals( expected ) )
{