You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2010/10/01 15:42:32 UTC
svn commit: r1003535 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-4750/
resources/mng-4750/repo/org/apache/maven/its/mng4750/a/
Author: bentmann
Date: Fri Oct 1 13:42:32 2010
New Revision: 1003535
URL: http://svn.apache.org/viewvc?rev=1003535&view=rev
Log:
[MNG-4845] [regression] MavenProject.getDependencyArtifact() returns artifacts without version for dependency with version range
o Extended relevant IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4750/repo/org/apache/maven/its/mng4750/a/maven-metadata.xml (with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4750/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java?rev=1003535&r1=1003534&r2=1003535&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java Fri Oct 1 13:42:32 2010
@@ -26,7 +26,8 @@ import java.io.File;
import java.util.Properties;
/**
- * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4750">MNG-4750</a>.
+ * This is a test set for <a href="http://jira.codehaus.org/browse/MNG-4750">MNG-4750</a> and
+ * <a href="http://jira.codehaus.org/browse/MNG-4845">MNG-4845</a>.
*
* @author Benjamin Bentmann
*/
@@ -36,7 +37,7 @@ public class MavenITmng4750ResolvedMaven
public MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest()
{
- super( "[2.0.3,3.0-alpha-1),[3.0-alpha-3,)" );
+ super( "[2.0.3,3.0-alpha-1),[3.0,)" );
}
/**
@@ -64,6 +65,9 @@ public class MavenITmng4750ResolvedMaven
String path = props.getProperty( "project.dependencyArtifacts.0.file" );
assertNotNull( path );
assertTrue( path, new File( path ).isFile() );
+
+ String version = props.getProperty( "project.dependencyArtifacts.0.version" );
+ assertEquals( "0.1", version );
}
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4750/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4750/pom.xml?rev=1003535&r1=1003534&r2=1003535&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4750/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4750/pom.xml Fri Oct 1 13:42:32 2010
@@ -37,7 +37,8 @@ under the License.
<dependency>
<groupId>org.apache.maven.its.mng4750</groupId>
<artifactId>a</artifactId>
- <version>0.1</version>
+ <!-- NOTE: This intentionally uses a version range -->
+ <version>(,0.1]</version>
<scope>compile</scope>
</dependency>
</dependencies>
@@ -71,6 +72,7 @@ under the License.
<expressions>
<expression>project/dependencyArtifacts/size</expression>
<expression>project/dependencyArtifacts/*/file</expression>
+ <expression>project/dependencyArtifacts/*/version</expression>
</expressions>
</configuration>
<executions>
Added: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4750/repo/org/apache/maven/its/mng4750/a/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4750/repo/org/apache/maven/its/mng4750/a/maven-metadata.xml?rev=1003535&view=auto
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4750/repo/org/apache/maven/its/mng4750/a/maven-metadata.xml (added)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4750/repo/org/apache/maven/its/mng4750/a/maven-metadata.xml Fri Oct 1 13:42:32 2010
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng4750</groupId>
+ <artifactId>a</artifactId>
+ <versioning>
+ <latest>0.1</latest>
+ <release>0.1</release>
+ <versions>
+ <version>0.1</version>
+ </versions>
+ <lastUpdated>20100909120034</lastUpdated>
+ </versioning>
+</metadata>
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4750/repo/org/apache/maven/its/mng4750/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4750/repo/org/apache/maven/its/mng4750/a/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision