You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/12/23 17:16:25 UTC
svn commit: r729022 - in /maven/mercury/trunk: ./ mercury-ant/
mercury-artifact/ mercury-crypto/ mercury-crypto/mercury-crypto-api/
mercury-crypto/mercury-crypto-basic/ mercury-event/ mercury-external/
mercury-it/ mercury-logging/ mercury-maven/mercury...
Author: vsiveton
Date: Tue Dec 23 08:16:24 2008
New Revision: 729022
URL: http://svn.apache.org/viewvc?rev=729022&view=rev
Log:
o ordering poms following our convention
Modified:
maven/mercury/trunk/mercury-ant/pom.xml
maven/mercury/trunk/mercury-artifact/pom.xml
maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml
maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml
maven/mercury/trunk/mercury-crypto/pom.xml
maven/mercury/trunk/mercury-event/pom.xml
maven/mercury/trunk/mercury-external/pom.xml
maven/mercury/trunk/mercury-it/pom.xml
maven/mercury/trunk/mercury-logging/pom.xml
maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml
maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml
maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml
maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml
maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml
maven/mercury/trunk/mercury-md/pom.xml
maven/mercury/trunk/mercury-plexus/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml
maven/mercury/trunk/mercury-repo/pom.xml
maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml
maven/mercury/trunk/mercury-transport/mercury-transport-file/pom.xml
maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml
maven/mercury/trunk/mercury-transport/pom.xml
maven/mercury/trunk/mercury-util/pom.xml
maven/mercury/trunk/mercury-wagon/pom.xml
maven/mercury/trunk/pom.xml
Modified: maven/mercury/trunk/mercury-ant/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-ant/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-ant/pom.xml (original)
+++ maven/mercury/trunk/mercury-ant/pom.xml Tue Dec 23 08:16:24 2008
@@ -18,19 +18,20 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>9</version>
+ <version>10</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-ant</artifactId>
+ <version>1.0-alpha-1-SNAPSHOT</version>
<packaging>pom</packaging>
+
<name>Mercury Ant</name>
- <version>1.0-alpha-1-SNAPSHOT</version>
<description>Maven Mercury Ant is an ant-task wrapper for MErcry functionality: classpath creation, artifact deployment .</description>
<developers>
@@ -43,8 +44,33 @@
<module>mercury-ant-tasks</module>
</modules>
- <properties>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/mercury/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/mercury/trunk/</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/mercury/trunk/</url>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/MERCURY</url>
+ </issueManagement>
+ <ciManagement>
+ <system>hudson</system>
+ <url>http://grid.sonatype.org/ci/view/Mercury/job/mercury</url>
+ </ciManagement>
+ <distributionManagement>
+ <repository>
+ <id>${distMgmtReleasesId}</id>
+ <name>${distMgmtReleasesName}</name>
+ <url>${distMgmtReleasesUrl}</url>
+ </repository>
+ <snapshotRepository>
+ <id>${distMgmtSnapshotsId}</id>
+ <name>${distMgmtSnapshotsName}</name>
+ <url>${distMgmtSnapshotsUrl}</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <properties>
<ant.version>1.7.0</ant.version>
<antunit.version>1.1</antunit.version>
<mercury.version>1.0.0-alpha-3-SNAPSHOT</mercury.version>
@@ -62,7 +88,6 @@
<distMgmtSnapshotsId>apache.snapshots</distMgmtSnapshotsId>
<distMgmtSnapshotsName>Apache Snapshots</distMgmtSnapshotsName>
<distMgmtSnapshotsUrl>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</distMgmtSnapshotsUrl>
-
</properties>
<dependencyManagement>
@@ -151,22 +176,15 @@
</dependency>
</dependencies>
-
</dependencyManagement>
-
-
<dependencies>
-
<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
-
</dependencies>
-
-
<build>
<defaultGoal>install</defaultGoal>
<resources>
@@ -388,36 +406,4 @@
</reporting>
</profile>
</profiles>
-
- <distributionManagement>
- <repository>
- <id>${distMgmtReleasesId}</id>
- <name>${distMgmtReleasesName}</name>
- <url>${distMgmtReleasesUrl}</url>
- </repository>
- <snapshotRepository>
- <id>${distMgmtSnapshotsId}</id>
- <name>${distMgmtSnapshotsName}</name>
- <url>${distMgmtSnapshotsUrl}</url>
- </snapshotRepository>
- </distributionManagement>
-
- <url>http://maven.apache.org/mercury/</url>
-
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/MERCURY</url>
- </issueManagement>
-
- <ciManagement>
- <system>hudson</system>
- <url>http://grid.sonatype.org/ci/view/Mercury/job/mercury</url>
- </ciManagement>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/mercury/trunk/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/mercury/trunk/</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/mercury/trunk/</url>
- </scm>
-
</project>
Modified: maven/mercury/trunk/mercury-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/pom.xml (original)
+++ maven/mercury/trunk/mercury-artifact/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,9 +19,6 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>mercury-artifact</artifactId>
- <name>Mercury Artifact</name>
- <description />
<parent>
<groupId>org.apache.maven.mercury</groupId>
@@ -29,4 +26,7 @@
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
+ <artifactId>mercury-artifact</artifactId>
+
+ <name>Mercury Artifact</name>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml (original)
+++ maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,6 +19,7 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto</artifactId>
@@ -26,6 +27,6 @@
</parent>
<artifactId>mercury-crypto-api</artifactId>
- <name>Mercury Crypto APIs</name>
+ <name>Mercury Crypto APIs</name>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml (original)
+++ maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,8 +19,6 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>mercury-crypto-basic</artifactId>
- <name>Mercury Crypto Basics</name>
<parent>
<groupId>org.apache.maven.mercury</groupId>
@@ -28,8 +26,11 @@
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
+ <artifactId>mercury-crypto-basic</artifactId>
+
+ <name>Mercury Crypto Basics</name>
+
<dependencies>
-
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
@@ -44,7 +45,5 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-api</artifactId>
</dependency>
-
</dependencies>
-
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-crypto/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-crypto/pom.xml (original)
+++ maven/mercury/trunk/mercury-crypto/pom.xml Tue Dec 23 08:16:24 2008
@@ -18,7 +18,6 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -28,12 +27,12 @@
</parent>
<artifactId>mercury-crypto</artifactId>
- <name>Mercury Crypto</name>
<packaging>pom</packaging>
+ <name>Mercury Crypto</name>
+
<modules>
<module>mercury-crypto-api</module>
<module>mercury-crypto-basic</module>
</modules>
-
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-event/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-event/pom.xml (original)
+++ maven/mercury/trunk/mercury-event/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,21 +19,21 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
+
<artifactId>mercury-event</artifactId>
+
<name>Mercury Event Framework</name>
<dependencies>
-
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-logging</artifactId>
</dependency>
-
</dependencies>
-
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-external/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-external/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-external/pom.xml (original)
+++ maven/mercury/trunk/mercury-external/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,22 +19,23 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-external</artifactId>
- <name>Mercury External Dependencies</name>
- <description />
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
- <dependencies>
+ <groupId>org.apache.maven.mercury</groupId>
+
+ <artifactId>mercury-external</artifactId>
+
+ <name>Mercury External Dependencies</name>
+ <dependencies>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-artifact</artifactId>
</dependency>
-
</dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/pom.xml (original)
+++ maven/mercury/trunk/mercury-it/pom.xml Tue Dec 23 08:16:24 2008
@@ -27,6 +27,7 @@
</parent>
<artifactId>mercury-it</artifactId>
+
<name>Mercury Integration Tests</name>
<description>Mercury Integration Tests</description>
@@ -57,95 +58,9 @@
<nexus-base-url>${nexus-application-protocol}://${nexus-application-host}:${nexus-application-port}/${nexus-application-name}/</nexus-base-url>
<nexus-control-port>33002</nexus-control-port>
-
</properties>
- <build>
-
- <filters>
- <filter>src/test/filters/filter.txt</filter>
- </filters>
-
- <testResources>
-
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>pgp/**</exclude>
- <exclude>repo/**</exclude>
- </excludes>
- </testResource>
-
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>false</filtering>
- <includes>
- <include>pgp/**</include>
- <include>repo/**</include>
- </includes>
- </testResource>
-
- <testResource>
- <directory>src/test/nexus</directory>
- <filtering>false</filtering>
- <excludes>
- <exclude>work/conf/**</exclude>
- </excludes>
- <targetPath>../nexus-webapp-${nexus.version}/runtime</targetPath>
- </testResource>
-
- <testResource>
- <directory>src/test/nexus</directory>
- <filtering>true</filtering>
- <includes>
- <include>work/conf/**</include>
- </includes>
- <targetPath>../nexus-webapp-${nexus.version}/runtime</targetPath>
- </testResource>
-
- <testResource>
- <directory>src/test/nexus</directory>
- <filtering>false</filtering>
- <includes>
- <include>log4j.properties</include>
- </includes>
- <targetPath>../nexus-webapp-${nexus.version}/runtime/apps/nexus/conf</targetPath>
- </testResource>
-
- <testResource>
- <directory>src/test/nexus/conf</directory>
- <filtering>true</filtering>
- <targetPath>../nexus-webapp-${nexus.version}/conf</targetPath>
- </testResource>
-
- </testResources>
-
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- <executions>
- <execution>
- <id>unpack-bundle</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <includeArtifactIds>nexus-webapp</includeArtifactIds>
- <outputDirectory>${bundle-expanded-dir}</outputDirectory>
- <excludes>**/conf/plexus.properties</excludes>
- </configuration>
- </execution>
-
- </executions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
-
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-event</artifactId>
@@ -286,7 +201,88 @@
<artifactId>maven-mercury</artifactId>
<version>${maven.version}</version>
</dependency>
-
</dependencies>
+ <build>
+ <filters>
+ <filter>src/test/filters/filter.txt</filter>
+ </filters>
+
+ <testResources>
+
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>pgp/**</exclude>
+ <exclude>repo/**</exclude>
+ </excludes>
+ </testResource>
+
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>pgp/**</include>
+ <include>repo/**</include>
+ </includes>
+ </testResource>
+
+ <testResource>
+ <directory>src/test/nexus</directory>
+ <filtering>false</filtering>
+ <excludes>
+ <exclude>work/conf/**</exclude>
+ </excludes>
+ <targetPath>../nexus-webapp-${nexus.version}/runtime</targetPath>
+ </testResource>
+
+ <testResource>
+ <directory>src/test/nexus</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>work/conf/**</include>
+ </includes>
+ <targetPath>../nexus-webapp-${nexus.version}/runtime</targetPath>
+ </testResource>
+
+ <testResource>
+ <directory>src/test/nexus</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>log4j.properties</include>
+ </includes>
+ <targetPath>../nexus-webapp-${nexus.version}/runtime/apps/nexus/conf</targetPath>
+ </testResource>
+
+ <testResource>
+ <directory>src/test/nexus/conf</directory>
+ <filtering>true</filtering>
+ <targetPath>../nexus-webapp-${nexus.version}/conf</targetPath>
+ </testResource>
+
+ </testResources>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ <executions>
+ <execution>
+ <id>unpack-bundle</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <configuration>
+ <includeArtifactIds>nexus-webapp</includeArtifactIds>
+ <outputDirectory>${bundle-expanded-dir}</outputDirectory>
+ <excludes>**/conf/plexus.properties</excludes>
+ </configuration>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/mercury/trunk/mercury-logging/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-logging/pom.xml (original)
+++ maven/mercury/trunk/mercury-logging/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,12 +19,14 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
+
<artifactId>mercury-logging</artifactId>
- <name>Mercury Logging</name>
+ <name>Mercury Logging</name>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-maven-plugin/pom.xml Tue Dec 23 08:16:24 2008
@@ -29,23 +29,11 @@
<groupId>org.sonatype.maven.plugins</groupId>
<artifactId>mercury-compare-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
+
<name>Mercury Maven resolution comparison</name>
<description>Mercury Maven resolution comparison</description>
- <prerequisites />
-
<inceptionYear>2008</inceptionYear>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
<developers>
<developer>
<name>Oleg Gusakov</name>
@@ -56,13 +44,12 @@
<timezone>-8</timezone>
</developer>
</developers>
-
+
<properties>
<test.maven.version>2.0.9</test.maven.version>
</properties>
<dependencies>
-
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
@@ -86,6 +73,18 @@
<artifactId>jetty-maven-plugin</artifactId>
<version>7.0.0.pre5</version>
</dependency>
-
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-mdo/pom.xml Tue Dec 23 08:16:24 2008
@@ -20,16 +20,33 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>mercury-compare-mdo</artifactId>
- <name>Mercury Compare MDO</name>
- <description />
-
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-pom</artifactId>
<version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
-
+
+ <artifactId>mercury-compare-mdo</artifactId>
+ <name>Mercury Compare MDO</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-artifact</artifactId>
+ </dependency>
+
+ <!-- for some reason transitive does not work - have to copy deps from mercury-util -->
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-util</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -60,26 +77,6 @@
</executions>
</plugin>
-</plugins>
-</build>
- <dependencies>
-
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-lang</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-artifact</artifactId>
- </dependency>
-
- <!-- for some reason transitive does not work - have to copy deps from mercury-util -->
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-util</artifactId>
- </dependency>
-
- </dependencies>
-
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml (original)
+++ maven/mercury/trunk/mercury-maven/mercury-compare-mercury/pom.xml Tue Dec 23 08:16:24 2008
@@ -28,30 +28,11 @@
<groupId>org.sonatype.maven.plugins</groupId>
<artifactId>mercury-compare-mercury</artifactId>
-
<packaging>maven-plugin</packaging>
+
<name>Mercury Maven resolusion comparisson</name>
<description>Mercury Maven resolusion comparisson</description>
- <prerequisites />
-
-
- <properties>
- <maven.version>3.0-SNAPSHOT</maven.version>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<developers>
<developer>
<name>Oleg Gusakov</name>
@@ -62,7 +43,11 @@
<timezone>-8</timezone>
</developer>
</developers>
-
+
+ <properties>
+ <maven.version>3.0-SNAPSHOT</maven.version>
+ </properties>
+
<dependencies>
<dependency>
@@ -86,7 +71,19 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-remote-m2</artifactId>
</dependency>
-
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,32 +19,16 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>mercury-md-sat</artifactId>
- <name>Mercury Dependency Builder</name>
- <description />
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>package-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <artifactId>mercury-md-sat</artifactId>
- </build>
+ <name>Mercury Dependency Builder</name>
<dependencies>
<!-- SAT solver used to calculate viable ranges when dependencies are expressed pseudo boolean form -->
@@ -93,6 +77,22 @@
<artifactId>mercury-repo-remote-m2</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package-tests</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,10 +19,6 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-md-shared</artifactId>
- <name>Mercury Shared Metadata</name>
- <description />
<parent>
<groupId>org.apache.maven.mercury</groupId>
@@ -30,6 +26,38 @@
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-md-shared</artifactId>
+
+ <name>Mercury Shared Metadata</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-artifact</artifactId>
+ </dependency>
+
+ <!--
+ | for some reason transitive does not work - have to copy deps from mercury-util
+ | but it works fine under m2eclipse
+ -->
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-util</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-crypto-basic</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -75,34 +103,4 @@
</plugin>
</plugins>
</build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-artifact</artifactId>
- </dependency>
-
- <!--
- | for some reason transitive does not work - have to copy deps from mercury-util
- | but it works fine under m2eclipse
- -->
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-util</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-crypto-basic</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
-
- </dependencies>
-
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-md/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,13 +19,16 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
+
<artifactId>mercury-md</artifactId>
<packaging>pom</packaging>
+
<name>Mercury Metadata</name>
<modules>
@@ -34,7 +37,6 @@
</modules>
<dependencies>
-
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-logging</artifactId>
@@ -44,7 +46,5 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-event</artifactId>
</dependency>
-
</dependencies>
-
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-plexus/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/pom.xml (original)
+++ maven/mercury/trunk/mercury-plexus/pom.xml Tue Dec 23 08:16:24 2008
@@ -29,41 +29,7 @@
<artifactId>mercury-plexus</artifactId>
<name>Mercury Plexus Component</name>
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-metadata</artifactId>
- </plugin>
-
- <!-- had to move all tests to IT: http://jira.codehaus.org/browse/MERCURY-47 -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
-
- <executions>
- <execution>
- <id>test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>true</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-
<dependencies>
-
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
@@ -98,7 +64,39 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-component-annotations</artifactId>
</dependency>
-
</dependencies>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-metadata</artifactId>
+ </plugin>
+
+ <!-- had to move all tests to IT: http://jira.codehaus.org/browse/MERCURY-47 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
</project>
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,10 +19,6 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-api</artifactId>
- <name>Mercury Repository APIs</name>
- <description>Repository APIs</description>
<parent>
<groupId>org.apache.maven.mercury</groupId>
@@ -30,8 +26,13 @@
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
- <dependencies>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-api</artifactId>
+
+ <name>Mercury Repository APIs</name>
+ <description>Repository APIs</description>
+ <dependencies>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-artifact</artifactId>
@@ -56,6 +57,5 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-shared</artifactId>
</dependency>
-
</dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-cache-fs/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,15 +19,25 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.mercury</groupId>
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
+
+ <groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-cache-fs</artifactId>
+
<name>Mercury Repository FS Cache</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-api</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -55,14 +65,4 @@
</plugin>
</plugins>
</build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-api</artifactId>
- </dependency>
-
- </dependencies>
-
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-flat/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,18 +19,19 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-repo-local-flat</artifactId>
- <name>Mercury Local Flat Repository</name>
-
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-local-flat</artifactId>
+
+ <name>Mercury Local Flat Repository</name>
+
<dependencies>
-
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-api</artifactId>
@@ -57,7 +58,5 @@
<artifactId>mercury-crypto-basic</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
-
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/pom.xml Tue Dec 23 08:16:24 2008
@@ -20,18 +20,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>mercury-repo-local-m2</artifactId>
- <name>Mercury Local M2 Repository</name>
- <description />
-
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
+ <artifactId>mercury-repo-local-m2</artifactId>
+
+ <name>Mercury Local M2 Repository</name>
+
<dependencies>
-
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-api</artifactId>
@@ -58,7 +57,5 @@
<artifactId>commons-digester</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
-
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-remote-m2/pom.xml Tue Dec 23 08:16:24 2008
@@ -20,18 +20,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>mercury-repo-remote-m2</artifactId>
- <name>Mercury Remote M2 Repository</name>
- <description />
-
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
+ <artifactId>mercury-repo-remote-m2</artifactId>
+
+ <name>Mercury Remote M2 Repository</name>
+
<dependencies>
-
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-api</artifactId>
@@ -51,7 +50,5 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
</dependency>
-
</dependencies>
-
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml Tue Dec 23 08:16:24 2008
@@ -20,17 +20,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>mercury-repo-virtual</artifactId>
-
- <name>Mercury Virtual Repository</name>
- <description />
-
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
+ <artifactId>mercury-repo-virtual</artifactId>
+
+ <name>Mercury Virtual Repository</name>
<!-- had to move all tests to IT: http://jira.codehaus.org/browse/MERCURY-47
<build>
@@ -61,9 +59,7 @@
</build>
-->
-
<dependencies>
-
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-cache-fs</artifactId>
@@ -88,6 +84,5 @@
<artifactId>mercury-repo-remote-m2</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-repo/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,13 +19,16 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
+
<artifactId>mercury-repo</artifactId>
<packaging>pom</packaging>
+
<name>Mercury Repository</name>
<modules>
@@ -38,12 +41,9 @@
</modules>
<dependencies>
-
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-logging</artifactId>
</dependency>
-
</dependencies>
-
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,22 +19,22 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>mercury-transport-api</artifactId>
- <name>Mercury Transport APIs</name>
- <description>Mercury transport APIs</description>
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
- <dependencies>
+ <artifactId>mercury-transport-api</artifactId>
+ <name>Mercury Transport APIs</name>
+ <description>Mercury transport APIs</description>
+
+ <dependencies>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-api</artifactId>
</dependency>
-
</dependencies>
-
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-file/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-file/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-file/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-file/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,38 +19,17 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>mercury-transport-file</artifactId>
- <name>Mercury File Transport</name>
- <description />
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>package-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- </build>
-
-
+ <artifactId>mercury-transport-file</artifactId>
+ <name>Mercury File Transport</name>
<dependencies>
-
<!-- Mercury Dependencies -->
<dependency>
<groupId>org.apache.maven.mercury</groupId>
@@ -66,7 +45,23 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-util</artifactId>
</dependency>
-
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package-tests</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ </build>
</project>
Modified: maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,36 +19,19 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>mercury-transport-http</artifactId>
- <name>Mercury Jetty HTTP Transport</name>
- <description />
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
- <build>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>package-tests</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ <artifactId>mercury-transport-http</artifactId>
- </build>
+ <name>Mercury Jetty HTTP Transport</name>
+ <description />
<dependencies>
-
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-client</artifactId>
@@ -76,7 +59,22 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
</dependency>
-
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>package-tests</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/mercury/trunk/mercury-transport/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,13 +19,16 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
+
<artifactId>mercury-transport</artifactId>
<packaging>pom</packaging>
+
<name>Mercury Transport</name>
<modules>
@@ -35,12 +38,9 @@
</modules>
<dependencies>
-
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-logging</artifactId>
</dependency>
-
</dependencies>
-
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-util/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/pom.xml (original)
+++ maven/mercury/trunk/mercury-util/pom.xml Tue Dec 23 08:16:24 2008
@@ -19,14 +19,39 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
+
<artifactId>mercury-util</artifactId>
+
<name>Mercury Shared Utilities</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-logging</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-crypto-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-crypto-basic</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
@@ -81,29 +106,4 @@
</plugins>
</build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-logging</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-crypto-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-crypto-basic</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
-
- </dependencies>
-
</project>
\ No newline at end of file
Modified: maven/mercury/trunk/mercury-wagon/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-wagon/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-wagon/pom.xml (original)
+++ maven/mercury/trunk/mercury-wagon/pom.xml Tue Dec 23 08:16:24 2008
@@ -18,17 +18,26 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
<version>1.0.0-alpha-3-SNAPSHOT</version>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>mercury-wagon</artifactId>
+
<name>Mercury Wagon provider</name>
+ <distributionManagement>
+ <snapshotRepository>
+ <id>${distMgmtSnapshotsId}</id>
+ <name>${distMgmtSnapshotsName}</name>
+ <url>${distMgmtSnapshotsUrl}</url>
+ </snapshotRepository>
+ </distributionManagement>
+
<properties>
<mercury.version>${project.version}</mercury.version>
@@ -38,17 +47,40 @@
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ </dependency>
- <distributionManagement>
- <snapshotRepository>
- <id>${distMgmtSnapshotsId}</id>
- <name>${distMgmtSnapshotsName}</name>
- <url>${distMgmtSnapshotsUrl}</url>
- </snapshotRepository>
- </distributionManagement>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-test</artifactId>
+ <scope>test</scope>
+ </dependency>
- <build>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-transport-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-util</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
<resources>
<resource>
<directory>src/main/java</directory>
@@ -104,39 +136,4 @@
</plugins>
</build>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-provider-test</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-transport-http</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-util</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
-
- </dependencies>
</project>
Modified: maven/mercury/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/pom.xml?rev=729022&r1=729021&r2=729022&view=diff
==============================================================================
--- maven/mercury/trunk/pom.xml (original)
+++ maven/mercury/trunk/pom.xml Tue Dec 23 08:16:24 2008
@@ -18,6 +18,7 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven</groupId>
@@ -25,13 +26,14 @@
<version>10</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
+ <version>1.0.0-alpha-3-SNAPSHOT</version>
<packaging>pom</packaging>
+
<name>Mercury</name>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
<description>Maven Mercury is a replacement for the Maven Artifact subsystem, and a complete replacement for the HTTP/HTTPS/DAV/DAVS portions of the existing transport.</description>
+ <url>http://maven.apache.org/mercury/</url>
<developers>
<developer>
@@ -65,41 +67,34 @@
<module>mercury-wagon</module>
</modules>
- <properties>
-
- <plexus.appbooter.version>1.4</plexus.appbooter.version>
- <plexus.container.version>1.0-beta-3.0.1</plexus.container.version>
- <plexus.component.annotations.version>1.0-beta-3.0.1</plexus.component.annotations.version>
- <classworlds.version>1.3</classworlds.version>
- <plexus.utils.version>1.5.5</plexus.utils.version>
- <plexus.lang.version>1.1</plexus.lang.version>
- <plexus.component.metadata.version>1.0-beta-3.0.1</plexus.component.metadata.version>
-
- <commons.digester.version>1.8</commons.digester.version>
- <commons.cli.version>1.1</commons.cli.version>
-
- <jetty.version>6.1.12</jetty.version>
- <junit.version>3.8.1</junit.version>
- <bouncy.castle.version>140</bouncy.castle.version>
- <sat4j.version>2.0.4</sat4j.version>
-
- <!-- mercury-wagon -->
- <wagon.provider.api.version>1.0-beta-4</wagon.provider.api.version>
-
- <distMgmtReleasesId>apache.releases</distMgmtReleasesId>
- <distMgmtReleasesName>Apache Releases</distMgmtReleasesName>
- <distMgmtReleasesUrl>scp://people.apache.org/www/people.apache.org/repo/m2-release-repository</distMgmtReleasesUrl>
-
- <distMgmtSnapshotsId>apache.snapshots</distMgmtSnapshotsId>
- <distMgmtSnapshotsName>Apache Snapshots</distMgmtSnapshotsName>
- <distMgmtSnapshotsUrl>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</distMgmtSnapshotsUrl>
-
-
- </properties>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/mercury/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/mercury/trunk/</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/mercury/trunk/</url>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/MERCURY</url>
+ </issueManagement>
+ <ciManagement>
+ <system>hudson</system>
+ <url>http://grid.sonatype.org/ci/view/Mercury/job/mercury</url>
+ </ciManagement>
+ <distributionManagement>
+ <repository>
+ <id>${distMgmtReleasesId}</id>
+ <name>${distMgmtReleasesName}</name>
+ <url>${distMgmtReleasesUrl}</url>
+ </repository>
+ <snapshotRepository>
+ <id>${distMgmtSnapshotsId}</id>
+ <name>${distMgmtSnapshotsName}</name>
+ <url>${distMgmtSnapshotsUrl}</url>
+ </snapshotRepository>
+ </distributionManagement>
<dependencyManagement>
<dependencies>
-
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
@@ -331,14 +326,9 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
-
</dependencies>
-
</dependencyManagement>
-
-
<dependencies>
-
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-lang</artifactId>
@@ -355,10 +345,36 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
-
</dependencies>
+ <properties>
+ <plexus.appbooter.version>1.4</plexus.appbooter.version>
+ <plexus.container.version>1.0-beta-3.0.1</plexus.container.version>
+ <plexus.component.annotations.version>1.0-beta-3.0.1</plexus.component.annotations.version>
+ <classworlds.version>1.3</classworlds.version>
+ <plexus.utils.version>1.5.5</plexus.utils.version>
+ <plexus.lang.version>1.1</plexus.lang.version>
+ <plexus.component.metadata.version>1.0-beta-3.0.1</plexus.component.metadata.version>
+
+ <commons.digester.version>1.8</commons.digester.version>
+ <commons.cli.version>1.1</commons.cli.version>
+
+ <jetty.version>6.1.12</jetty.version>
+ <junit.version>3.8.1</junit.version>
+ <bouncy.castle.version>140</bouncy.castle.version>
+ <sat4j.version>2.0.4</sat4j.version>
+
+ <!-- mercury-wagon -->
+ <wagon.provider.api.version>1.0-beta-4</wagon.provider.api.version>
+
+ <distMgmtReleasesId>apache.releases</distMgmtReleasesId>
+ <distMgmtReleasesName>Apache Releases</distMgmtReleasesName>
+ <distMgmtReleasesUrl>scp://people.apache.org/www/people.apache.org/repo/m2-release-repository</distMgmtReleasesUrl>
+ <distMgmtSnapshotsId>apache.snapshots</distMgmtSnapshotsId>
+ <distMgmtSnapshotsName>Apache Snapshots</distMgmtSnapshotsName>
+ <distMgmtSnapshotsUrl>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</distMgmtSnapshotsUrl>
+ </properties>
<build>
<defaultGoal>install</defaultGoal>
@@ -472,7 +488,6 @@
</executions>
</plugin>
</plugins>
-
</build>
<profiles>
@@ -605,36 +620,4 @@
</reporting>
</profile>
</profiles>
-
- <distributionManagement>
- <repository>
- <id>${distMgmtReleasesId}</id>
- <name>${distMgmtReleasesName}</name>
- <url>${distMgmtReleasesUrl}</url>
- </repository>
- <snapshotRepository>
- <id>${distMgmtSnapshotsId}</id>
- <name>${distMgmtSnapshotsName}</name>
- <url>${distMgmtSnapshotsUrl}</url>
- </snapshotRepository>
- </distributionManagement>
-
- <url>http://maven.apache.org/mercury/</url>
-
- <issueManagement>
- <system>jira</system>
- <url>http://jira.codehaus.org/browse/MERCURY</url>
- </issueManagement>
-
- <ciManagement>
- <system>hudson</system>
- <url>http://grid.sonatype.org/ci/view/Mercury/job/mercury</url>
- </ciManagement>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/mercury/trunk/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/mercury/trunk/</developerConnection>
- <url>http://svn.apache.org/viewvc/maven/mercury/trunk/</url>
- </scm>
-
</project>