Author: ogusakov
Date: Thu Aug 14 13:34:28 2008
New Revision: 686023
URL: http://svn.apache.org/viewvc?rev=686023&view=rev
Log:
renamed to 1.0.0-alpha-1-SNAPSHOT
Added:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Test.java
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/1/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/1/a-1.pom
(props changed)
- copied unchanged from r685025,
maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/src/test/resources/controlledRepo/a/a/1/a-1.pom
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/2/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/2/a-2.pom
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/3/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/3/a-3.pom
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/4/
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/4/a-4.pom
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/maven-metadata.xml
Modified:
maven/sandbox/trunk/mercury/mercury-artifact/pom.xml
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java
maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/VersionRangeTest.java
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-api/pom.xml
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/pom.xml
maven/sandbox/trunk/mercury/mercury-crypto/pom.xml
maven/sandbox/trunk/mercury/mercury-external/pom.xml
maven/sandbox/trunk/mercury/mercury-it/pom.xml
maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml
maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml
maven/sandbox/trunk/mercury/mercury-md/pom.xml
maven/sandbox/trunk/mercury/mercury-pom/pom.xml
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/pom.xml
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/pom.xml
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/pom.xml
maven/sandbox/trunk/mercury/mercury-repo/pom.xml
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/pom.xml
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/pom.xml
maven/sandbox/trunk/mercury/mercury-transport/pom.xml
maven/sandbox/trunk/mercury/pom.xml
Modified: maven/sandbox/trunk/mercury/mercury-artifact/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-artifact/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-artifact/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-artifact/pom.xml Thu Aug 14 13:34:28
2008
@@ -1,8 +1,8 @@
<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-SNAPSHOT</version>
- <name>Mercury Artifact</name>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
+ <name>Mercury Artifact: ${project.version}</name>
<description/>
<parent>
Modified:
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/ArtifactBasicMetadata.java
Thu Aug 14 13:34:28 2008
@@ -83,6 +83,9 @@
if( count > 4 )
this.type = nullify( tokens[4] );
+
+ if( this.type == null || this.type.length() < 1 )
+ this.type = DEFAULT_ARTIFACT_TYPE;
}
//------------------------------------------------------------------
/**
@@ -151,7 +154,7 @@
@Override
public String toString()
{
- return nvl(groupId) + ":" + nvl(artifactId) + ":" + nvl(version) + ":" +
nvl(classifier) + ":" + nvl(type);
+ return nvl(groupId) + ":" + nvl(artifactId) + ":" + nvl(version) + ":" +
nvl(classifier) + ":" + nvl(type,DEFAULT_ARTIFACT_TYPE);
}
public String toDomainString()
@@ -334,6 +337,9 @@
if( obj == null || !( obj instanceof ArtifactBasicMetadata ) )
return false;
+ String me = toString();
+ String him = obj.toString();
+
return toString().equals( obj.toString() );
}
Modified:
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-artifact/src/main/java/org/apache/maven/mercury/artifact/version/VersionRange.java
Thu Aug 14 13:34:28 2008
@@ -1,5 +1,7 @@
package org.apache.maven.mercury.artifact.version;
+import org.apache.maven.mercury.artifact.Artifact;
+
/**
* Single range implementation, similar to OSGi specification:
*
@@ -53,6 +55,9 @@
if( sFromT != null && sFromT.length() > 0 )
{
checkForValidCharacters( sFromT );
+// TODO og: look for snapshots
+// if( sFromT.indexOf( Artifact.SNAPSHOT_VERSION ) != -1 )
+// throw new VersionException();
_fromVersion = new DefaultArtifactVersion( sFromT );
}
}
Modified:
maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/VersionRangeTest.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/VersionRangeTest.java?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/VersionRangeTest.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-artifact/src/test/java/org/apache/maven/mercury/artifact/version/VersionRangeTest.java
Thu Aug 14 13:34:28 2008
@@ -10,40 +10,57 @@
public class VersionRangeTest
extends TestCase
{
- private static final String rangeS = "[ 1.2.3 , 2.0.0 )";
VersionRange range;
- private static final String rangeSE = "[ 1.2.3 , )";
- VersionRange rangeE;
-
- protected void setUp() throws Exception
+ public void testSimple()
+ throws VersionException
{
- range = new VersionRange(rangeS);
- rangeE = new VersionRange(rangeSE);
- }
+ String rangeS = "[ 1.2.3 , 2.0.0 )";
+ range = new VersionRange( rangeS );
- protected void tearDown() throws Exception
- {
+ assertTrue( "1.2.4 did not match the range "+rangeS, range.includes(
"1.2.4" ) );
+ assertTrue( "1.3.1 did not match the range "+rangeS, range.includes(
"1.3.1" ) );
+ assertTrue( "1.2.3 did not match the range "+rangeS, range.includes(
"1.2.3" ) );
+ assertFalse( "1.2.2 did matches the range "+rangeS, range.includes(
"1.2.2" ) );
+ assertFalse( "2.0.0 did matches the range "+rangeS, range.includes(
"2.0.0" ) );
+ assertFalse( "3.1.0 did matches the range "+rangeS, range.includes(
"3.1.0" ) );
}
- public void testSimple()
+ public void testEternity()
+ throws VersionException
{
- assert range.includes( "1.2.4" ) : "1.2.4 did not match the range
"+rangeS;
- assert range.includes( "1.3.1" ) : "1.3.1 did not match the range
"+rangeS;
- assert range.includes( "1.2.3" ) : "1.2.3 did not match the range
"+rangeS;
- assert ! range.includes( "1.2.2" ) : "1.2.2 did matches the range
"+rangeS;
- assert ! range.includes( "2.0.0" ) : "2.0.0 did matches the range
"+rangeS;
- assert ! range.includes( "3.1.0" ) : "3.1.0 did matches the range
"+rangeS;
+ String rangeS = "[ 1.2.3 , )";
+ range = new VersionRange( rangeS );
+
+ assertTrue( "1.2.4 did not match the range "+rangeS, range.includes(
"1.2.4" ) );
+ assertTrue( "1.3.1 did not match the range "+rangeS, range.includes(
"1.3.1" ) );
+ assertTrue( "1.2.3 did not match the range "+rangeS, range.includes(
"1.2.3" ) );
+ assertFalse( "1.2.2 does matches the range "+rangeS, range.includes(
"1.2.2" ) );
+ assertTrue( "2.0.0 does matches the range "+rangeS, range.includes(
"2.0.0" ) );
+ assertTrue( "3.1.0 does matches the range "+rangeS, range.includes(
"3.1.0" ) );
}
- public void testEternity()
+ public void test6Digits()
+ throws VersionException
+ {
+ String rangeS = "[ 1.0.0.1.2.1 , )";
+ range = new VersionRange( rangeS );
+
+ assertTrue( "1.0.0.1.2.1 did not match the range "+rangeS,
range.includes( "1.0.0.1.2.1" ) );
+ assertTrue( "1.0.0.1.2.2 did not match the range "+rangeS,
range.includes( "1.0.0.1.2.2" ) );
+ assertTrue( "1.0.0.1.3.0 did not match the range "+rangeS,
range.includes( "1.0.0.1.3.0" ) );
+ assertFalse( "1.0.0.1.2.0 does matches the range "+rangeS,
range.includes( "1.0.0.1.2.0" ) );
+ assertFalse( "1.0.0.1.2.1-alpha-1 does match the range "+rangeS,
range.includes( "1.0.0.1.2.1-alpha-1" ) );
+ assertTrue( "1.0.0.1.2.2-alpha-1 does not match the range "+rangeS,
range.includes( "1.0.0.1.2.2-alpha-1" ) );
+ }
+
+ public void testAlphaNumeric()
+ throws VersionException
{
- assert rangeE.includes( "1.2.4" ) : "1.2.4 did not match the range
"+rangeS;
- assert rangeE.includes( "1.3.1" ) : "1.3.1 did not match the range
"+rangeS;
- assert rangeE.includes( "1.2.3" ) : "1.2.3 did not match the range
"+rangeS;
- assert ! rangeE.includes( "1.2.2" ) : "1.2.2 does matches the range
"+rangeS;
- assert rangeE.includes( "2.0.0" ) : "2.0.0 does matches the range
"+rangeS;
- assert rangeE.includes( "3.1.0" ) : "3.1.0 does matches the range
"+rangeS;
+ String rangeS = "[1.0.0.0.22,)";
+ range = new VersionRange( rangeS );
+
+ assertFalse( "1.0.0.0.9 does match the range "+rangeS, range.includes(
"1.0.0.0.9" ) );
}
}
Modified: maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-api/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-api/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-api/pom.xml
(original)
+++ maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-api/pom.xml Thu
Aug 14 13:34:28 2008
@@ -3,10 +3,10 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</parent>
<artifactId>mercury-crypto-api</artifactId>
- <name>Mercury Crypto APIs</name>
+ <name>Mercury Crypto APIs: ${project.version}</name>
</project>
\ No newline at end of file
Modified:
maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/pom.xml
(original)
+++ maven/sandbox/trunk/mercury/mercury-crypto/mercury-crypto-basic/pom.xml Thu
Aug 14 13:34:28 2008
@@ -1,12 +1,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>
<artifactId>mercury-crypto-basic</artifactId>
- <name>Mercury Crypto PGP implementation</name>
+ <name>Mercury Crypto Basics: ${project.version}</name>
+
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</parent>
+
<dependencies>
<dependency>
<groupId>bouncycastle</groupId>
@@ -21,7 +23,7 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: maven/sandbox/trunk/mercury/mercury-crypto/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-crypto/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-crypto/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-crypto/pom.xml Thu Aug 14 13:34:28 2008
@@ -1,18 +1,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-pom</artifactId>
<version>1-SNAPSHOT</version>
</parent>
+
<artifactId>mercury-crypto</artifactId>
- <name>Mercury Crypto Components Reactor</name>
+ <name>Mercury Crypto Reactor: ${project.version}</name>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
<modules>
- <module>mercury-crypto-api</module>
- <module>mercury-crypto-basic</module>
+ <module>mercury-crypto-api</module>
+ <module>mercury-crypto-basic</module>
</modules>
</project>
\ No newline at end of file
Modified: maven/sandbox/trunk/mercury/mercury-external/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-external/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-external/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-external/pom.xml Thu Aug 14 13:34:28
2008
@@ -2,8 +2,8 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-external</artifactId>
- <name>Mercury External Dependencies</name>
- <version>1.0.0-SNAPSHOT</version>
+ <name>Mercury External Dependencies: ${project.version}</name>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
<description/>
<parent>
<groupId>org.apache.maven.mercury</groupId>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-artifact</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: maven/sandbox/trunk/mercury/mercury-it/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-it/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-it/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-it/pom.xml Thu Aug 14 13:34:28 2008
@@ -6,7 +6,8 @@
<version>1-SNAPSHOT</version>
</parent>
<artifactId>mercury-it</artifactId>
- <name>Mercury Integration Tests</name>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
+ <name>Mercury Integration Tests: ${project.version}</name>
<description>Mercury Integration Tests</description>
</project>
\ No newline at end of file
Modified: maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-md/mercury-md-sat/pom.xml Thu Aug 14
13:34:28 2008
@@ -2,13 +2,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-sat</artifactId>
- <name>Mercury dependency calulator</name>
+ <name>Mercury Dependency Builder: ${project.version}</name>
<version>1.0.0-SNAPSHOT</version>
<description/>
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</parent>
<build>
@@ -50,38 +50,38 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-shared</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</dependency>
<!-- test deps -->
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-remote-m2</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-transport-http</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.mercury</groupId>
- <artifactId>mercury-transport-http</artifactId>
- <classifier>tests</classifier>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-transport-http</artifactId>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-transport-http</artifactId>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-md/mercury-md-shared/pom.xml Thu Aug 14
13:34:28 2008
@@ -2,14 +2,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-shared</artifactId>
- <name>Mercury shared MD models</name>
- <version>1.0.0-SNAPSHOT</version>
+ <name>Mercury Shared Metadata: ${project.version}</name>
<description/>
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</parent>
<build>
@@ -59,7 +58,7 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-artifact</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: maven/sandbox/trunk/mercury/mercury-md/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-md/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-md/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-md/pom.xml Thu Aug 14 13:34:28 2008
@@ -8,8 +8,8 @@
</parent>
<artifactId>mercury-md</artifactId>
<packaging>pom</packaging>
- <name>Mercury Metadata Reactor</name>
- <version>1.0.0-SNAPSHOT</version>
+ <name>Mercury Metadata Reactor: ${project.version}</name>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
<modules>
<module>mercury-md-sat</module>
Modified: maven/sandbox/trunk/mercury/mercury-pom/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-pom/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-pom/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-pom/pom.xml Thu Aug 14 13:34:28 2008
@@ -3,9 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-pom</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1-alpha-1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Mercury parent POM</name>
+ <name>Mercury parent POM: ${project.version}</name>
<developers>
<developer>
<name>Jan Bartel</name>
@@ -25,8 +25,15 @@
</developers>
<properties>
+
<distMgmtSnapshotsName>CI Snapshot Repository</distMgmtSnapshotsName>
<distMgmtSnapshotsUrl>http://localhost:8081/content/repositories/maven.snapshots</distMgmtSnapshotsUrl>
+
+ <mercuryVersionArtifact>1.0.0.-alpha-1-SNAPSHOT</mercuryVersionArtifact>
+ <mercuryVersionCrypto>1.0.0.-alpha-1-SNAPSHOT</mercuryVersionCrypto>
+ <mercuryVersionMd>1.0.0.-alpha-1-SNAPSHOT</mercuryVersionMd>
+ <mercuryVersionRepo>1.0.0.-alpha-1-SNAPSHOT</mercuryVersionRepo>
+ <mercuryVersionTransport>1.0.0.-alpha-1-SNAPSHOT</mercuryVersionTransport>
</properties>
<distributionManagement>
@@ -42,6 +49,60 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/trunk/mercury/</developerConnection>
</scm>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-crypto-api</artifactId>
+ <version>${mercuryVersionCrypto}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-crypto-basic</artifactId>
+ <version>${mercuryVersionCrypto}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-transport-api</artifactId>
+ <version>${mercuryVersionTransport}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-transport-http</artifactId>
+ <version>${mercuryVersionTransport}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-md-api</artifactId>
+ <version>${mercuryVersionMd}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-md-sat</artifactId>
+ <version>${mercuryVersionMd}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-api</artifactId>
+ <version>${mercuryVersionRepo}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-local-m2</artifactId>
+ <version>${mercuryVersionRepo}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.mercury</groupId>
+ <artifactId>mercury-repo-remote-m2</artifactId>
+ <version>${mercuryVersionRepo}</version>
+ </dependency>
+
+ </dependencies>
+ </dependencyManagement>
<profiles>
<profile>
Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-api/pom.xml Thu Aug
14 13:34:28 2008
@@ -2,29 +2,28 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-api</artifactId>
- <name>Mercury Repository APIs</name>
- <version>1.0.0-SNAPSHOT</version>
- <description>newly proposed repository APIs</description>
+ <name>Mercury Repository APIs: ${project.version}</name>
+ <description>Repository APIs</description>
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-artifact</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-external</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/pom.xml
(original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/pom.xml Thu
Aug 14 13:34:28 2008
@@ -2,19 +2,24 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-local-m2</artifactId>
- <name>Mercury Local M2 Repository</name>
- <version>1.0.0-SNAPSHOT</version>
+ <name>Mercury Local M2 Repository: ${project.version}</name>
<description/>
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
(original)
+++
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/main/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2.java
Thu Aug 14 13:34:28 2008
@@ -142,13 +142,14 @@
/**
* direct disk search, no redirects, first attempt
*/
- public Map<ArtifactBasicMetadata,
RepositoryOperationResult<ArtifactBasicMetadata>> readVersions(
- List<? extends ArtifactBasicMetadata> query )
+ public Map<ArtifactBasicMetadata,
RepositoryOperationResult<ArtifactBasicMetadata>>
+ readVersions( List<? extends ArtifactBasicMetadata> query )
throws RepositoryException,
IllegalArgumentException
{
if( query == null || query.size() < 1 )
return null;
+
Map<ArtifactBasicMetadata,
RepositoryOperationResult<ArtifactBasicMetadata>> res = new
HashMap<ArtifactBasicMetadata,
RepositoryOperationResult<ArtifactBasicMetadata>>( query.size() );
File gaDir = null;
Added:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Test.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Test.java?rev=686023&view=auto
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Test.java
(added)
+++
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/LocalRepositoryReaderM2Test.java
Thu Aug 14 13:34:28 2008
@@ -0,0 +1,130 @@
+package org.apache.maven.mercury.repository.local.m2;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.artifact.ArtifactMetadata;
+import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.repository.api.RepositoryException;
+import org.apache.maven.mercury.repository.api.RepositoryOperationResult;
+import org.apache.maven.mercury.repository.api.RepositoryReader;
+
+import junit.framework.TestCase;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class LocalRepositoryReaderM2Test
+ extends TestCase
+{
+ LocalRepositoryM2 repo;
+ MetadataProcessor mdProcessor;
+ RepositoryReader reader;
+ List<ArtifactBasicMetadata> query;
+
+ ArtifactBasicMetadata bmd;
+
//------------------------------------------------------------------------------
+ @Override
+ protected void setUp()
+ throws Exception
+ {
+ repo = new LocalRepositoryM2( "local-repo-m2", new
File("./target/test-classes/repo") );
+ mdProcessor = new MetadataProcessorMock();
+ reader = repo.getReader( mdProcessor );
+
+ query = new ArrayList<ArtifactBasicMetadata>();
+ }
+
//------------------------------------------------------------------------------
+ public void testReadReleaseVersion()
+ throws IllegalArgumentException, RepositoryException
+ {
+ bmd = new ArtifactBasicMetadata("a:a:[3,3]");
+ query.add( bmd );
+ Map<ArtifactBasicMetadata,
RepositoryOperationResult<ArtifactBasicMetadata>>
+ res = reader.readVersions( query );
+
+ assertNotNull( res );
+ assertEquals( 1, res.size() );
+
+ RepositoryOperationResult<ArtifactBasicMetadata> ror = res.get( bmd );
+
+ assertNotNull( ror );
+ assertFalse( ror.hasExceptions() );
+ assertTrue( ror.hasResults() );
+
+ List<ArtifactBasicMetadata> qr = ror.getResults();
+
+ assertNotNull( qr );
+ assertEquals( 1, qr.size() );
+
+// System.out.println(qr);
+ }
+
//------------------------------------------------------------------------------
+ public void testReadReleaseRange()
+ throws IllegalArgumentException, RepositoryException
+ {
+ bmd = new ArtifactBasicMetadata("a:a:3");
+ query.add( bmd );
+ Map<ArtifactBasicMetadata,
RepositoryOperationResult<ArtifactBasicMetadata>> res = reader.readVersions(
query );
+
+ assertNotNull( res );
+ assertEquals( 1, res.size() );
+
+ RepositoryOperationResult<ArtifactBasicMetadata> ror = res.get( bmd );
+
+ assertNotNull( ror );
+ assertFalse( ror.hasExceptions() );
+ assertTrue( ror.hasResults() );
+
+ List<ArtifactBasicMetadata> qr = ror.getResults();
+
+ assertNotNull( qr );
+ assertTrue( qr.size() > 1 );
+
+// assertFalse( qr.contains( new ArtifactBasicMetadata("a:a:5-SNAPSHOT") )
);
+
+ System.out.println("query "+bmd+"->"+qr);
+
+ Map<ArtifactBasicMetadata,ArtifactMetadata> depRes =
reader.readDependencies( qr );
+
+ assertNotNull( depRes );
+ assertTrue( depRes.size() > 1 );
+ assertTrue( depRes.containsKey( bmd ) );
+
+ ArtifactMetadata amd = depRes.get( bmd );
+
+ List<ArtifactBasicMetadata> deps = amd.getDependencies();
+ assertNotNull( deps );
+
+// System.out.println(deps);
+
+ assertTrue( deps.contains( new ArtifactBasicMetadata("b:b:2") ) );
+ assertTrue( deps.contains( new ArtifactBasicMetadata("c:c:(1,)") ) );
+
+ }
+
//------------------------------------------------------------------------------
+ public void testReadLatest()
+ {
+ // TODO
+ }
+
//------------------------------------------------------------------------------
+ public void testReadSnapshot()
+ {
+ // TODO
+ }
+
//------------------------------------------------------------------------------
+ public void testReadSnapshotTimeStamp()
+ {
+ // TODO
+ }
+
//------------------------------------------------------------------------------
+
//------------------------------------------------------------------------------
+}
Added:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java?rev=686023&view=auto
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java
(added)
+++
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/java/org/apache/maven/mercury/repository/local/m2/MetadataProcessorMock.java
Thu Aug 14 13:34:28 2008
@@ -0,0 +1,92 @@
+package org.apache.maven.mercury.repository.local.m2;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+
+import org.apache.commons.digester.Digester;
+import org.apache.maven.mercury.artifact.ArtifactBasicMetadata;
+import org.apache.maven.mercury.builder.api.MetadataProcessingException;
+import org.apache.maven.mercury.builder.api.MetadataProcessor;
+import org.apache.maven.mercury.builder.api.MetadataReader;
+import org.xml.sax.SAXException;
+
+/**
+ *
+ * a temporary thing to be replaced with real projectBuilder implementation
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ */
+public class MetadataProcessorMock
+implements MetadataProcessor
+{
+
+ public List<ArtifactBasicMetadata> getDependencies( ArtifactBasicMetadata
bmd, MetadataReader mdReader, Hashtable env )
+ throws MetadataProcessingException
+ {
+ List<ArtifactBasicMetadata> deps = null;
+
+ try
+ {
+ byte [] pomBytes = mdReader.readMetadata( bmd );
+ if( pomBytes == null )
+ {
+ throw new MetadataProcessingException("no metadata found for "+bmd);
+ }
+ deps = getDeps( pomBytes );
+
+ return deps;
+ }
+ catch( Exception e )
+ {
+ throw new MetadataProcessingException( e );
+ }
+ }
+
+ private static final List<ArtifactBasicMetadata> getDeps( byte [] pom )
+ throws IOException, SAXException
+ {
+ if( pom == null )
+ return null;
+
+ DependencyCreator dc = new DependencyCreator();
+ Digester digester = new Digester();
+ digester.push( dc );
+
+ digester.addCallMethod("project/dependencies/dependency", "addMD", 6 );
+ digester.addCallParam("project/dependencies/dependency/groupId",0);
+ digester.addCallParam("project/dependencies/dependency/artifactId",1);
+ digester.addCallParam("project/dependencies/dependency/version",2);
+ digester.addCallParam("project/dependencies/dependency/type",3);
+ digester.addCallParam("project/dependencies/dependency/scope",4);
+ digester.addCallParam("project/dependencies/dependency/optional",5);
+
+ digester.parse( new ByteArrayInputStream(pom) );
+
+ return dc.mds;
+ }
+
+}
+//==============================================================================================
+class DependencyCreator
+{
+ List<ArtifactBasicMetadata> mds = new ArrayList<ArtifactBasicMetadata>(8);
+
+ public void addMD( String g, String a, String v, String t, String s, String
o)
+ {
+ ArtifactBasicMetadata md = new ArtifactBasicMetadata();
+ md.setGroupId(g);
+ md.setArtifactId(a);
+ md.setVersion(v);
+ md.setType(t);
+ md.setScope(s);
+ md.setOptional(o);
+
+ mds.add(md);
+ }
+}
+//==============================================================================================
Propchange:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/1/a-1.pom
------------------------------------------------------------------------------
svn:mergeinfo =
Added:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/2/a-2.pom
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/2/a-2.pom?rev=686023&view=auto
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/2/a-2.pom
(added)
+++
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/2/a-2.pom
Thu Aug 14 13:34:28 2008
@@ -0,0 +1,23 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>a</groupId>
+ <artifactId>a</artifactId>
+ <version>2</version>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>b</groupId>
+ <artifactId>b</artifactId>
+ <version>[1,2]</version>
+ </dependency>
+
+ <dependency>
+ <groupId>c</groupId>
+ <artifactId>c</artifactId>
+ <version>[2,3)</version>
+ </dependency>
+ </dependencies>
+
+
+</project>
\ No newline at end of file
Added:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/3/a-3.pom
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/3/a-3.pom?rev=686023&view=auto
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/3/a-3.pom
(added)
+++
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/3/a-3.pom
Thu Aug 14 13:34:28 2008
@@ -0,0 +1,19 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>a</groupId>
+ <artifactId>a</artifactId>
+ <version>3</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>b</groupId>
+ <artifactId>b</artifactId>
+ <version>2</version>
+ </dependency>
+ <dependency>
+ <groupId>c</groupId>
+ <artifactId>c</artifactId>
+ <version>(1,)</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/4/a-4.pom
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/4/a-4.pom?rev=686023&view=auto
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/4/a-4.pom
(added)
+++
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/4/a-4.pom
Thu Aug 14 13:34:28 2008
@@ -0,0 +1,21 @@
+<project>
+ <modelVersion>3</modelVersion>
+ <groupId>a</groupId>
+ <artifactId>a</artifactId>
+ <version>4</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>b</groupId>
+ <artifactId>b</artifactId>
+ <version>2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>c</groupId>
+ <artifactId>c</artifactId>
+ <version>[2,3]</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/maven-metadata.xml?rev=686023&view=auto
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/maven-metadata.xml
(added)
+++
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-local-m2/src/test/resources/repo/a/a/maven-metadata.xml
Thu Aug 14 13:34:28 2008
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>a</groupId>
+ <artifactId>a</artifactId>
+ <version>4</version>
+ <versioning>
+ <release>4</release>
+ <versions>
+ <version>1</version>
+ <version>2</version>
+ <version>3</version>
+ <version>4</version>
+ </versions>
+ <lastUpdated>20080424212921</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Modified:
maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/pom.xml
(original)
+++ maven/sandbox/trunk/mercury/mercury-repo/mercury-repo-remote-m2/pom.xml Thu
Aug 14 13:34:28 2008
@@ -2,29 +2,28 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-remote-m2</artifactId>
- <name>Mercury Remote M2 Repository</name>
- <version>1.0.0-SNAPSHOT</version>
+ <name>Mercury Remote M2 Repository: ${project.version}</name>
<description/>
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-http</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md-shared</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: maven/sandbox/trunk/mercury/mercury-repo/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-repo/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-repo/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-repo/pom.xml Thu Aug 14 13:34:28 2008
@@ -8,8 +8,8 @@
</parent>
<artifactId>mercury-repo</artifactId>
<packaging>pom</packaging>
- <name>Mercury Repository reactor</name>
- <version>1.0.0-SNAPSHOT</version>
+ <name>Mercury Repository Reactor: ${project.version}</name>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
<modules>
<module>mercury-repo-api</module>
Modified:
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/pom.xml
(original)
+++ maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-api/pom.xml
Thu Aug 14 13:34:28 2008
@@ -1,18 +1,18 @@
<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>
+ <name>Mercury Transport APIs: ${project.version}</name>
<description>Mercury transport APIs</description>
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified:
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
---
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/pom.xml
(original)
+++
maven/sandbox/trunk/mercury/mercury-transport/mercury-transport-http/pom.xml
Thu Aug 14 13:34:28 2008
@@ -1,12 +1,12 @@
<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 implementation</name>
+ <name>Mercury Jetty HTTP Transport: ${project.version}</name>
<description/>
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</parent>
<build>
@@ -52,12 +52,12 @@
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto-basic</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: maven/sandbox/trunk/mercury/mercury-transport/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/mercury-transport/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/mercury-transport/pom.xml (original)
+++ maven/sandbox/trunk/mercury/mercury-transport/pom.xml Thu Aug 14 13:34:28
2008
@@ -8,8 +8,8 @@
</parent>
<artifactId>mercury-transport</artifactId>
<packaging>pom</packaging>
- <name>Mercury Transport Reactor</name>
- <version>1.0.0-SNAPSHOT</version>
+ <name>Mercury Transport Reactor: ${project.version}</name>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
<modules>
<module>mercury-transport-api</module>
Modified: maven/sandbox/trunk/mercury/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/mercury/pom.xml?rev=686023&r1=686022&r2=686023&view=diff
==============================================================================
--- maven/sandbox/trunk/mercury/pom.xml (original)
+++ maven/sandbox/trunk/mercury/pom.xml Thu Aug 14 13:34:28 2008
@@ -4,8 +4,8 @@
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
<packaging>pom</packaging>
- <name>Mercury Reactor</name>
- <version>1.0.0-SNAPSHOT</version>
+ <name>Mercury Reactor: ${project.version}</name>
+ <version>1.0.0-alpha-1-SNAPSHOT</version>
<modules>
<module>mercury-pom</module>
