Author: ogusakov
Date: Tue Oct 21 16:49:06 2008
New Revision: 706814
URL: http://svn.apache.org/viewvc?rev=706814&view=rev
Log:
rearranged POM versioning
Modified:
maven/mercury/trunk/mercury-artifact/pom.xml
maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml
maven/mercury/trunk/mercury-crypto/pom.xml
maven/mercury/trunk/mercury-external/pom.xml
maven/mercury/trunk/mercury-it/pom.xml
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
maven/mercury/trunk/mercury-md/pom.xml
maven/mercury/trunk/mercury-pom/pom.xml
maven/mercury/trunk/mercury-repo/mercury-repo-local-m2/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
Modified: maven/mercury/trunk/mercury-artifact/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/pom.xml?rev=706814&r1=706813&r2=706814&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/pom.xml (original)
+++ maven/mercury/trunk/mercury-artifact/pom.xml Tue Oct 21 16:49:06 2008
@@ -1,14 +1,13 @@
<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>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
<name>Mercury Artifact: ${project.version}</name>
<description />
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-pom</artifactId>
- <version>1-alpha-2-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
</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=706814&r1=706813&r2=706814&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml (original)
+++ maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml Tue Oct 21
16:49:06 2008
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-api</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: maven/mercury/trunk/mercury-crypto/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/pom.xml?rev=706814&r1=706813&r2=706814&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-crypto/pom.xml (original)
+++ maven/mercury/trunk/mercury-crypto/pom.xml Tue Oct 21 16:49:06 2008
@@ -5,13 +5,12 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-pom</artifactId>
- <version>1-alpha-2-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-crypto</artifactId>
<name>Mercury Crypto Reactor: ${project.version}</name>
<packaging>pom</packaging>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
<modules>
<module>mercury-crypto-api</module>
Modified: maven/mercury/trunk/mercury-external/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-external/pom.xml?rev=706814&r1=706813&r2=706814&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-external/pom.xml (original)
+++ maven/mercury/trunk/mercury-external/pom.xml Tue Oct 21 16:49:06 2008
@@ -3,18 +3,17 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-external</artifactId>
<name>Mercury External Dependencies: ${project.version}</name>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
<description />
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-pom</artifactId>
- <version>1-alpha-2-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-artifact</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</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=706814&r1=706813&r2=706814&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/pom.xml (original)
+++ maven/mercury/trunk/mercury-it/pom.xml Tue Oct 21 16:49:06 2008
@@ -3,14 +3,15 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-pom</artifactId>
- <version>1-alpha-2-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-it</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
<name>Mercury Integration Tests: ${project.version}</name>
<description>Mercury Integration Tests</description>
<properties>
+ <mercury.version>1.0.0-alpha-2-SNAPSHOT</mercury.version>
+ <maven.version>3.0-SNAPSHOT</maven.version>
<plexus.appbooter.version>1.4</plexus.appbooter.version>
<plexus.container.version>1.0-alpha-47</plexus.container.version>
<nexus.version>1.0.1</nexus.version>
@@ -240,13 +241,13 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-mercury</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>${maven.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-sat</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${mercury.version}</version>
</dependency>
</dependencies>
Modified:
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java?rev=706814&r1=706813&r2=706814&view=diff
==============================================================================
---
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
(original)
+++
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/dependency/tests/DependencyTreeBuilderTest.java
Tue Oct 21 16:49:06 2008
@@ -75,6 +75,12 @@
super.tearDown();
}
//----------------------------------------------------------------------------------------------
+ public void testDummy()
+ throws MetadataTreeException
+ {
+
+ }
+
//----------------------------------------------------------------------------------------------
public void ntestResolveConflicts()
throws MetadataTreeException
{
Modified: maven/mercury/trunk/mercury-md/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/pom.xml?rev=706814&r1=706813&r2=706814&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/pom.xml Tue Oct 21 16:49:06 2008
@@ -4,12 +4,11 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-pom</artifactId>
- <version>1-alpha-2-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-md</artifactId>
<packaging>pom</packaging>
<name>Mercury Metadata Reactor: ${project.version}</name>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
<modules>
<module>mercury-md-sat</module>
Modified: maven/mercury/trunk/mercury-pom/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-pom/pom.xml?rev=706814&r1=706813&r2=706814&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-pom/pom.xml (original)
+++ maven/mercury/trunk/mercury-pom/pom.xml Tue Oct 21 16:49:06 2008
@@ -9,24 +9,8 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-pom</artifactId>
- <version>1-alpha-2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Mercury parent POM: ${project.version}</name>
-
- <properties>
- <distMgmtSnapshotsId>apache.snapshots</distMgmtSnapshotsId>
- <distMgmtSnapshotsName>Apache Development Snapshot
Repository</distMgmtSnapshotsName>
-
<distMgmtSnapshotsUrl>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</distMgmtSnapshotsUrl>
-
- <mercury.version>1.0.0-alpha-2-SNAPSHOT</mercury.version>
-
- <mercury.version.artifact>1.0.0-alpha-2-SNAPSHOT</mercury.version.artifact>
- <mercury.version.crypto>1.0.0-alpha-2-SNAPSHOT</mercury.version.crypto>
- <mercury.version.md>1.0.0-alpha-2-SNAPSHOT</mercury.version.md>
- <mercury.version.repo>1.0.0-alpha-2-SNAPSHOT</mercury.version.repo>
-
<mercury.version.transport>1.0.0-alpha-2-SNAPSHOT</mercury.version.transport>
-
- </properties>
<issueManagement>
<system>jira</system>
@@ -56,51 +40,51 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-api</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-api</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-http</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-api</artifactId>
- <version>${mercury.version.md}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-sat</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-api</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-remote-m2</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
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=706814&r1=706813&r2=706814&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 Oct 21
16:49:06 2008
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-api</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
@@ -24,17 +24,17 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-shared</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-util</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: maven/mercury/trunk/mercury-repo/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/pom.xml?rev=706814&r1=706813&r2=706814&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/pom.xml Tue Oct 21 16:49:06 2008
@@ -4,12 +4,11 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-pom</artifactId>
- <version>1-alpha-2-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-repo</artifactId>
<packaging>pom</packaging>
<name>Mercury Repository Reactor: ${project.version}</name>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
<modules>
<module>mercury-repo-api</module>
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=706814&r1=706813&r2=706814&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml
(original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml Tue Oct
21 16:49:06 2008
@@ -12,7 +12,7 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-api</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
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=706814&r1=706813&r2=706814&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-file/pom.xml
(original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-file/pom.xml Tue
Oct 21 16:49:06 2008
@@ -35,17 +35,17 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-api</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-util</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
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=706814&r1=706813&r2=706814&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml
(original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml Tue
Oct 21 16:49:06 2008
@@ -52,12 +52,12 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-api</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
Modified: maven/mercury/trunk/mercury-transport/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/pom.xml?rev=706814&r1=706813&r2=706814&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/pom.xml Tue Oct 21 16:49:06 2008
@@ -4,12 +4,11 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-pom</artifactId>
- <version>1-alpha-2-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-transport</artifactId>
<packaging>pom</packaging>
<name>Mercury Transport Reactor: ${project.version}</name>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
<modules>
<module>mercury-transport-api</module>
Modified: maven/mercury/trunk/mercury-util/pom.xml
URL:
http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/pom.xml?rev=706814&r1=706813&r2=706814&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/pom.xml (original)
+++ maven/mercury/trunk/mercury-util/pom.xml Tue Oct 21 16:49:06 2008
@@ -3,10 +3,9 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-pom</artifactId>
- <version>1-alpha-2-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-util</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
<name>Mercury Shared Utilities: ${project.version}</name>
<build>
@@ -69,13 +68,13 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-api</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
- <version>1.0.0-alpha-2-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
