maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fgi...@apache.org
Subject svn commit: r425750 - in /maven/plugins/trunk/maven-eclipse-plugin/src: main/java/org/apache/maven/plugin/eclipse/MakeArtifactsMojo.java test/java/org/apache/maven/plugin/eclipse/MakeArtifactsTest.java
Date Wed, 26 Jul 2006 14:53:52 GMT
Author: fgiust
Date: Wed Jul 26 07:53:51 2006
New Revision: 425750

URL: http://svn.apache.org/viewvc?rev=425750&view=rev
Log:
MECLIPSE-135 eclipse:make-artifacts ArrayindexoutOfboundsExcpetion when processing Require-bundles

Modified:
    maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MakeArtifactsMojo.java
    maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MakeArtifactsTest.java

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MakeArtifactsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MakeArtifactsMojo.java?rev=425750&r1=425749&r2=425750&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MakeArtifactsMojo.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/MakeArtifactsMojo.java
Wed Jul 26 07:53:51 2006
@@ -288,7 +288,7 @@
         for ( int j = 0; j < splitAtComma.length; j++ )
         {
             String string = splitAtComma[j];
-            if ( StringUtils.countMatches( string, "\"" ) == 1 )
+            if ( StringUtils.countMatches( string, "\"" ) % 2 != 0 )
             {
                 j++;
                 bundles.add( string + "," + splitAtComma[j] );

Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MakeArtifactsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MakeArtifactsTest.java?rev=425750&r1=425749&r2=425750&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MakeArtifactsTest.java
(original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/MakeArtifactsTest.java
Wed Jul 26 07:53:51 2006
@@ -48,7 +48,7 @@
     public void testParseDependencies()
     {
         Dependency[] deps = mojo.parseDependencies( "org.eclipse.ui;bundle-version=\"[3.2.0,4.0.0)\","
-            + "org.eclipse.ui.console;bundle-version=\"[3.1.100,4.0.0)\",org.eclipse.help;"
+            + "org.eclipse.ui.console;resolution:=\"optional\";bundle-version=\"[3.1.100,4.0.0)\",org.eclipse.help;"
             + "bundle-version=\"[3.2.0,4.0.0)\",org.eclipse.core.expressions;bundle-version=\"[3.2.0,4.0.0)\""
);
 
         assertEquals( 4, deps.length );



Mime
View raw message