You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2007/06/06 23:28:48 UTC
svn commit: r544963 - in /maven/plugins/trunk/maven-eclipse-plugin/src:
main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
test/java/org/apache/maven/plugin/eclipse/EclipseToMavenTest.java
Author: carlos
Date: Wed Jun 6 14:28:47 2007
New Revision: 544963
URL: http://svn.apache.org/viewvc?view=rev&rev=544963
Log:
Fix optional resolution attribute not being picked up
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseToMavenTest.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java?view=diff&rev=544963&r1=544962&r2=544963
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/EclipseToMavenMojo.java Wed Jun 6 14:28:47 2007
@@ -509,7 +509,7 @@
Map attributes = (Map) entry.getValue();
String version = (String) attributes.get( Analyzer.BUNDLE_VERSION.toLowerCase() );
- boolean optional = "optional".equals( attributes.get( "resolution" ) );
+ boolean optional = "optional".equals( attributes.get( "resolution:" ) );
if ( version == null )
{
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseToMavenTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseToMavenTest.java?view=diff&rev=544963&r1=544962&r2=544963
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseToMavenTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseToMavenTest.java Wed Jun 6 14:28:47 2007
@@ -59,15 +59,22 @@
assertEquals( "org.eclipse", deps[0].getGroupId() );
assertEquals( "ui", deps[0].getArtifactId() );
assertEquals( "[3.2.0,4.0.0)", deps[0].getVersion() );
+ assertFalse( deps[0].isOptional() );
+
assertEquals( "org.eclipse.ui", deps[1].getGroupId() );
assertEquals( "console", deps[1].getArtifactId() );
assertEquals( "[3.1.100,4.0.0)", deps[1].getVersion() );
+ assertTrue( deps[1].isOptional() );
+
assertEquals( "org.eclipse", deps[2].getGroupId() );
assertEquals( "help", deps[2].getArtifactId() );
assertEquals( "[3.2.0,4.0.0)", deps[2].getVersion() );
+ assertFalse( deps[2].isOptional() );
+
assertEquals( "org.eclipse.core", deps[3].getGroupId() );
assertEquals( "expressions", deps[3].getArtifactId() );
assertEquals( "[3.2.0,4.0.0)", deps[3].getVersion() );
+ assertFalse( deps[3].isOptional() );
}
/**