diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java index e3b65a644d..17f8557fb5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java @@ -60,6 +60,10 @@ public class MavenITmng3057VersionExprTransformationsTest File remoteRepo = new File( testDir, "target/deployment" ); Verifier verifier = new Verifier( testDir.getAbsolutePath() ); + verifier.setAutoclean( false ); + verifier.deleteDirectory( "target" ); + verifier.deleteDirectory( "level2/target" ); + verifier.deleteDirectory( "level2/level3/target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng3057" ); Properties properties = verifier.newDefaultFilterProperties(); @@ -78,7 +82,7 @@ public class MavenITmng3057VersionExprTransformationsTest // envars.put( "MAVEN_OPTS", "-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,server=y,address=5005 -Djava.compiler=NONE" ); // verifier.executeGoal( "deploy", envars ); - verifier.executeGoal( "deploy" ); + verifier.executeGoal( "generate-sources" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); @@ -107,4 +111,5 @@ public class MavenITmng3057VersionExprTransformationsTest assertNull( parent ); } } + } diff --git a/its/core-it-suite/src/test/resources/mng-3057/level2/level3/artifact.jar b/its/core-it-suite/src/test/resources/mng-3057/level2/level3/artifact.jar new file mode 100644 index 0000000000..dca54c8665 Binary files /dev/null and b/its/core-it-suite/src/test/resources/mng-3057/level2/level3/artifact.jar differ diff --git a/its/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml b/its/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml index bb2a1d89b1..0051d3fd8e 100644 --- a/its/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3057/level2/level3/pom.xml @@ -1,21 +1,36 @@ - + 4.0.0 + - level2 org.apache.maven.its.mng3057 + level2 ${testVersion} + level3 ${testVersion} - - - junit - junit - 3.8.1 - test - - + + + + org.apache.maven.its.plugins + maven-it-plugin-artifact + 2.1-SNAPSHOT + + + package + initialize + + set + attach-pom + + + artifact.jar + + + + + + diff --git a/its/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/org/apache/maven/its/mng3057/App.java b/its/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/org/apache/maven/its/mng3057/App.java deleted file mode 100644 index c15e1965f4..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3057/level2/level3/src/main/java/org/apache/maven/its/mng3057/App.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.apache.maven.its.mng3057; - -/** - * Hello world! - * - */ -public class App -{ - public static void main( String[] args ) - { - System.out.println( "Hello World!" ); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/org/apache/maven/its/mng3057/AppTest.java b/its/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/org/apache/maven/its/mng3057/AppTest.java deleted file mode 100644 index d25449c99e..0000000000 --- a/its/core-it-suite/src/test/resources/mng-3057/level2/level3/src/test/java/org/apache/maven/its/mng3057/AppTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.apache.maven.its.mng3057; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -} diff --git a/its/core-it-suite/src/test/resources/mng-3057/level2/pom.xml b/its/core-it-suite/src/test/resources/mng-3057/level2/pom.xml index 8754764eba..e9eca2ebb7 100644 --- a/its/core-it-suite/src/test/resources/mng-3057/level2/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3057/level2/pom.xml @@ -1,15 +1,18 @@ 4.0.0 + - mng-3057 - org.apache.maven.its.mng3057 - ${testVersion} - + org.apache.maven.its.mng3057 + mng-3057 + ${testVersion} + + level2 ${testVersion} pom + level3 - \ No newline at end of file + diff --git a/its/core-it-suite/src/test/resources/mng-3057/pom.xml b/its/core-it-suite/src/test/resources/mng-3057/pom.xml index 9190cfe43c..47a813d1e0 100644 --- a/its/core-it-suite/src/test/resources/mng-3057/pom.xml +++ b/its/core-it-suite/src/test/resources/mng-3057/pom.xml @@ -1,15 +1,15 @@ 4.0.0 + org.apache.maven.its.mng3057 mng-3057 ${testVersion} - pom Integration Test Project for MNG-3057 - This project verifies that MNG-3057 is fixed. It is controlled by a JUnit test called org.apache.maven.integrationtests.MNG3057Test + This project verifies that MNG-3057 is fixed. @@ -24,26 +24,46 @@ level2 - - + - maven-compiler-plugin - 2.0.2 + org.apache.maven.its.plugins + maven-it-plugin-artifact + 2.1-SNAPSHOT + mcompiler-94 + validate - compile + set + + + target/classes + + + + install + generate-sources + + install + + + + deploy + generate-sources + + deploy - \ No newline at end of file +