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/23 01:20:28 UTC
svn commit: r767717 - in /maven/mercury/trunk: mercury-artifact/
mercury-crypto/ mercury-event/ mercury-external/ mercury-it/pom.xml
mercury-logging/ mercury-md/ mercury-plexus/pom.xml mercury-repo/
mercury-transport/ mercury-util/ pom.xml
Author: ogusakov
Date: Wed Apr 22 23:20:27 2009
New Revision: 767717
URL: http://svn.apache.org/viewvc?rev=767717&view=rev
Log:
[MERCURY-96] merged modules to simplify Mercury
Removed:
maven/mercury/trunk/mercury-artifact/
maven/mercury/trunk/mercury-crypto/
maven/mercury/trunk/mercury-event/
maven/mercury/trunk/mercury-external/
maven/mercury/trunk/mercury-logging/
maven/mercury/trunk/mercury-md/
maven/mercury/trunk/mercury-repo/
maven/mercury/trunk/mercury-transport/
maven/mercury/trunk/mercury-util/
Modified:
maven/mercury/trunk/mercury-it/pom.xml
maven/mercury/trunk/mercury-plexus/pom.xml
maven/mercury/trunk/pom.xml
Modified: maven/mercury/trunk/mercury-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/pom.xml?rev=767717&r1=767716&r2=767717&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/pom.xml (original)
+++ maven/mercury/trunk/mercury-it/pom.xml Wed Apr 22 23:20:27 2009
@@ -41,23 +41,7 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-event</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-util</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-api</artifactId>
- <scope>test</scope>
+ <artifactId>mercury-core</artifactId>
</dependency>
<dependency>
@@ -66,18 +50,6 @@
</dependency>
<dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-md-shared</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-crypto-basic</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<optional>false</optional>
@@ -91,64 +63,15 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-local-m2</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-local-m2</artifactId>
+ <artifactId>mercury-core</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-remote-m2</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-virtual</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-md-sat</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-transport-http</artifactId>
- <type>test-jar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-plexus</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-transport-http</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-crypto-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-artifact</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-transport-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-external</artifactId>
- </dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -309,46 +232,13 @@
<searchPath>${basedir}</searchPath>
<sourceFolders>
- <sourceFolder>${basedir}/../mercury-artifact/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-crypto/mercury-crypto-api/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-crypto/mercury-crypto-basic/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-event/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-external/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-logging/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-md/mercury-md-shared/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-md/mercury-md-sat/src/main/java</sourceFolder>
+ <sourceFolder>${basedir}/../mercury-core/src/main/java</sourceFolder>
<sourceFolder>${basedir}/../mercury-plexus/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-repo/mercury-repo-api/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-repo/mercury-repo-cache-fs/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-repo/mercury-repo-flat/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-repo/mercury-repo-local-m2/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-repo/mercury-repo-local-map/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-repo/mercury-repo-remote-m2/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-repo/mercury-repo-virtual/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-transport/mercury-transport-api/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-transport/mercury-transport-http/src/main/java</sourceFolder>
- <sourceFolder>${basedir}/../mercury-util/src/main/java</sourceFolder>
</sourceFolders>
<jarFiles>
- <jarFile>${basedir}/../mercury-artifact/target/mercury-artifact-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-crypto/mercury-crypto-api/target/mercury-crypto-api-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-crypto/mercury-crypto-basic/target/mercury-crypto-basic-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-event/target/mercury-event-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-external/target/mercury-external-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-logging/target/mercury-logging-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-md/mercury-md-shared/target/mercury-md-shared-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-md/mercury-md-sat/target/mercury-md-sat-${project.version}.jar</jarFile>
+ <jarFile>${basedir}/../mercury-core/target/mercury-core-${project.version}.jar</jarFile>
<jarFile>${basedir}/../mercury-plexus/target/mercury-plexus-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-repo/mercury-repo-api/target/mercury-repo-api-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-repo/mercury-repo-cache-fs/target/mercury-repo-cache-fs-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-repo/mercury-repo-local-m2/target/mercury-repo-local-m2-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-repo/mercury-repo-local-map/target/mercury-repo-local-map-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-repo/mercury-repo-remote-m2/target/mercury-repo-remote-m2-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-repo/mercury-repo-remote-virtual/target/mercury-repo-remote-virtual-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-transport/mercury-transport-api/target/mercury-transport-api-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-transport/mercury-transport-http/target/mercury-transport-http-${project.version}.jar</jarFile>
- <jarFile>${basedir}/../mercury-util/target/mercury-util-${project.version}.jar</jarFile>
</jarFiles>
</configuration>
Modified: maven/mercury/trunk/mercury-plexus/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/pom.xml?rev=767717&r1=767716&r2=767717&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/pom.xml (original)
+++ maven/mercury/trunk/mercury-plexus/pom.xml Wed Apr 22 23:20:27 2009
@@ -46,55 +46,7 @@
-->
<dependency>
<groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-remote-m2</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-virtual</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-md-sat</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-crypto-basic</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-crypto-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-artifact</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-transport-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-external</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-local-m2</artifactId>
+ <artifactId>mercury-core</artifactId>
</dependency>
<dependency>
@@ -150,4 +102,3 @@
</plugins>
</build>
</project>
-
Modified: maven/mercury/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/pom.xml?rev=767717&r1=767716&r2=767717&view=diff
==============================================================================
--- maven/mercury/trunk/pom.xml (original)
+++ maven/mercury/trunk/pom.xml Wed Apr 22 23:20:27 2009
@@ -54,21 +54,8 @@
</developers>
<modules>
- <module>mercury-artifact</module>
- <module>mercury-md</module>
- <module>mercury-repo</module>
- <module>mercury-transport</module>
- <module>mercury-external</module>
- <module>mercury-crypto</module>
- <module>mercury-util</module>
- <module>mercury-event</module>
- <module>mercury-logging</module>
+ <module>mercury-core</module>
<module>mercury-plexus</module>
- <module>mercury-wagon</module>
- <module>mercury-it</module>
-<!--
--->
-
</modules>
<properties>
@@ -175,12 +162,13 @@
<artifactId>org.sat4j.pb</artifactId>
<version>${sat4j.version}</version>
</dependency>
-
+<!--
<dependency>
<groupId>org.sonatype.appbooter</groupId>
<artifactId>plexus-forked-app-booter</artifactId>
<version>${plexus.appbooter.version}</version>
</dependency>
+ -->
<!--
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -285,116 +273,13 @@
<!-- Mercury deps -->
<dependency>
<groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-artifact</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-external</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-event</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-util</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-logging</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-md-shared</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-crypto-api</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-crypto-basic</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-api</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-local-m2</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-local-map</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-local-m2</artifactId>
- <type>test-jar</type>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-remote-m2</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-virtual</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-cache-fs</artifactId>
+ <artifactId>mercury-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-md-sat</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-transport-api</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-transport-http</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-transport-http</artifactId>
+ <artifactId>mercury-core</artifactId>
<type>test-jar</type>
<version>${project.version}</version>
</dependency>
@@ -713,5 +598,12 @@
</plugins>
</reporting>
</profile>
+
+ <profile>
+ <id>run-its</id>
+ <modules>
+ <module>mercury-it</module>
+ </modules>
+ </profile>
</profiles>
</project>