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/23 23:27:33 UTC
svn commit: r1597191 - in /maven/shared/trunk/maven-dependency-tree: ./
src/it/reactor/ src/it/reactor/module-z-deps-y/
src/it/reactor/multi-module-plugin/ src/it/reactor/resolve-extension/
src/it/reactor/resolve-extension/src/main/java/org/apache/mave...
Author: hboutemy
Date: Fri May 23 21:27:33 2014
New Revision: 1597191
URL: http://svn.apache.org/r1597191
Log:
changed plugin to extension, since this is the only useful part
Added:
maven/shared/trunk/maven-dependency-tree/src/it/reactor/resolve-extension/
- copied from r1596487, maven/shared/trunk/maven-dependency-tree/src/it/reactor/multi-module-plugin/
maven/shared/trunk/maven-dependency-tree/src/it/reactor/resolve-extension/pom.xml
- copied, changed from r1597175, maven/shared/trunk/maven-dependency-tree/src/it/reactor/multi-module-plugin/pom.xml
maven/shared/trunk/maven-dependency-tree/src/it/reactor/resolve-extension/src/main/java/org/apache/maven/its/deptree/ResolveDependenciesLifecycleParticipant.java
- copied, changed from r1597184, maven/shared/trunk/maven-dependency-tree/src/it/reactor/multi-module-plugin/src/main/java/org/apache/maven/its/deptree/ResolveDependenciesLifecycleParticipant.java
Removed:
maven/shared/trunk/maven-dependency-tree/src/it/reactor/multi-module-plugin/
maven/shared/trunk/maven-dependency-tree/src/it/reactor/resolve-extension/src/main/java/org/apache/maven/its/deptree/DummyMojo.java
Modified:
maven/shared/trunk/maven-dependency-tree/pom.xml
maven/shared/trunk/maven-dependency-tree/src/it/reactor/module-z-deps-y/pom.xml
maven/shared/trunk/maven-dependency-tree/src/it/reactor/pom.xml
Modified: maven/shared/trunk/maven-dependency-tree/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/pom.xml?rev=1597191&r1=1597190&r2=1597191&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-tree/pom.xml Fri May 23 21:27:33 2014
@@ -147,7 +147,7 @@
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<settingsFile>src/it/settings.xml</settingsFile>
<setupIncludes>
- <setupInclude>reactor/multi-module-plugin/pom.xml</setupInclude>
+ <setupInclude>reactor/resolve-extension/pom.xml</setupInclude>
</setupIncludes>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
Modified: maven/shared/trunk/maven-dependency-tree/src/it/reactor/module-z-deps-y/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/reactor/module-z-deps-y/pom.xml?rev=1597191&r1=1597190&r2=1597191&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/reactor/module-z-deps-y/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-tree/src/it/reactor/module-z-deps-y/pom.xml Fri May 23 21:27:33 2014
@@ -74,13 +74,6 @@
</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/reactor/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/reactor/pom.xml?rev=1597191&r1=1597190&r2=1597191&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/reactor/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-tree/src/it/reactor/pom.xml Fri May 23 21:27:33 2014
@@ -43,4 +43,14 @@
<module>module-z-deps-y</module>
</modules>
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.its.dependency-tree</groupId>
+ <artifactId>resolve-extension</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </extension>
+ </extensions>
+ </build>
+
</project>
Copied: maven/shared/trunk/maven-dependency-tree/src/it/reactor/resolve-extension/pom.xml (from r1597175, maven/shared/trunk/maven-dependency-tree/src/it/reactor/multi-module-plugin/pom.xml)
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/reactor/resolve-extension/pom.xml?p2=maven/shared/trunk/maven-dependency-tree/src/it/reactor/resolve-extension/pom.xml&p1=maven/shared/trunk/maven-dependency-tree/src/it/reactor/multi-module-plugin/pom.xml&r1=1597175&r2=1597191&rev=1597191&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-tree/src/it/reactor/multi-module-plugin/pom.xml (original)
+++ maven/shared/trunk/maven-dependency-tree/src/it/reactor/resolve-extension/pom.xml Fri May 23 21:27:33 2014
@@ -24,13 +24,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.dependency-tree</groupId>
- <artifactId>multi-module-test-plugin</artifactId>
+ <artifactId>resolve-extension</artifactId>
<version>1.0-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
+ <packaging>jar</packaging>
- <name>Multi-Module Test-Plugin</name>
+ <name>Resolve Dependency from Reactor Check Extension</name>
<description>
- Creates a maven-plugin that can be used to verify that maven-dep-tree resolves deps that only exist within the reactor.
+ Extension to check that maven-dependency-tree resolves deps that only exist within the reactor.
</description>
<properties>
@@ -49,25 +49,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${maven.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${maven.version}</version>
- <scope>provided</scope>
- </dependency>
-<!--
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>${maven.version}</version>
- </dependency>
--->
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-9-stable-1</version>
Copied: maven/shared/trunk/maven-dependency-tree/src/it/reactor/resolve-extension/src/main/java/org/apache/maven/its/deptree/ResolveDependenciesLifecycleParticipant.java (from r1597184, maven/shared/trunk/maven-dependency-tree/src/it/reactor/multi-module-plugin/src/main/java/org/apache/maven/its/deptree/ResolveDependenciesLifecycleParticipant.java)
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-tree/src/it/reactor/resolve-extension/src/main/java/org/apache/maven/its/deptree/ResolveDependenciesLifecycleParticipant.java?p2=maven/shared/trunk/maven-dependency-tree/src/it/reactor/resolve-extension/src/main/java/org/apache/maven/its/deptree/ResolveDependenciesLifecycleParticipant.java&p1=maven/shared/trunk/maven-dependency-tree/src/it/reactor/multi-module-plugin/src/main/java/org/apache/maven/its/deptree/ResolveDependenciesLifecycleParticipant.java&r1=1597184&r2=1597191&rev=1597191&view=diff
==============================================================================
(empty)