You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2008/12/08 01:47:39 UTC
svn commit: r724226 - in /maven/mercury/trunk: mercury-artifact/
mercury-crypto/ mercury-crypto/mercury-crypto-api/
mercury-crypto/mercury-crypto-basic/ mercury-event/ mercury-external/
mercury-logging/ mercury-md/ mercury-md/mercury-md-sat/ mercury-md...
Author: ogusakov
Date: Sun Dec 7 16:47:38 2008
New Revision: 724226
URL: http://svn.apache.org/viewvc?rev=724226&view=rev
Log:
rolling back bad release version
Modified:
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-logging/pom.xml
maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/Messages.properties
maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
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
Modified: maven/mercury/trunk/mercury-artifact/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-artifact/pom.xml?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-artifact/pom.xml (original)
+++ maven/mercury/trunk/mercury-artifact/pom.xml Sun Dec 7 16:47:38 2008
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3-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-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml (original)
+++ maven/mercury/trunk/mercury-crypto/mercury-crypto-api/pom.xml Sun Dec 7 16:47:38 2008
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-crypto-api</artifactId>
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=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml (original)
+++ maven/mercury/trunk/mercury-crypto/mercury-crypto-basic/pom.xml Sun Dec 7 16:47:38 2008
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-crypto</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<dependencies>
Modified: maven/mercury/trunk/mercury-crypto/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-crypto/pom.xml?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-crypto/pom.xml (original)
+++ maven/mercury/trunk/mercury-crypto/pom.xml Sun Dec 7 16:47:38 2008
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-crypto</artifactId>
Modified: maven/mercury/trunk/mercury-event/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-event/pom.xml?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-event/pom.xml (original)
+++ maven/mercury/trunk/mercury-event/pom.xml Sun Dec 7 16:47:38 2008
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-event</artifactId>
<name>Mercury Event Framework</name>
Modified: maven/mercury/trunk/mercury-external/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-external/pom.xml?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-external/pom.xml (original)
+++ maven/mercury/trunk/mercury-external/pom.xml Sun Dec 7 16:47:38 2008
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<dependencies>
Modified: maven/mercury/trunk/mercury-logging/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-logging/pom.xml?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-logging/pom.xml (original)
+++ maven/mercury/trunk/mercury-logging/pom.xml Sun Dec 7 16:47:38 2008
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-logging</artifactId>
<name>Mercury Logging</name>
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=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/pom.xml Sun Dec 7 16:47:38 2008
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<build>
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/DependencyTreeBuilder.java Sun Dec 7 16:47:38 2008
@@ -19,6 +19,7 @@
package org.apache.maven.mercury.metadata;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
@@ -144,6 +145,43 @@
return root;
}
+ //------------------------------------------------------------------------
+ private MetadataTreeNode buildTree( Collection<ArtifactBasicMetadata> startMDs, ArtifactScopeEnum treeScope )
+ throws MetadataTreeException
+ {
+// if( Util.isEmpty( startMDs ) )
+// throw new MetadataTreeException( _lang.getMessage( "empty.md.collection") );
+//
+// List<MetadataTreeNode> deps = new ArrayList<MetadataTreeNode>( startMDs.size() );
+// for()
+
+// try
+// {
+// _reader.setEventManager( _eventManager );
+// _reader.setProcessors( _processors );
+// _reader.init();
+// }
+// catch( RepositoryException e )
+// {
+// throw new MetadataTreeException(e);
+// }
+//
+// _existingNodes = new HashMap<String, MetadataTreeNode>(256);
+
+//// GenericEvent treeBuildEvent = new GenericEvent( EventTypeEnum.dependencyBuilder, TREE_BUILD_EVENT, startMD.getGAV() );
+////
+//// MetadataTreeNode root = createNode( startMD, null, startMD, treeScope );
+//
+// treeBuildEvent.stop();
+//
+// if( _eventManager != null )
+// _eventManager.fireEvent( treeBuildEvent );
+//
+// MetadataTreeNode.reNumber( root, 1 );
+
+// return root;
+ return null;
+ }
//-----------------------------------------------------
private MetadataTreeNode createNode( ArtifactBasicMetadata nodeMD, MetadataTreeNode parent, ArtifactBasicMetadata nodeQuery, ArtifactScopeEnum globalScope )
throws MetadataTreeException
@@ -390,10 +428,10 @@
return _comparators;
}
//-----------------------------------------------------
- private List<ArtifactMetadata> resolveConflicts( List<ArtifactBasicMetadata>trees )
+ protected List<ArtifactMetadata> resolveConflicts( List<ArtifactBasicMetadata> bmds )
throws MetadataTreeException
{
- if( Util.isEmpty( trees ) )
+ if( Util.isEmpty( bmds ) )
throw new MetadataTreeException(_lang.getMessage( "empty.tree.collection" ));
String dummyGAV = "__fake:__fake:0.0.0";
@@ -401,7 +439,7 @@
ArtifactBasicMetadata query = new ArtifactBasicMetadata( dummyGAV );
ArtifactMetadata dummyMd = new ArtifactMetadata( query );
- dummyMd.setDependencies( trees );
+ dummyMd.setDependencies( bmds );
MetadataTreeNode root = new MetadataTreeNode( dummyMd, null, query );
@@ -424,6 +462,15 @@
}
//-----------------------------------------------------
+ protected List<ArtifactMetadata> resolveConflicts( ArtifactBasicMetadata... bmds )
+ throws MetadataTreeException
+ {
+ if( Util.isEmpty( bmds ) )
+ return null;
+
+ return resolveConflicts( Arrays.asList( bmds ) );
+ }
+ //-----------------------------------------------------
private String showPath( MetadataTreeNode node )
throws MetadataTreeCircularDependencyException
{
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/Messages.properties
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/Messages.properties?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/Messages.properties (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/main/java/org/apache/maven/mercury/metadata/Messages.properties Sun Dec 7 16:47:38 2008
@@ -20,4 +20,5 @@
dependency.model.not.implemented=the requested dependency model {0} is not yet implemented
empty.tree=Dependency tree is not populated yet
empty.tree.collection=Empty tree collection supplied
+empty.md.collection=Empty metadata collection supplied
Modified: maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-sat/src/test/java/org/apache/maven/mercury/metadata/DependencyTreeBuilderTest.java Sun Dec 7 16:47:38 2008
@@ -76,6 +76,17 @@
super.tearDown();
}
//----------------------------------------------------------------------------------------------
+ private static boolean assertHasArtifact( List<ArtifactMetadata> res, String gav )
+ {
+ ArtifactMetadata gavMd = new ArtifactMetadata(gav);
+
+ for( ArtifactMetadata md : res )
+ if( md.sameGAV( gavMd ) )
+ return true;
+
+ return false;
+ }
+ //----------------------------------------------------------------------------------------------
public void testCircularDependency()
{
ArtifactMetadata circularMd = new ArtifactMetadata( "a:a:1" );
@@ -272,15 +283,26 @@
// assertTrue( "no c:c:2 in the result", assertHasArtifact( res, "c:c:2" ) );
}
//----------------------------------------------------------------------------------------------
- private static boolean assertHasArtifact( List<ArtifactMetadata> res, String gav )
+ public void testResolveMultiple()
+ throws MetadataTreeException
{
- ArtifactMetadata gavMd = new ArtifactMetadata(gav);
+ ArtifactMetadata md1 = new ArtifactMetadata( "a:a:3" );
+ ArtifactMetadata md2 = new ArtifactMetadata( "a:a:4" );
- for( ArtifactMetadata md : res )
- if( md.sameGAV( gavMd ) )
- return true;
+ MetadataTreeNode root = mt.buildTree( md1, ArtifactScopeEnum.compile );
+ assertNotNull( "null tree built", root );
+ assertTrue( "wrong tree size, expected gte 4", 4 <= root.countNodes() );
+
+ List<ArtifactMetadata> res = mt.resolveConflicts( root );
+ assertNotNull( "null resolution", res );
+
+ System.out.println("BigRes: "+res);
- return false;
+ assertEquals( "wrong tree size", 3, res.size() );
+
+// assertTrue( "no a:a:2 in the result", assertHasArtifact( res, "a:a:2" ) );
+// assertTrue( "no b:b:1 in the result", assertHasArtifact( res, "b:b:1" ) );
+// assertTrue( "no c:c:2 in the result", assertHasArtifact( res, "c:c:2" ) );
}
//----------------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------------
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=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/mercury-md-shared/pom.xml Sun Dec 7 16:47:38 2008
@@ -8,7 +8,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-md</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<build>
Modified: maven/mercury/trunk/mercury-md/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-md/pom.xml?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-md/pom.xml (original)
+++ maven/mercury/trunk/mercury-md/pom.xml Sun Dec 7 16:47:38 2008
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-md</artifactId>
<packaging>pom</packaging>
Modified: maven/mercury/trunk/mercury-plexus/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-plexus/pom.xml?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-plexus/pom.xml (original)
+++ maven/mercury/trunk/mercury-plexus/pom.xml Sun Dec 7 16:47:38 2008
@@ -5,7 +5,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-plexus</artifactId>
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=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-api/pom.xml Sun Dec 7 16:47:38 2008
@@ -8,7 +8,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<dependencies>
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=724226&r1=724225&r2=724226&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 Sun Dec 7 16:47:38 2008
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-repo-cache-fs</artifactId>
<name>Mercury Repository FS Cache</name>
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=724226&r1=724225&r2=724226&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 Sun Dec 7 16:47:38 2008
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<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=724226&r1=724225&r2=724226&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 Sun Dec 7 16:47:38 2008
@@ -8,7 +8,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<dependencies>
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=724226&r1=724225&r2=724226&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 Sun Dec 7 16:47:38 2008
@@ -8,7 +8,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<dependencies>
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=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/pom.xml Sun Dec 7 16:47:38 2008
@@ -9,7 +9,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-repo</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
Modified: maven/mercury/trunk/mercury-repo/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/pom.xml?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/pom.xml (original)
+++ maven/mercury/trunk/mercury-repo/pom.xml Sun Dec 7 16:47:38 2008
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-repo</artifactId>
<packaging>pom</packaging>
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=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-api/pom.xml Sun Dec 7 16:47:38 2008
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<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=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-file/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-file/pom.xml Sun Dec 7 16:47:38 2008
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<build>
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=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/mercury-transport-http/pom.xml Sun Dec 7 16:47:38 2008
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury-transport</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<build>
Modified: maven/mercury/trunk/mercury-transport/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-transport/pom.xml?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-transport/pom.xml (original)
+++ maven/mercury/trunk/mercury-transport/pom.xml Sun Dec 7 16:47:38 2008
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-transport</artifactId>
<packaging>pom</packaging>
Modified: maven/mercury/trunk/mercury-util/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-util/pom.xml?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-util/pom.xml (original)
+++ maven/mercury/trunk/mercury-util/pom.xml Sun Dec 7 16:47:38 2008
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<artifactId>mercury-util</artifactId>
<name>Mercury Shared Utilities</name>
Modified: maven/mercury/trunk/mercury-wagon/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-wagon/pom.xml?rev=724226&r1=724225&r2=724226&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-wagon/pom.xml (original)
+++ maven/mercury/trunk/mercury-wagon/pom.xml Sun Dec 7 16:47:38 2008
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.maven.mercury</groupId>
<artifactId>mercury</artifactId>
- <version>1.0.0-alpha-3-SNAPSHOT</version>
+ <version>1.0.0-alpha-2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>