From 110547eef7563e5bf90dd978fef61417a8bfeb6b Mon Sep 17 00:00:00 2001
From: John Dennis Casey <jdcasey@apache.org>
Date: Wed, 4 Jun 2008 18:49:07 +0000
Subject: [PATCH] [MNG-3530] Adding a second integration test that shows how
POM properties display a similarly locked-down behavior after initial POM
interpolation...this even happens in 2.0.8, in the case of POM properties.
git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@663339 13f79535-47bb-0310-9956-ffa450edef68
---
...ITmng3530ChangedPathInterpolationTest.java | 32 ++++++-
.../{ => build-path}/plugin/pom.xml | 2 +-
.../src/main/java/mng3530/SetPathMojo.java | 0
.../main/java/mng3530/ValidatePathMojo.java | 0
.../{ => build-path}/project/pom.xml | 4 +-
.../project/src/main/java/tests/App.java | 0
.../project/src/test/java/tests/AppTest.java | 0
.../pom-property/plugin/pom.xml | 28 ++++++
.../main/java/mng3530/SetPropertyMojo.java | 69 ++++++++++++++
.../java/mng3530/ValidatePropertyMojo.java | 63 +++++++++++++
.../pom-property/project/pom.xml | 49 ++++++++++
.../project/src/main/java/tests/App.java | 13 +++
.../project/src/test/java/tests/AppTest.java | 38 ++++++++
.../maven-archiver/pom.properties | 5 -
.../project/target-modified/project-1.jar | Bin 2266 -> 0 bytes
.../surefire-reports/TEST-tests.AppTest.xml | 87 ------------------
.../surefire-reports/tests.AppTest.txt | 4 -
17 files changed, 293 insertions(+), 101 deletions(-)
rename its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/{ => build-path}/plugin/pom.xml (93%)
rename its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/{ => build-path}/plugin/src/main/java/mng3530/SetPathMojo.java (100%)
rename its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/{ => build-path}/plugin/src/main/java/mng3530/ValidatePathMojo.java (100%)
rename its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/{ => build-path}/project/pom.xml (92%)
rename its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/{ => build-path}/project/src/main/java/tests/App.java (100%)
rename its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/{ => build-path}/project/src/test/java/tests/AppTest.java (100%)
create mode 100644 its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/plugin/pom.xml
create mode 100644 its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/plugin/src/main/java/mng3530/SetPropertyMojo.java
create mode 100644 its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/plugin/src/main/java/mng3530/ValidatePropertyMojo.java
create mode 100644 its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/project/pom.xml
create mode 100644 its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/project/src/main/java/tests/App.java
create mode 100644 its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/project/src/test/java/tests/AppTest.java
delete mode 100644 its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/maven-archiver/pom.properties
delete mode 100644 its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/project-1.jar
delete mode 100644 its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/surefire-reports/TEST-tests.AppTest.xml
delete mode 100644 its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/surefire-reports/tests.AppTest.txt
diff --git a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3530ChangedPathInterpolationTest.java b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3530ChangedPathInterpolationTest.java
index 3a84c04430..32de3aad06 100644
--- a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3530ChangedPathInterpolationTest.java
+++ b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3530ChangedPathInterpolationTest.java
@@ -47,10 +47,38 @@ public MavenITmng3530ChangedPathInterpolationTest()
super( "(2.0.9,)" ); // only test in 2.0.9+
}
- public void testitMNG3530 ()
+ public void testitMNG3530_BuildPath()
throws Exception
{
- File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3530-changedPathInterpolation" );
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+ "/mng-3530-changedPathInterpolation/build-path" );
+ File pluginDir = new File( testDir, "plugin" );
+ File projectDir = new File( testDir, "project" );
+
+ // First, install the plugin that modifies the project.build.directory and
+ // validates that the modification propagated into the validation-mojo
+ // configuration. Once this is installed, we can run a project build that
+ // uses it to see how Maven will respond to a modification in the project build directory.
+ Verifier verifier = new Verifier( pluginDir.getAbsolutePath() );
+ verifier.executeGoal( "install" );
+
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+
+ // Now, build the project. If the plugin configuration doesn't recognize
+ // the update to the project.build.directory, it will fail the build.
+ verifier = new Verifier( projectDir.getAbsolutePath() );
+
+ verifier.executeGoal( "package" );
+ verifier.verifyErrorFreeLog();
+ verifier.resetStreams();
+ }
+
+ public void testitMNG3530_POMProperty()
+ throws Exception
+ {
+ File testDir = ResourceExtractor.simpleExtractResources( getClass(),
+ "/mng-3530-changedPathInterpolation/pom-property" );
File pluginDir = new File( testDir, "plugin" );
File projectDir = new File( testDir, "project" );
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/plugin/pom.xml b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/build-path/plugin/pom.xml
similarity index 93%
rename from its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/plugin/pom.xml
rename to its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/build-path/plugin/pom.xml
index b4a69aa5ba..4bb519561b 100644
--- a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/plugin/pom.xml
+++ b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/build-path/plugin/pom.xml
@@ -2,7 +2,7 @@
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.mng3530</groupId>
- <artifactId>plugin</artifactId>
+ <artifactId>build-path-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>1</version>
<name>plugin Maven Mojo</name>
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/plugin/src/main/java/mng3530/SetPathMojo.java b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/build-path/plugin/src/main/java/mng3530/SetPathMojo.java
similarity index 100%
rename from its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/plugin/src/main/java/mng3530/SetPathMojo.java
rename to its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/build-path/plugin/src/main/java/mng3530/SetPathMojo.java
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/plugin/src/main/java/mng3530/ValidatePathMojo.java b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/build-path/plugin/src/main/java/mng3530/ValidatePathMojo.java
similarity index 100%
rename from its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/plugin/src/main/java/mng3530/ValidatePathMojo.java
rename to its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/build-path/plugin/src/main/java/mng3530/ValidatePathMojo.java
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/pom.xml b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/build-path/project/pom.xml
similarity index 92%
rename from its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/pom.xml
rename to its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/build-path/project/pom.xml
index 77880eb4cc..e9d3e5d6fd 100644
--- a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/pom.xml
+++ b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/build-path/project/pom.xml
@@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.its.mng3530</groupId>
- <artifactId>project</artifactId>
+ <artifactId>build-path-project</artifactId>
<packaging>jar</packaging>
<version>1</version>
<name>project</name>
@@ -20,7 +20,7 @@
<plugins>
<plugin>
<groupId>org.apache.maven.its.mng3530</groupId>
- <artifactId>plugin</artifactId>
+ <artifactId>build-path-maven-plugin</artifactId>
<version>1</version>
<executions>
<execution>
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/src/main/java/tests/App.java b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/build-path/project/src/main/java/tests/App.java
similarity index 100%
rename from its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/src/main/java/tests/App.java
rename to its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/build-path/project/src/main/java/tests/App.java
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/src/test/java/tests/AppTest.java b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/build-path/project/src/test/java/tests/AppTest.java
similarity index 100%
rename from its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/src/test/java/tests/AppTest.java
rename to its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/build-path/project/src/test/java/tests/AppTest.java
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/plugin/pom.xml b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/plugin/pom.xml
new file mode 100644
index 0000000000..032a7250ef
--- /dev/null
+++ b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/plugin/pom.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng3530</groupId>
+ <artifactId>pom-property-maven-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <version>1</version>
+ <name>plugin Maven Mojo</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.6</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/plugin/src/main/java/mng3530/SetPropertyMojo.java b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/plugin/src/main/java/mng3530/SetPropertyMojo.java
new file mode 100644
index 0000000000..dc68f17471
--- /dev/null
+++ b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/plugin/src/main/java/mng3530/SetPropertyMojo.java
@@ -0,0 +1,69 @@
+package mng3530;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.plugin.Mojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.project.MavenProject;
+
+/**
+ * Modify the POM property myDirectory, contained in the current
+ * project instance. This and the corresponding {@link ValidatePropertyMojo} should
+ * prove or disprove the ability to have POM-property modifications ripple through
+ * the project's values, such as plugin configurations.
+ *
+ * @goal set
+ * @phase compile
+ */
+public class SetPropertyMojo
+ implements Mojo
+{
+ public static final String MODIFIED_PROPERTY_VALUE = "modified";
+
+ /**
+ * Project instance to modify.
+ *
+ * @parameter default-value="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
+ private Log log;
+
+ public void execute()
+ throws MojoExecutionException
+ {
+ getLog().info( "Before modification, myDirectory is: " + project.getProperties().getProperty( "myDirectory" ) );
+
+ project.getProperties().setProperty( "myDirectory", MODIFIED_PROPERTY_VALUE );
+
+ getLog().info( "After modification, myDirectory is: " + project.getProperties().getProperty( "myDirectory" ) );
+ getLog().info( "Modifications complete." );
+ }
+
+ public Log getLog()
+ {
+ return log;
+ }
+
+ public void setLog( Log log )
+ {
+ this.log = log;
+ }
+}
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/plugin/src/main/java/mng3530/ValidatePropertyMojo.java b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/plugin/src/main/java/mng3530/ValidatePropertyMojo.java
new file mode 100644
index 0000000000..e11533cc09
--- /dev/null
+++ b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/plugin/src/main/java/mng3530/ValidatePropertyMojo.java
@@ -0,0 +1,63 @@
+package mng3530;
+
+import org.apache.maven.plugin.Mojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.project.MavenProject;
+
+/**
+ * Validate that the POM property has been reset by the {@link SetPropertyMojo}.
+ *
+ * @goal validate
+ * @phase package
+ */
+public class ValidatePropertyMojo
+ implements Mojo
+{
+
+ /**
+ * @parameter
+ */
+ private String buildDirectory;
+
+ /**
+ * Project instance to validate.
+ *
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
+ private Log log;
+
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ getLog().info( "Validating buildDirectory parameter: " + buildDirectory );
+ String apiValue = project.getProperties().getProperty( "myDirectory" );
+
+ if ( !apiValue.equals( buildDirectory ) )
+ {
+ throw new MojoExecutionException( "buildDirectory parameter value:\n\n" + buildDirectory
+ + "\n\ndoes not match ${myDirectory} from project:\n\n"
+ + apiValue + "\n" );
+ }
+ else
+ {
+ getLog().info( "buildDirectory matches ${myDirectory} in the current POM instance." );
+ }
+ }
+
+ public Log getLog()
+ {
+ return log;
+ }
+
+ public void setLog( Log log )
+ {
+ this.log = log;
+ }
+
+}
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/project/pom.xml b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/project/pom.xml
new file mode 100644
index 0000000000..7bb29c4763
--- /dev/null
+++ b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/project/pom.xml
@@ -0,0 +1,49 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.its.mng3530</groupId>
+ <artifactId>pom-property-project</artifactId>
+ <packaging>jar</packaging>
+ <version>1</version>
+ <name>project</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <properties>
+ <myDirectory>something</myDirectory>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.its.mng3530</groupId>
+ <artifactId>pom-property-maven-plugin</artifactId>
+ <version>1</version>
+ <executions>
+ <execution>
+ <id>set</id>
+ <goals>
+ <goal>set</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>validate</id>
+ <goals>
+ <goal>validate</goal>
+ </goals>
+ <configuration>
+ <buildDirectory>${myDirectory}</buildDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/project/src/main/java/tests/App.java b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/project/src/main/java/tests/App.java
new file mode 100644
index 0000000000..53e46ad9e0
--- /dev/null
+++ b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/project/src/main/java/tests/App.java
@@ -0,0 +1,13 @@
+package tests;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/project/src/test/java/tests/AppTest.java b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/project/src/test/java/tests/AppTest.java
new file mode 100644
index 0000000000..c378ad2cd5
--- /dev/null
+++ b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/pom-property/project/src/test/java/tests/AppTest.java
@@ -0,0 +1,38 @@
+package tests;
+
+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-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/maven-archiver/pom.properties b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/maven-archiver/pom.properties
deleted file mode 100644
index e4b47a6bfd..0000000000
--- a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/maven-archiver/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Tue Jun 03 18:23:15 EDT 2008
-version=1
-groupId=org.apache.maven.its.mng3530
-artifactId=project
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/project-1.jar b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/project-1.jar
deleted file mode 100644
index d7332fa0c9c914a0b2db07b92e8e0690509af2fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2266
zcmWIWW@h1H00G6xhb_PiD8UJ&eO*Hwbv^yu^aG&EIKay0Zk%*511Mbw#3IPbd>#Ef
z-CTo1^nBeu`<^-N<E^WAk=I*S>)e_1n}ZCl7(aMgq~mq&gpRka69@Z~C1F#<v=69M
z?3~jbB<vj&TryW{t%wY_&}8Ev(Hh~?L7#y#UdF{<2OdRgp6ooja;m^Wk=XT9awhy#
zt8)9;mbNEmPYeUhWef}oXdYk#x~wF%xTF}#^&mCc_kZ#SFfuUkGBGgl!__zz6zC=A
zBo-Iv2A=j}b`)51GP}%tb!TU1zORj|<M$VeN*xMvVxmePA7oDAIoVR%a<}tA`b)=y
z&GHZ2JNM2`5HM=j+qG-=vZ`mlpMU0#ob%v<6XR>OtQFEXHf-qB?aS?xZ9BA+Ys$Wa
z6WjWB@$6h(pdjhBj_b+WEALOfaQtGEq?LC=JTBZt>*Vtkzy6Rj0VP{|O5eozspTrw
zE@Wz}dVNy1JN;pWl7yA4?8<~2e(MD;PH0=@eTpYceU4jg<yxW2W)}a+YSJ=n$Jh1R
zzA?UGe(Cd}W62Vg&1%ORd)a33Je$wm_Q~n@I`e6@fBRqUITH12OR>dLr`$A`)^oNy
zFFbMOn!hJx`URevNhxx<5!t%Y0=`dPZk;@t(Yq(uM6;MfGV$LJ<~OFg(IVWMCj*yc
zoR{JV=kQ&#$VA@G`)EhC^Rh{`?s<v{f=$PGrJ_4#Xe9SesMCA9<{uLxf|SrA2o(76
z6qcJ<mYN5TDFy~~#X6XZ^NZ5;5(^TOGg9@yy7e+kiuH2y(v3}x4e*#`LZV3pMfq8&
z$t7?TIT+SYI&2XsP^-2Tn2I!685pd|G_fE*SFa*BXKs+M{~ZH?y`QziwAbBO=&icN
z$ga?lX=~8ZRpu#g6e~R6oG9DWz3SihU)o1*^1D=j-cy<X>}-Wc`WLnx(Qj_K-JJcj
zyZElu<7vDL1YS$jGcNJ%-CtjQAbf?>RU^ae*4p=P-hL~V8$R*-(p7pN*SG(ckGrvn
zd*zzsuEU>lHh$>Z+WTSevooG+?JnjOb_q6iKYX>ZYR!dnU8-MoJyx@t*dL6DpL>jn
z<@^SRRlV<aTRYay+?b@LKi75bs_^*mII~SnO_J*KCCly3{8rj=fa&P<%G9kPrgsgT
zKZvwFnXo%v$VS9XBs)<{Vll(_Wee4hsadEndpfXtH9Qi^VeopP%XoCf>^M*J*_z9`
zC5@8pLREVE!e2<8W$(y5UCMr?@$0KEet946_z9*TXRLXZI@x;Sx|e?sy{UdE(*N-P
zpW6?otbDf7(EneM-yyyV`Mzs@37pec9ACOX?2p@$8{SuDnU?jXns7eK);q{9)zts(
z?}@Vqq%>zV*KamiY4`MWbIj`W$nR~kw<P}m4wI_?aBI)S&-Z`+3iMGhO#3IW$Ng@0
z?WVIAuZlb<iQi$f!En>du+OnoCO;Ra*E7PBH3!2BU}{i#GNnHsm<mdO*olJF08DEI
zsYNB3sl}pa4ssnb;9<B>y<cfVb!IqQ@`l+;T=%{)Z|vTB=+dO6%>U!|+Q*eEsyQwd
zm6PA`*fD3<Qo%b?&D;-;ujHRB|DYynL3y4D`^kCS=kKX#u8q6C(_>SF;l2}j{|}_y
zeS1uk=b)s>S^u72#i6HWFPa5R+>A^j%(!a;pr3$1fZ?qph=%7{gf{Fo14uClENN5+
zl5lNE^#sBM>?Jr@JJ{lbKqjm_hdGu5T<W8j=ny?1Tc5)9z{_`J3(*T1P>BQqAfF}y
zD+sugVdWFdX6z*tLUTW+W&-6EZj(VJ7Q*D4B$|vUzhE|CFTr4TENRqc#_%{^x5I3J
omS>0%#-2G47FhxdPqYvw+9E_&3GikG)%6UVK)44OI2>Re0KP=}X8-^I
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/surefire-reports/TEST-tests.AppTest.xml b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/surefire-reports/TEST-tests.AppTest.xml
deleted file mode 100644
index 14d60ee52c..0000000000
--- a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/surefire-reports/TEST-tests.AppTest.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="0" skipped="0" tests="1" time="0.017" failures="0" name="tests.AppTest">
- <properties>
- <property value="Apple Computer, Inc." name="java.vendor"/>
- <property value="/Users/jdcasey/.m2/repository" name="localRepository"/>
- <property value="SUN_STANDARD" name="sun.java.launcher"/>
- <property value="a854b0" name="env.SECURITYSESSIONID"/>
- <property value="Mac OS X" name="os.name"/>
- <property value="/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Classes/laf.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Classes/sunrsasign.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Classes/jsse.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Classes/jce.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Classes/charsets.jar" name="sun.boot.class.path"/>
- <property value="/Users/jdcasey/workspace/maven/core-integration-testing/mng-3530/src/test/resources/mng-3530-changedPathInterpolation/project" name="env.PWD"/>
- <property value="" name="sun.java2d.fontpath"/>
- <property value="Sun Microsystems Inc." name="java.vm.specification.vendor"/>
- <property value="1.4.2_16-b05-303" name="java.runtime.version"/>
- <property value="jdcasey" name="user.name"/>
- <property value="jdcasey" name="env.USER"/>
- <property value="/bin/bash" name="env.SHELL"/>
- <property value="0x1F5:0:0" name="env.__CF_USER_TEXT_ENCODING"/>
- <property value="true" name="awt.nativeDoubleBuffering"/>
- <property value="/Users/jdcasey/apps/maven/apache-maven-2.0.9/bin:/Users/jdcasey/bin:/Users/jdcasey/apps/amazonws/current-ec2/bin:/usr/local/bin:/usr/local/sbin:/sbin:/usr/sbin:/sw/bin:/sw/sbin:/usr/local/graphviz-2.14/bin:/bin:/sbin:/usr/bin:/usr/local/bin:/usr/sbin:/usr/X11R6/bin" name="env.PATH"/>
- <property value="en" name="user.language"/>
- <property value="/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Libraries" name="sun.boot.library.path"/>
- <property value="/Users/jdcasey/apps/maven/apache-maven-2.0.9/bin/m2.conf" name="classworlds.conf"/>
- <property value="1.4.2_16" name="java.version"/>
- <property value="America/New_York" name="user.timezone"/>
- <property value="32" name="sun.arch.data.model"/>
- <property value="/Users/jdcasey/apps/amazonws/current-ec2" name="env.EC2_HOME"/>
- <property value="/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home/lib/endorsed" name="java.endorsed.dirs"/>
- <property value="" name="sun.cpu.isalist"/>
- <property value="sun.io" name="file.encoding.pkg"/>
- <property value="2" name="env.SHLVL"/>
- <property value="/" name="file.separator"/>
- <property value="Java Platform API Specification" name="java.specification.name"/>
- <property value="48.0" name="java.class.version"/>
- <property value="US" name="user.country"/>
- <property value="/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home" name="java.home"/>
- <property value="mixed mode" name="java.vm.info"/>
- <property value="2.0.9" name="env.MAVEN_VERSION"/>
- <property value="jdcasey" name="env.LOGNAME"/>
- <property value="10.4.11" name="os.version"/>
- <property value=":" name="path.separator"/>
- <property value="1.4.2-86" name="java.vm.version"/>
- <property value="java.util.prefs.MacOSXPreferencesFactory" name="java.util.prefs.PreferencesFactory"/>
- <property value="/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home" name="env.JAVA_HOME"/>
- <property value="apple.awt.CPrinterJob" name="java.awt.printerjob"/>
- <property value="linux" name="env.TERM"/>
- <property value="UnicodeLittle" name="sun.io.unicode.encoding"/>
- <property value="apple.awt.CToolkit" name="awt.toolkit"/>
- <property value="/usr/local/share/man:/usr/share/man:/sw/share/man:/usr/local/graphviz-2.14/share/man:/usr/X11R6/man:/sw/lib/perl5/5.8.6/man" name="env.MANPATH"/>
- <property value="/Users/jdcasey" name="user.home"/>
- <property value="Sun Microsystems Inc." name="java.specification.vendor"/>
- <property value="org.codehaus.classworlds.Launcher" name="env.JAVA_MAIN_CLASS_1404"/>
- <property value="iTerm.app" name="env.TERM_PROGRAM"/>
- <property value="/Users/jdcasey/.ec2/cert-LITFAREZRVZT2AQ6GFBVWKS22VHYCLDJ.pem" name="env.EC2_CERT"/>
- <property value="/Users/jdcasey/apps/maven/apache-maven-2.0.9" name="env.M2_HOME"/>
- <property value=".:/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java" name="java.library.path"/>
- <property value="http://apple.com/" name="java.vendor.url"/>
- <property value=""Apple Computer, Inc."" name="java.vm.vendor"/>
- <property value="false" name="gopherProxySet"/>
- <property value="/Users/jdcasey/.ec2/pk-LITFAREZRVZT2AQ6GFBVWKS22VHYCLDJ.pem" name="env.EC2_PRIVATE_KEY"/>
- <property value="/Users/jdcasey/apps/maven/apache-maven-2.0.9" name="maven.home"/>
- <property value="Java(TM) 2 Runtime Environment, Standard Edition" name="java.runtime.name"/>
- <property value="/Users/jdcasey/apps/maven/apache-maven-2.0.9/boot/classworlds-1.1.jar" name="java.class.path"/>
- <property value="ssh" name="env.CVS_RSH"/>
- <property value="Java Virtual Machine Specification" name="java.vm.specification.name"/>
- <property value="1.0" name="java.vm.specification.version"/>
- <property value="little" name="sun.cpu.endian"/>
- <property value="unknown" name="sun.os.patch.level"/>
- <property value="/Users/jdcasey" name="env.HOME"/>
- <property value="/Users/jdcasey/workspace/maven/core-integration-testing/mng-3530/src/test/resources/mng-3530-changedPathInterpolation/project/target/test-classes:/Users/jdcasey/workspace/maven/core-integration-testing/mng-3530/src/test/resources/mng-3530-changedPathInterpolation/project/target/classes:/Users/jdcasey/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar:" name="surefire.test.class.path"/>
- <property value="/tmp" name="java.io.tmpdir"/>
- <property value="http://developer.apple.com/java/" name="java.vendor.url.bug"/>
- <property value="i386" name="os.arch"/>
- <property value="apple.awt.CGraphicsEnvironment" name="java.awt.graphicsenv"/>
- <property value="/Library/Java/Extensions:/System/Library/Java/Extensions:/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home/lib/ext" name="java.ext.dirs"/>
- <property value="/sw/lib/perl5:/sw/lib/perl5/darwin" name="env.PERL5LIB"/>
- <property value="/Users/jdcasey/workspace/maven/core-integration-testing/mng-3530/src/test/resources/mng-3530-changedPathInterpolation/project" name="user.dir"/>
- <property value="b05-303" name="mrj.version"/>
- <property value="/sw/share/info:/sw/info:/usr/share/info" name="env.INFOPATH"/>
- <property value="
-" name="line.separator"/>
- <property value="Java HotSpot(TM) Client VM" name="java.vm.name"/>
- <property value="/Users/jdcasey/workspace/maven/core-integration-testing/mng-3530/src/test/resources/mng-3530-changedPathInterpolation/project" name="basedir"/>
- <property value="MacRoman" name="file.encoding"/>
- <property value="1.4" name="java.specification.version"/>
- </properties>
- <testcase classname="tests.AppTest" time="0.002" name="testApp"/>
-</testsuite>
\ No newline at end of file
diff --git a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/surefire-reports/tests.AppTest.txt b/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/surefire-reports/tests.AppTest.txt
deleted file mode 100644
index 1101b6687e..0000000000
--- a/its/core-integration-tests/src/test/resources/mng-3530-changedPathInterpolation/project/target-modified/surefire-reports/tests.AppTest.txt
+++ /dev/null
@@ -1,4 +0,0 @@
--------------------------------------------------------------------------------
-Test set: tests.AppTest
--------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.027 sec