Author: brett Date: Sat Jan 22 22:23:00 2005 New Revision: 126199 URL: http://svn.apache.org/viewcvs?view=rev&rev=126199 Log: fix problems with path overrides where the filename contains SNAPSHOT
Added: maven/maven-1/core/trunk/src/test/touchstone-build/lib/c-1.0-alpha-1-SNAPSHOT.jar (contents, props changed) Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java maven/maven-1/core/trunk/src/test/touchstone-build/project.properties maven/maven-1/core/trunk/src/test/touchstone-build/project.xml maven/maven-1/core/trunk/xdocs/changes.xml Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java Url: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java?view=diff&rev=126199&p1=maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java&r1=126198&p2=maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java&r2=126199 ============================================================================== --- maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java (original) +++ maven/maven-1/core/trunk/src/java/org/apache/maven/verifier/DependencyVerifier.java Sat Jan 22 22:23:00 2005 @@ -140,7 +140,7 @@ { failedDependencies.add( artifact ); } - else if ( artifact.isSnapshot() ) + else if ( artifact.isSnapshot() && artifact.getOverrideType() != Artifact.OVERRIDE_PATH ) { // The artifact exists but we need to take into account the user // being online and whether the artifact is a snapshot. If the user Added: maven/maven-1/core/trunk/src/test/touchstone-build/lib/c-1.0-alpha-1-SNAPSHOT.jar Url: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/test/touchstone-build/lib/c-1.0-alpha-1-SNAPSHOT.jar?view=auto&rev=126199 ============================================================================== Binary file. No diff available. Modified: maven/maven-1/core/trunk/src/test/touchstone-build/project.properties Url: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/test/touchstone-build/project.properties?view=diff&rev=126199&p1=maven/maven-1/core/trunk/src/test/touchstone-build/project.properties&r1=126198&p2=maven/maven-1/core/trunk/src/test/touchstone-build/project.properties&r2=126199 ============================================================================== --- maven/maven-1/core/trunk/src/test/touchstone-build/project.properties (original) +++ maven/maven-1/core/trunk/src/test/touchstone-build/project.properties Sat Jan 22 22:23:00 2005 @@ -24,6 +24,7 @@ # ------------------------------------------------------------------------ maven.jar.a = ${basedir}/lib/a.jar maven.jar.b = ${basedir}/lib/b.jar +maven.jar.c = ${basedir}/lib/c-1.0-alpha-1-SNAPSHOT.jar # ------------------------------------------------------------------------ # Jars set explicity by version. Modified: maven/maven-1/core/trunk/src/test/touchstone-build/project.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/src/test/touchstone-build/project.xml?view=diff&rev=126199&p1=maven/maven-1/core/trunk/src/test/touchstone-build/project.xml&r1=126198&p2=maven/maven-1/core/trunk/src/test/touchstone-build/project.xml&r2=126199 ============================================================================== --- maven/maven-1/core/trunk/src/test/touchstone-build/project.xml (original) +++ maven/maven-1/core/trunk/src/test/touchstone-build/project.xml Sat Jan 22 22:23:00 2005 @@ -85,6 +85,10 @@ <id>b</id> <version>1.0</version> </dependency> + <dependency> + <id>c</id> + <version>1.0-alpha-1-SNAPSHOT</version> + </dependency> <!-- | | These dependencies are retrieved using the maven JAR override Modified: maven/maven-1/core/trunk/xdocs/changes.xml Url: http://svn.apache.org/viewcvs/maven/maven-1/core/trunk/xdocs/changes.xml?view=diff&rev=126199&p1=maven/maven-1/core/trunk/xdocs/changes.xml&r1=126198&p2=maven/maven-1/core/trunk/xdocs/changes.xml&r2=126199 ============================================================================== --- maven/maven-1/core/trunk/xdocs/changes.xml (original) +++ maven/maven-1/core/trunk/xdocs/changes.xml Sat Jan 22 22:23:00 2005 @@ -26,6 +26,7 @@ <body> <release version="1.1-SNAPSHOT" date="in CVS HEAD"> + <action dev="brett" type="fix">Fix path overrides where the filename contains a SNAPSHOT</action> <action dev="brett" type="update" issue="MAVEN-1399"> Updated to more recent releases of Jelly, its tag libraries and JEXL. </action> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
