From 5408914095072c959f62d788768c59165fb5fb04 Mon Sep 17 00:00:00 2001 From: Stephen Connolly Date: Mon, 6 Jan 2014 12:13:38 +0000 Subject: [PATCH] this test probably needs to be better designed, but in this case a version range is required for now in order to ensure that there is the dependency available --- .../maven/it/MavenITmng5530MojoExecutionScopeTest.java | 7 ++++--- .../basic}/pom.xml | 0 .../plugin}/pom.xml | 2 +- .../mng5530/mojoexecutionscope/TestExecutionScopeMojo.java | 0 .../mojoexecutionscope/TestExecutionScopedComponent.java | 0 5 files changed, 5 insertions(+), 4 deletions(-) rename its/core-it-suite/src/test/resources/{mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-basic => mng-5530/basic}/pom.xml (100%) rename its/core-it-suite/src/test/resources/{mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin => mng-5530/plugin}/pom.xml (98%) rename its/core-it-suite/src/test/resources/{mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin => mng-5530/plugin}/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopeMojo.java (100%) rename its/core-it-suite/src/test/resources/{mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin => mng-5530/plugin}/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopedComponent.java (100%) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java index 22ab7fc638..c169dddf6d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5530MojoExecutionScopeTest.java @@ -34,14 +34,15 @@ public MavenITmng5530MojoExecutionScopeTest() public void test_copyfiles() throws Exception { - File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng5530-mojo-execution-scope" ); - File pluginDir = new File( testDir, "mng5530-mojo-execution-scope-plugin" ); - File projectDir = new File( testDir, "mng5530-mojo-execution-scope-basic" ); + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5530"); + File pluginDir = new File( testDir, "plugin" ); + File projectDir = new File( testDir, "basic" ); Verifier verifier; // install the test plugin verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" ); + verifier.setSystemProperty("mavenVersion", getMavenVersion()); verifier.executeGoal( "install" ); verifier.resetStreams(); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-basic/pom.xml b/its/core-it-suite/src/test/resources/mng-5530/basic/pom.xml similarity index 100% rename from its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-basic/pom.xml rename to its/core-it-suite/src/test/resources/mng-5530/basic/pom.xml diff --git a/its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-5530/plugin/pom.xml similarity index 98% rename from its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/pom.xml rename to its/core-it-suite/src/test/resources/mng-5530/plugin/pom.xml index 61c0643171..a98e9ca5a0 100644 --- a/its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-5530/plugin/pom.xml @@ -29,7 +29,7 @@ under the License. maven-plugin - 3.1.2-SNAPSHOT + [3.1.2-SNAPSHOT,) diff --git a/its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopeMojo.java b/its/core-it-suite/src/test/resources/mng-5530/plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopeMojo.java similarity index 100% rename from its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopeMojo.java rename to its/core-it-suite/src/test/resources/mng-5530/plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopeMojo.java diff --git a/its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopedComponent.java b/its/core-it-suite/src/test/resources/mng-5530/plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopedComponent.java similarity index 100% rename from its/core-it-suite/src/test/resources/mng5530-mojo-execution-scope/mng5530-mojo-execution-scope-plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopedComponent.java rename to its/core-it-suite/src/test/resources/mng-5530/plugin/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/TestExecutionScopedComponent.java