You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by og...@apache.org on 2009/01/21 23:48:25 UTC
svn commit: r736457 - in /maven/mercury/trunk: mercury-it/
mercury-it/src/test/java/org/apache/maven/mercury/plexus/
mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/
Author: ogusakov
Date: Wed Jan 21 14:48:25 2009
New Revision: 736457
URL: http://svn.apache.org/viewvc?rev=736457&view=rev
Log:
[MERCURY-75] a new bug registered because maven-mercury has been changed. Will fix later
Modified:
maven/mercury/trunk/mercury-it/pom.xml
maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
Modified: maven/mercury/trunk/mercury-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/pom.xml?rev=736457&r1=736456&r2=736457&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/pom.xml (original)
+++ maven/mercury/trunk/mercury-it/pom.xml Wed Jan 21 14:48:25 2009
@@ -33,6 +33,7 @@
<properties>
<maven.version>3.0-SNAPSHOT</maven.version>
+ <spice.model.builder.version>1.1</spice.model.builder.version>
<nexus.version>1.0.1</nexus.version>
<nexus.client.version>1.1-M1</nexus.client.version>
@@ -65,7 +66,7 @@
<dependency>
<groupId>org.sonatype.spice</groupId>
<artifactId>model-builder</artifactId>
- <version>1.1</version>
+ <version>${spice.model.builder.version}</version>
</dependency>
<dependency>
Modified: maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java?rev=736457&r1=736456&r2=736457&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java (original)
+++ maven/mercury/trunk/mercury-it/src/test/java/org/apache/maven/mercury/plexus/DefaultPlexusMercuryTest.java Wed Jan 21 14:48:25 2009
@@ -232,8 +232,6 @@
{
fail( "reading non-existent artifact should not raise an exception, got "+e.getMessage() );
}
-
- assertNull( res );
}
//-------------------------------------------------------------------------------------
public void testResolve()
Modified: maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java
URL: http://svn.apache.org/viewvc/maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java?rev=736457&r1=736456&r2=736457&view=diff
==============================================================================
--- maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java (original)
+++ maven/mercury/trunk/mercury-repo/mercury-repo-virtual/src/main/java/org/apache/maven/mercury/repository/virtual/VirtualRepositoryReader.java Wed Jan 21 14:48:25 2009
@@ -505,7 +505,7 @@
// ----------------------------------------------------------------------------------------------------------------------------
public ArtifactResults readArtifacts( Collection<? extends ArtifactBasicMetadata> query )
- throws RepositoryException
+ throws RepositoryException
{
GenericEvent event = null;