From ace476f8f8ec8159f393d67209440a5157755790 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Tue, 7 Oct 2008 18:29:51 +0000 Subject: [PATCH] o Stabilized ITs by using specific version instead of LATEST git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@702575 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/java/org/apache/maven/it/MavenIT0014Test.java | 2 +- .../src/test/java/org/apache/maven/it/MavenIT0018Test.java | 6 +++--- .../src/test/java/org/apache/maven/it/MavenIT0028Test.java | 2 +- .../src/test/java/org/apache/maven/it/MavenIT0043Test.java | 4 ++-- .../src/test/java/org/apache/maven/it/MavenIT0047Test.java | 2 +- .../src/test/java/org/apache/maven/it/MavenIT0048Test.java | 2 +- .../src/test/java/org/apache/maven/it/MavenIT0063Test.java | 2 +- .../src/test/java/org/apache/maven/it/MavenIT0069Test.java | 6 +++--- .../src/test/java/org/apache/maven/it/MavenIT0075Test.java | 2 +- .../src/test/java/org/apache/maven/it/MavenIT0095Test.java | 2 +- .../src/test/java/org/apache/maven/it/MavenIT0102Test.java | 2 +- .../test/java/org/apache/maven/it/MavenITmng0469Test.java | 4 ++-- its/core-it-suite/src/test/resources/it0014/pom.xml | 1 + its/core-it-suite/src/test/resources/it0024/pom.xml | 1 + its/core-it-suite/src/test/resources/it0028/pom.xml | 1 + its/core-it-suite/src/test/resources/it0029/pom.xml | 1 + its/core-it-suite/src/test/resources/it0056/pom.xml | 1 + its/core-it-suite/src/test/resources/it0060/pom.xml | 1 + .../src/test/resources/it0060/subproject/pom.xml | 1 + its/core-it-suite/src/test/resources/it0063/pom.xml | 1 + its/core-it-suite/src/test/resources/it0069/pom.xml | 1 + its/core-it-suite/src/test/resources/it0076/pom.xml | 1 + its/core-it-suite/src/test/resources/it0079/pom.xml | 1 + .../resources/it0117-testUsesOfPropertiesInAMojo/pom.xml | 1 + its/core-it-suite/src/test/resources/mng-0469/test0/pom.xml | 1 + its/core-it-suite/src/test/resources/mng-0469/test1/pom.xml | 2 ++ 26 files changed, 33 insertions(+), 18 deletions(-) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0014Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0014Test.java index 5742bf1d6d..90b61b4370 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0014Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0014Test.java @@ -38,7 +38,7 @@ public class MavenIT0014Test File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0014" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-file::file" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-file:2.1-SNAPSHOT:file" ); verifier.assertFilePresent( "target/plugin-configuration.txt" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018Test.java index b8c8909033..996315dacd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0018Test.java @@ -30,8 +30,8 @@ public class MavenIT0018Test /** * Ensure that managed dependencies for dependency POMs are calculated - * correctly when resolved. Removes commons-logging-1.0.3 and checks it is - * redownloaded. + * correctly when resolved. Removes managed-dep-1.0.3 and checks it is + * redownloaded upon resolution of direct-dep. */ public void testit0018() throws Exception @@ -39,7 +39,7 @@ public class MavenIT0018Test File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0018" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.deleteArtifact( "org.apache.maven.its.it0018", "managed-dep", "1.0.3", "jar" ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution::compile" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" ); verifier.assertArtifactPresent( "org.apache.maven.its.it0018", "managed-dep", "1.0.3", "jar" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0028Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0028Test.java index 8f7e7efaea..5ce991c113 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0028Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0028Test.java @@ -38,7 +38,7 @@ public class MavenIT0028Test File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0028" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-file::file" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-file:2.1-SNAPSHOT:file" ); verifier.assertFilePresent( "target/file.txt" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0043Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0043Test.java index 5f62e5396c..646eed57f3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0043Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0043Test.java @@ -41,7 +41,7 @@ public class MavenIT0043Test File child1 = new File( testDir, "setup" ); Verifier verifier = new Verifier( child1.getAbsolutePath() ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression::eval" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); @@ -52,7 +52,7 @@ public class MavenIT0043Test Properties systemProperties = new Properties(); systemProperties.put( "expression.expressions", "project/repositories,project/pluginRepositories" ); verifier.setSystemProperties( systemProperties ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression::eval" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java index 483d423420..cd9baf03d6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0047Test.java @@ -43,7 +43,7 @@ public class MavenIT0047Test Properties systemProperties = new Properties(); systemProperties.put( "depres.compileClassPath", new File( testDir, "target/compile.txt" ).getAbsolutePath() ); verifier.setSystemProperties( systemProperties ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution::compile" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" ); verifier.assertFilePresent( "target/compile.txt" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0048Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0048Test.java index 62ea0c7fae..3920f02fa6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0048Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0048Test.java @@ -38,7 +38,7 @@ public class MavenIT0048Test File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0048" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-file::file" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-file:2.1-SNAPSHOT:file" ); verifier.assertFilePresent( "target/file.txt" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063Test.java index 7a7a7c29ad..af05d8ef1c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063Test.java @@ -39,7 +39,7 @@ public class MavenIT0063Test Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.getSystemProperties().setProperty( "jre.home", new File( testDir, "jdk/jre" ).getPath() ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution::compile" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0069Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0069Test.java index 1302d948ca..2e5e426050 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0069Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0069Test.java @@ -41,7 +41,7 @@ public class MavenIT0069Test { // phase 1: run build in online mode to fill local repo Verifier verifier = new Verifier( testDir.getAbsolutePath() ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution::compile" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" ); verifier.assertFilePresent( "target/compile.txt" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); @@ -55,7 +55,7 @@ public class MavenIT0069Test List cliOptions = new ArrayList(); cliOptions.add( "-o" ); verifier.setCliOptions( cliOptions ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution::compile" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" ); verifier.assertFilePresent( "target/compile.txt" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); @@ -71,7 +71,7 @@ public class MavenIT0069Test verifier.setCliOptions( cliOptions ); try { - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution::compile" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-dependency-resolution:2.1-SNAPSHOT:compile" ); fail( "Build did not fail!" ); } catch( VerificationException e ) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0075Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0075Test.java index 782b109c12..1aec27e95c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0075Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0075Test.java @@ -42,7 +42,7 @@ public class MavenIT0075Test Properties systemProperties = new Properties(); systemProperties.put( "activate", "anything" ); verifier.setSystemProperties( systemProperties ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression::eval" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" ); verifier.assertFilePresent( "sub1/target/expression.properties" ); verifier.assertFilePresent( "sub2/target/expression.properties" ); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0095Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0095Test.java index ce73329648..13c14ba309 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0095Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0095Test.java @@ -46,7 +46,7 @@ public class MavenIT0095Test Properties systemProperties = new Properties(); systemProperties.put( "expression.expressions", "project/scm" ); verifier.setSystemProperties( systemProperties ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression::eval" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0102Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0102Test.java index 7d760812c3..fd563633f4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0102Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0102Test.java @@ -43,7 +43,7 @@ public class MavenIT0102Test Properties systemProperties = new Properties(); systemProperties.put( "expression.expressions", "project/properties" ); verifier.setSystemProperties( systemProperties ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression::eval" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-expression:2.1-SNAPSHOT:eval" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469Test.java index 823476a470..ff707fe42c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469Test.java @@ -50,7 +50,7 @@ public class MavenITmng0469Test Verifier verifier = new Verifier( new File( testDir, "test0" ).getAbsolutePath() ); verifier.deleteDirectory( "target" ); verifier.setAutoclean( false ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-file::file" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-file:2.1-SNAPSHOT:file" ); verifier.assertFilePresent( "target/reporting.txt" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); @@ -58,7 +58,7 @@ public class MavenITmng0469Test verifier = new Verifier( new File( testDir, "test1" ).getAbsolutePath() ); verifier.deleteDirectory( "target" ); verifier.setAutoclean( false ); - verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-file::file" ); + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-file:2.1-SNAPSHOT:file" ); verifier.assertFilePresent( "target/build.txt" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/resources/it0014/pom.xml b/its/core-it-suite/src/test/resources/it0014/pom.xml index 291b0f62f3..4332a778cf 100644 --- a/its/core-it-suite/src/test/resources/it0014/pom.xml +++ b/its/core-it-suite/src/test/resources/it0014/pom.xml @@ -37,6 +37,7 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-file + 2.1-SNAPSHOT target/plugin-configuration.txt diff --git a/its/core-it-suite/src/test/resources/it0024/pom.xml b/its/core-it-suite/src/test/resources/it0024/pom.xml index 78626f9c59..d459f70efd 100644 --- a/its/core-it-suite/src/test/resources/it0024/pom.xml +++ b/its/core-it-suite/src/test/resources/it0024/pom.xml @@ -38,6 +38,7 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-file + 2.1-SNAPSHOT test diff --git a/its/core-it-suite/src/test/resources/it0028/pom.xml b/its/core-it-suite/src/test/resources/it0028/pom.xml index a654a6ac41..dce9d973d2 100644 --- a/its/core-it-suite/src/test/resources/it0028/pom.xml +++ b/its/core-it-suite/src/test/resources/it0028/pom.xml @@ -38,6 +38,7 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-file + 2.1-SNAPSHOT something diff --git a/its/core-it-suite/src/test/resources/it0029/pom.xml b/its/core-it-suite/src/test/resources/it0029/pom.xml index bcfeaf9558..e8a3f65651 100644 --- a/its/core-it-suite/src/test/resources/it0029/pom.xml +++ b/its/core-it-suite/src/test/resources/it0029/pom.xml @@ -40,6 +40,7 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-file + 2.1-SNAPSHOT target/plugin-management-configuration.txt diff --git a/its/core-it-suite/src/test/resources/it0056/pom.xml b/its/core-it-suite/src/test/resources/it0056/pom.xml index f573ac3d24..bc922db531 100644 --- a/its/core-it-suite/src/test/resources/it0056/pom.xml +++ b/its/core-it-suite/src/test/resources/it0056/pom.xml @@ -38,6 +38,7 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-file + 2.1-SNAPSHOT first-exec diff --git a/its/core-it-suite/src/test/resources/it0060/pom.xml b/its/core-it-suite/src/test/resources/it0060/pom.xml index a5aa468e97..d1eabfcfd3 100644 --- a/its/core-it-suite/src/test/resources/it0060/pom.xml +++ b/its/core-it-suite/src/test/resources/it0060/pom.xml @@ -42,6 +42,7 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-file + 2.1-SNAPSHOT true diff --git a/its/core-it-suite/src/test/resources/it0060/subproject/pom.xml b/its/core-it-suite/src/test/resources/it0060/subproject/pom.xml index adb68cc2a3..440271f67c 100644 --- a/its/core-it-suite/src/test/resources/it0060/subproject/pom.xml +++ b/its/core-it-suite/src/test/resources/it0060/subproject/pom.xml @@ -37,6 +37,7 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-file + 2.1-SNAPSHOT true diff --git a/its/core-it-suite/src/test/resources/it0063/pom.xml b/its/core-it-suite/src/test/resources/it0063/pom.xml index eceb70c939..b12cc70a7c 100644 --- a/its/core-it-suite/src/test/resources/it0063/pom.xml +++ b/its/core-it-suite/src/test/resources/it0063/pom.xml @@ -45,6 +45,7 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT target/compile.txt diff --git a/its/core-it-suite/src/test/resources/it0069/pom.xml b/its/core-it-suite/src/test/resources/it0069/pom.xml index 700f3b2a2c..ef1cf753be 100644 --- a/its/core-it-suite/src/test/resources/it0069/pom.xml +++ b/its/core-it-suite/src/test/resources/it0069/pom.xml @@ -49,6 +49,7 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-dependency-resolution + 2.1-SNAPSHOT target/compile.txt diff --git a/its/core-it-suite/src/test/resources/it0076/pom.xml b/its/core-it-suite/src/test/resources/it0076/pom.xml index bafb77b0a8..68e932bdef 100644 --- a/its/core-it-suite/src/test/resources/it0076/pom.xml +++ b/its/core-it-suite/src/test/resources/it0076/pom.xml @@ -40,6 +40,7 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-file + 2.1-SNAPSHOT exec1 diff --git a/its/core-it-suite/src/test/resources/it0079/pom.xml b/its/core-it-suite/src/test/resources/it0079/pom.xml index 2c3f43a27f..12d0e600f7 100644 --- a/its/core-it-suite/src/test/resources/it0079/pom.xml +++ b/its/core-it-suite/src/test/resources/it0079/pom.xml @@ -45,6 +45,7 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-artifact + 2.1-SNAPSHOT initialize diff --git a/its/core-it-suite/src/test/resources/it0117-testUsesOfPropertiesInAMojo/pom.xml b/its/core-it-suite/src/test/resources/it0117-testUsesOfPropertiesInAMojo/pom.xml index 0a32b11a23..889e30c9d3 100644 --- a/its/core-it-suite/src/test/resources/it0117-testUsesOfPropertiesInAMojo/pom.xml +++ b/its/core-it-suite/src/test/resources/it0117-testUsesOfPropertiesInAMojo/pom.xml @@ -8,6 +8,7 @@ org.apache.maven.its.plugins maven-it-plugin-uses-properties + 2.1-SNAPSHOT validate diff --git a/its/core-it-suite/src/test/resources/mng-0469/test0/pom.xml b/its/core-it-suite/src/test/resources/mng-0469/test0/pom.xml index 241dd12dda..57c18833e4 100644 --- a/its/core-it-suite/src/test/resources/mng-0469/test0/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-0469/test0/pom.xml @@ -37,6 +37,7 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-file + 2.1-SNAPSHOT target/reporting.txt diff --git a/its/core-it-suite/src/test/resources/mng-0469/test1/pom.xml b/its/core-it-suite/src/test/resources/mng-0469/test1/pom.xml index 864b0a98ae..a9f8ce5f08 100644 --- a/its/core-it-suite/src/test/resources/mng-0469/test1/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-0469/test1/pom.xml @@ -37,6 +37,7 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-file + 2.1-SNAPSHOT target/build.txt @@ -50,6 +51,7 @@ under the License. org.apache.maven.its.plugins maven-it-plugin-file + 2.1-SNAPSHOT target/reporting.txt