Author: brett Date: Mon Jul 28 18:46:03 2008 New Revision: 680599 URL: http://svn.apache.org/viewvc?rev=680599&view=rev Log: updating versions
Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java?rev=680599&r1=680598&r2=680599&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/IntegrationTestSuite.java Mon Jul 28 18:46:03 2008 @@ -77,7 +77,7 @@ */ // Correct wagon issue in 2.0.10 first - //suite.addTestSuite( MavenITmng3599useHttpProxyForWebDAV.class ); + suite.addTestSuite( MavenITmng3599useHttpProxyForWebDAV.class ); suite.addTestSuite( MavenITmng3684BuildPluginParameterTest.class ); suite.addTestSuite( MavenITmng3680InvalidDependencyPOMTest.class ); suite.addTestSuite( MavenITmng3679PluginExecIdInterpolationTest.class ); Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java?rev=680599&r1=680598&r2=680599&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3599useHttpProxyForWebDAV.java Mon Jul 28 18:46:03 2008 @@ -92,9 +92,9 @@ verifier.assertArtifactPresent( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar" ); verifier.assertArtifactContents( "org.apache.maven.its.mng3599", "test-dependency", "1.0", "jar", "some content\n" ); - // Doesn't work until 2.0.10+ + // Doesn't work until 2.0.11+ // TODO: reinstate for 2.1 when WebDAV works - if ( matchesVersionRange( "(2.0.9,2.0.99)" ) ) + if ( matchesVersionRange( "(2.0.10,2.0.99)" ) ) { newSettings = StringUtils.replace( settings, "@protocol@", "dav" ); FileUtils.fileWrite( new File( testDir, "settings.xml" ).getAbsolutePath(), newSettings ); Modified: maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java?rev=680599&r1=680598&r2=680599&view=diff ============================================================================== --- maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java (original) +++ maven/core-integration-testing/trunk/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3652UserAgentHeader.java Mon Jul 28 18:46:03 2008 @@ -34,7 +34,7 @@ throws InvalidVersionSpecificationException { // TODO: fix support for this in 2.1-SNAPSHOT - // 2.0.10+ + // 2.0.11+ //super( "(2.0.9,)" ); super( "(2.0.10,2.0.99)" ); }