Author: baerrach
Date: Fri Sep 23 05:52:46 2011
New Revision: 1174528
URL: http://svn.apache.org/viewvc?rev=1174528&view=rev
Log:
[MECLIPSE-388]
Incorrectly checked in files with local workspace references instead of
${basedir} so these failed on Jenkins.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/module-2/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/module-2/expected/.wtpmodules
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.settings/org.eclipse.wst.common.component
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.classpath
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.settings/org.eclipse.wst.common.component
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/module-2/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/module-2/expected/.classpath?rev=1174528&r1=1174527&r2=1174528&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/module-2/expected/.classpath
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/module-2/expected/.classpath
Fri Sep 23 05:52:46 2011
@@ -11,6 +11,6 @@
<classpathentry kind="var"
path="M2_REPO/eclipsetest/direct-test/1.0/direct-test-1.0.jar"/>
<classpathentry kind="src" path="/module-1"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar"/>
- <classpathentry kind="lib"
path="D:/ide/maven/maven-eclipse-plugin/target/test-classes/projects/master-test/module-1/refproject-sysdep.jar"/>
+ <classpathentry kind="lib"
path="${basedir}/target/test-classes/projects/master-test/module-1/refproject-sysdep.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
</classpath>
\ No newline at end of file
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/module-2/expected/.wtpmodules
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/module-2/expected/.wtpmodules?rev=1174528&r1=1174527&r2=1174528&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/module-2/expected/.wtpmodules
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/module-2/expected/.wtpmodules
Fri Sep 23 05:52:46 2011
@@ -27,7 +27,7 @@
<dependent-module archiveName="refproject-compile-1.0.jar"
deploy-path="/WEB-INF/lib"
handle="module:/classpath/var/M2_REPO/eclipsetest/refproject-compile/1.0/refproject-compile-1.0.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="refproject-sysdep.jar"
deploy-path="/WEB-INF/lib"
handle="module:/classpath/lib/D:/ide/maven/maven-eclipse-plugin/target/test-classes/projects/master-test/module-1/refproject-sysdep.jar">
+ <dependent-module archiveName="refproject-sysdep.jar"
deploy-path="/WEB-INF/lib"
handle="module:/classpath/lib/${basedir}/target/test-classes/projects/master-test/module-1/refproject-sysdep.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<wb-resource deploy-path="/WEB-INF/classes" source-path="src/main/java"/>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath?rev=1174528&r1=1174527&r2=1174528&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.classpath
Fri Sep 23 05:52:46 2011
@@ -15,7 +15,7 @@
<attribute value="/WEB-INF/lib"
name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib"
path="D:/ide/maven/maven-eclipse-plugin/target/test-classes/projects/project-34/multymodule-1/refproject-sysdep.jar"/>
+ <classpathentry kind="lib"
path="${basedir}/target/test-classes/projects/project-34/multymodule-1/refproject-sysdep.jar"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/direct-compile/1.0/direct-compile-1.0.jar">
<attributes>
<attribute value="/WEB-INF/lib"
name="org.eclipse.jst.component.dependency"/>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.settings/org.eclipse.wst.common.component
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.settings/org.eclipse.wst.common.component?rev=1174528&r1=1174527&r2=1174528&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.settings/org.eclipse.wst.common.component
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/.settings/org.eclipse.wst.common.component
Fri Sep 23 05:52:46 2011
@@ -16,7 +16,7 @@
<dependent-module archiveName="deps-refproject-compile-1.0.jar"
deploy-path="/WEB-INF/lib"
handle="module:/classpath/var/M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="refproject-sysdep.jar"
deploy-path="/WEB-INF/lib"
handle="module:/classpath/lib/D:/ide/maven/maven-eclipse-plugin/target/test-classes/projects/project-34/multymodule-1/refproject-sysdep.jar">
+ <dependent-module archiveName="refproject-sysdep.jar"
deploy-path="/WEB-INF/lib"
handle="module:/classpath/lib/${basedir}/target/test-classes/projects/project-34/multymodule-1/refproject-sysdep.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="direct-compile-1.0.jar"
deploy-path="/WEB-INF/lib"
handle="module:/classpath/var/M2_REPO/eclipsetest/direct-compile/1.0/direct-compile-1.0.jar">
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.classpath
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.classpath?rev=1174528&r1=1174527&r2=1174528&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.classpath
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.classpath
Fri Sep 23 05:52:46 2011
@@ -15,7 +15,7 @@
<attribute value="/WEB-INF/lib"
name="org.eclipse.jst.component.dependency"/>
</attributes>
</classpathentry>
- <classpathentry kind="lib"
path="D:/ide/maven/maven-eclipse-plugin/target/test-classes/projects/project-51-MECLIPSE-415/multymodule-1/refproject-sysdep.jar"/>
+ <classpathentry kind="lib"
path="${basedir}/target/test-classes/projects/project-51-MECLIPSE-415/multymodule-1/refproject-sysdep.jar"/>
<classpathentry kind="var"
path="M2_REPO/eclipsetest/direct-compile/1.0/direct-compile-1.0.jar">
<attributes>
<attribute value="/WEB-INF/lib"
name="org.eclipse.jst.component.dependency"/>
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.settings/org.eclipse.wst.common.component
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.settings/org.eclipse.wst.common.component?rev=1174528&r1=1174527&r2=1174528&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.settings/org.eclipse.wst.common.component
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-51-MECLIPSE-415/multymodule-2/expected/.settings/org.eclipse.wst.common.component
Fri Sep 23 05:52:46 2011
@@ -16,7 +16,7 @@
<dependent-module archiveName="deps-refproject-compile-1.0.jar"
deploy-path="/WEB-INF/lib"
handle="module:/classpath/var/M2_REPO/eclipsetest/deps-refproject-compile/1.0/deps-refproject-compile-1.0.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="refproject-sysdep.jar"
deploy-path="/WEB-INF/lib"
handle="module:/classpath/lib/D:/ide/maven/maven-eclipse-plugin/target/test-classes/projects/project-51-MECLIPSE-415/multymodule-1/refproject-sysdep.jar">
+ <dependent-module archiveName="refproject-sysdep.jar"
deploy-path="/WEB-INF/lib"
handle="module:/classpath/lib/${basedir}/target/test-classes/projects/project-51-MECLIPSE-415/multymodule-1/refproject-sysdep.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="direct-compile-1.0.jar"
deploy-path="/WEB-INF/lib"
handle="module:/classpath/var/M2_REPO/eclipsetest/direct-compile/1.0/direct-compile-1.0.jar">
