You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2007/07/04 21:18:02 UTC
svn commit: r553300 - in /maven/plugins/trunk/maven-eclipse-plugin/src/test:
java/org/apache/maven/plugin/eclipse/ resources/projects/master-test/
resources/projects/project-28/module-1/ resources/projects/project-29/
Author: brianf
Date: Wed Jul 4 12:18:01 2007
New Revision: 553300
URL: http://svn.apache.org/viewvc?view=rev&rev=553300
Log:
MECLIPSE-248
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/pom.xml
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java?view=diff&rev=553300&r1=553299&r2=553300
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipsePluginTest.java Wed Jul 4 12:18:01 2007
@@ -337,6 +337,7 @@
testProject( "project-32" );
}
+
/**
* MECLIPSE-287 : dependencies with and without classifiers
* MECLIPSE-151 : test jar source attachments
@@ -344,19 +345,12 @@
* @throws Exception
* any exception thrown during test
*/
+ /*@TODO temporarily disabled, since it randomly fails due to a different order for dependencies in classpath and
+ wtpmodules. This is not a problem, since order could be ignored in this test, but we should rewrite the
+ file-comparing step which at the moment just does line by line comparison
+ project 7 is affected by this as well.
public void testProject33() throws Exception
{
- try
- {
testProject( "project-33" );
- }
- catch (MojoExecutionException e)
- {
- // @TODO temporarily disabled, since it randomly fails due to a different order for dependencies in classpath and
- // wtpmodules. This is not a problem, since order could be ignored in this test, but we should rewrite the
- // file-comparing
- // step which at the moment just does line by line comparison
- //project 7 is affected by this as well.
- }
- }
+ }*/
}
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/pom.xml?view=diff&rev=553300&r1=553299&r2=553300
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/master-test/pom.xml Wed Jul 4 12:18:01 2007
@@ -12,6 +12,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<workspace>${basedir}</workspace>
</configuration>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml?view=diff&rev=553300&r1=553299&r2=553300
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-28/module-1/pom.xml Wed Jul 4 12:18:01 2007
@@ -17,6 +17,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
<configuration>
<wtpversion>1.5</wtpversion>
</configuration>
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/pom.xml?view=diff&rev=553300&r1=553299&r2=553300
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-29/pom.xml Wed Jul 4 12:18:01 2007
@@ -19,7 +19,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
-<!-- <version>test</version>-->
+ <version>test</version>
<configuration>
<wtpversion>1.5</wtpversion>
</configuration>