From 233f6c11c5a2a36103352f2643f2517938d3ba20 Mon Sep 17 00:00:00 2001 From: Benjamin Bentmann Date: Wed, 17 Sep 2008 22:01:45 +0000 Subject: [PATCH] o Decoupled it0029 from the Compiler Plugin git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@696487 13f79535-47bb-0310-9956-ffa450edef68 --- .../integrationtests/MavenIT0029Test.java | 6 +-- .../resources/it0029/child-project/pom.xml | 48 ++++++++++++++----- .../java/org/apache/maven/it0029/Person.java | 18 ------- .../src/test/resources/it0029/pom.xml | 35 +++++++++++--- 4 files changed, 67 insertions(+), 40 deletions(-) delete mode 100644 its/core-integration-tests/src/test/resources/it0029/child-project/src/main/java/org/apache/maven/it0029/Person.java diff --git a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0029Test.java b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0029Test.java index fbd5c690ad..93a10d7e39 100644 --- a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0029Test.java +++ b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenIT0029Test.java @@ -16,14 +16,14 @@ public class MavenIT0029Test throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/it0029" ); + Verifier verifier = new Verifier( testDir.getAbsolutePath() ); verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0029", "1.0-SNAPSHOT", "jar" ); verifier.deleteArtifact( "org.apache.maven.it", "maven-it-it0029-child", "1.0-SNAPSHOT", "jar" ); verifier.executeGoal( "install" ); - verifier.assertFilePresent( "child-project/target/classes/org/apache/maven/it0029/Person.class" ); + verifier.assertFilePresent( "plugin-management-configuration.txt" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - } -} +} diff --git a/its/core-integration-tests/src/test/resources/it0029/child-project/pom.xml b/its/core-integration-tests/src/test/resources/it0029/child-project/pom.xml index 10c7e46a0e..74ba664eee 100644 --- a/its/core-integration-tests/src/test/resources/it0029/child-project/pom.xml +++ b/its/core-integration-tests/src/test/resources/it0029/child-project/pom.xml @@ -1,27 +1,51 @@ + + + + 4.0.0 + org.apache.maven.its.it0029 maven-it-it0029 1.0-SNAPSHOT + child-project - jar 1.0-SNAPSHOT - - - junit - junit - 3.8.1 - jar - test - - + jar + - org.apache.maven.plugins - maven-compiler-plugin + org.apache.maven.its.plugins + maven-it-plugin-file + + + test + initialize + + file + + + diff --git a/its/core-integration-tests/src/test/resources/it0029/child-project/src/main/java/org/apache/maven/it0029/Person.java b/its/core-integration-tests/src/test/resources/it0029/child-project/src/main/java/org/apache/maven/it0029/Person.java deleted file mode 100644 index 82f1fb6141..0000000000 --- a/its/core-integration-tests/src/test/resources/it0029/child-project/src/main/java/org/apache/maven/it0029/Person.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.apache.maven.it0029; - -public class Person -{ - private String name; - - public void setName( String newName ) - { - assert true; - - this.name = newName; - } - - public String getName() - { - return name; - } -} diff --git a/its/core-integration-tests/src/test/resources/it0029/pom.xml b/its/core-integration-tests/src/test/resources/it0029/pom.xml index fbc2bce533..643e1eefdf 100644 --- a/its/core-integration-tests/src/test/resources/it0029/pom.xml +++ b/its/core-integration-tests/src/test/resources/it0029/pom.xml @@ -1,12 +1,35 @@ + + + + 4.0.0 - Maven Integration Test :: it0029 + org.apache.maven.its.it0029 maven-it-it0029 - Test for pluginManagement injection of plugin configuration. 1.0-SNAPSHOT pom + Maven Integration Test :: it0029 + Test for pluginManagement injection of plugin configuration. + child-project @@ -15,12 +38,10 @@ - org.apache.maven.plugins - maven-compiler-plugin - + org.apache.maven.its.plugins + maven-it-plugin-file - 1.4 - 1.4 + plugin-management-configuration.txt