You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ba...@apache.org on 2011/09/22 07:57:50 UTC
svn commit: r1173955 - in /maven/plugins/trunk/maven-eclipse-plugin/src: it/
test/resources/projects/project-41/expected/target/eclipseEar/META-INF/.modulemaps
Author: baerrach
Date: Thu Sep 22 05:57:50 2011
New Revision: 1173955
URL: http://svn.apache.org/viewvc?rev=1173955&view=rev
Log:
[MECLIPSE-388]
.classpath files are now checked using assertXMLIdentical.
Configured surefire-report plugin to look at both the surefire report and failsafe reports
Added maven.test.jvmargs property to invocations of surefire and failsafe plugins.
Added documentation on testing
Deleted EclipseWriterConfig.getDepsOrdered(), all code now uses getDeps()
Deleted comment as dependencies should no longer be ordered - // TODO if (..magic property equals orderDependencies..)
AbstractIdeSupportMojo.getProjectArtifacts() preserves dependency order via LinkedHashSet.
Things that are now ordered correctly:
* AbstractEclipseManifestWriter.java: META-INF/MANIFEST.MF
* EclipseClasspathWriter.java: .classpath
* EclipseOSGiManifestWriter.java: (deprecated anyway)
* EclipseProjectWriter.java: .project
* RadApplicationXMLWriter.java: META-INF/.modulemaps
* RadLibCopier.java: (library files aren't ordered on disk)
* RadWebSettingsWriter.java: .websettings
* AbstractWtpResourceWriter.java: .settings/org.eclipse.wst.common.component
* EclipseWtpApplicationXMLWriter.java: target/eclipseEar/META-INF/application.xml, target/eclipseEar/META-INF/.modulemaps
[MECLIPSE-696]
Noted which tests fail because of this bug.
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/it/ (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-41/expected/target/eclipseEar/META-INF/.modulemaps
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/it/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Sep 22 05:57:50 2011
@@ -0,0 +1 @@
+settings-baerrach.xml
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-41/expected/target/eclipseEar/META-INF/.modulemaps
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-41/expected/target/eclipseEar/META-INF/.modulemaps?rev=1173955&r1=1173954&r2=1173955&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-41/expected/target/eclipseEar/META-INF/.modulemaps (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-41/expected/target/eclipseEar/META-INF/.modulemaps Thu Sep 22 05:57:50 2011
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<modulemap:EARProjectMap xmlns:xmi="http://www.omg.org/XMI" xmlns:application="application.xmi" xmi:version="2.0" xmlns:modulemap="modulemap.xmi" xmi:id="EARProjectMap_5369678">
- <utilityJARMappings uri="direct-compile.jar" projectName="direct-compile" xmi:id="UtilityJARMapping_20313166"/>
- <utilityJARMappings uri="deps-direct-compile.jar" projectName="deps-direct-compile" xmi:id="UtilityJARMapping_20591791"/>
+ <utilityJARMappings uri="direct-compile.jar" projectName="direct-compile" xmi:id="UtilityJARMapping_00000000"/>
+ <utilityJARMappings uri="deps-direct-compile.jar" projectName="deps-direct-compile" xmi:id="UtilityJARMapping_00000000"/>
</modulemap:EARProjectMap>
\ No newline at end of file