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/04/08 23:28:04 UTC
svn commit: r932126 - in
/maven/core-integration-testing/trunk/core-it-suite/src/test:
java/org/apache/maven/it/ resources/mng-2994/
resources/mng-2994/repo/org/apache/maven/its/it0123/
resources/mng-2994/repo/org/apache/maven/its/mng2994/ resources/mn...
Author: bentmann
Date: Thu Apr 8 21:28:03 2010
New Revision: 932126
URL: http://svn.apache.org/viewvc?rev=932126&view=rev
Log:
[MNG-2994] Snapshot repositories are not checked when using ranges
o Enabled IT
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/
- copied from r931053, maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/it0123/
Removed:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/it0123/
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/maven-metadata.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java?rev=932126&r1=932125&r2=932126&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/IntegrationTestSuite.java Thu Apr 8 21:28:03 2010
@@ -73,7 +73,6 @@ public class IntegrationTestSuite
// -------------------------------------------------------------------------------------------------------------
// suite.addTestSuite( MavenITmng3890TransitiveDependencyScopeUpdateTest.class );
// suite.addTestSuite( MavenITmng3038TransitiveDepManVersionTest.class );
- // suite.addTestSuite( MavenITmng2994SnapshotRangeRepositoryTest.class );
// suite.addTestSuite( MavenITmng2771PomExtensionComponentOverrideTest.class );
// suite.addTestSuite( MavenITmng0612NewestConflictResolverTest.class );
@@ -387,6 +386,7 @@ public class IntegrationTestSuite
suite.addTestSuite( MavenITmng3023ReactorDependencyResolutionTest.class );
suite.addTestSuite( MavenITmng3012CoreClassImportTest.class );
suite.addTestSuite( MavenITmng3004ReactorFailureBehaviorMultithreadedTest.class );
+ suite.addTestSuite( MavenITmng2994SnapshotRangeRepositoryTest.class );
suite.addTestSuite( MavenITmng2972OverridePluginDependencyTest.class );
suite.addTestSuite( MavenITmng2926PluginPrefixOrderTest.class );
suite.addTestSuite( MavenITmng2921ActiveAttachedArtifactsTest.class );
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java?rev=932126&r1=932125&r2=932126&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java Thu Apr 8 21:28:03 2010
@@ -33,25 +33,27 @@ import java.io.File;
public class MavenITmng2994SnapshotRangeRepositoryTest
extends AbstractMavenIntegrationTestCase
{
+
public MavenITmng2994SnapshotRangeRepositoryTest()
{
- super( ALL_MAVEN_VERSIONS );
+ super( "[3.0-beta-1,)" );
}
/**
* Test that snapshot repositories are checked for ranges with snapshot boundaries.
*/
- public void testitMNG2994()
+ public void testit()
throws Exception
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2994" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.deleteArtifacts( "org.apache.maven.its.it0123" );
+ verifier.deleteArtifacts( "org.apache.maven.its.mng2994" );
verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() );
verifier.getCliOptions().add( "--settings" );
verifier.getCliOptions().add( "settings.xml" );
- verifier.executeGoal( "compile" );
+ verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
}
+
}
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/pom.xml?rev=932126&r1=932125&r2=932126&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/pom.xml Thu Apr 8 21:28:03 2010
@@ -1,15 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
<project>
<modelVersion>4.0.0</modelVersion>
- <name>Maven Integration Test :: it0123</name>
- <groupId>org.apache.maven.its.it0123</groupId>
- <artifactId>maven-it-it0123</artifactId>
- <description>Test that snapshot repositories are checked for ranges with snapshot boundaries.</description>
+
+ <groupId>org.apache.maven.its.mng2994</groupId>
+ <artifactId>test</artifactId>
<version>1.0</version>
+
+ <name>Maven Integration Test :: MNG-2994</name>
+ <description>
+ Test that snapshot repositories are checked for ranges with snapshot boundaries.
+ </description>
+
<dependencies>
<dependency>
- <groupId>org.apache.maven.its.it0123</groupId>
+ <groupId>org.apache.maven.its.mng2994</groupId>
<artifactId>artifact</artifactId>
<version>[1.0-SNAPSHOT]</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.plugins</groupId>
+ <artifactId>maven-it-plugin-dependency-resolution</artifactId>
+ <version>2.1-SNAPSHOT</version>
+ <configuration>
+ <compileClassPath>target/classpath.txt</compileClassPath>
+ <significantPathLevels>1</significantPathLevels>
+ </configuration>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.pom?rev=932126&r1=931053&r2=932126&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.pom (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/1.0-SNAPSHOT/artifact-1.0-SNAPSHOT.pom Thu Apr 8 21:28:03 2010
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.maven.its.it0123</groupId>
+ <groupId>org.apache.maven.its.mng2994</groupId>
<artifactId>artifact</artifactId>
<version>1.0-SNAPSHOT</version>
</project>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/maven-metadata.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/maven-metadata.xml?rev=932126&r1=931053&r2=932126&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/maven-metadata.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2994/repo/org/apache/maven/its/mng2994/artifact/maven-metadata.xml Thu Apr 8 21:28:03 2010
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?><metadata>
- <groupId>org.apache.maven.its.it0123</groupId>
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>org.apache.maven.its.mng2994</groupId>
<artifactId>artifact</artifactId>
<version>1.0-SNAPSHOT</version>
<versioning>
@@ -8,4 +9,4 @@
</versions>
<lastUpdated>20070515170129</lastUpdated>
</versioning>
-</metadata>
\ No newline at end of file
+</metadata>