svn commit: r548837 - in /maven/plugins/trunk/maven-enforcer-plugin/src: main/java/org/apache/maven/plugin/enforcer/ test/java/org/apache/maven/plugin/enforcer/

[brianf]

Author: brianf
Date: Tue Jun 19 12:55:51 2007
New Revision: 548837

URL: http://svn.apache.org/viewvc?view=rev&rev=548837
Log:
MENFORCER-9: fixed npe in java rule

Modified:
    
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EvaluateBeanshell.java
    
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireJavaVersion.java
    
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireJavaVersion.java

Modified: 
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EvaluateBeanshell.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EvaluateBeanshell.java?view=diff&rev=548837&r1=548836&r2=548837
==============================================================================
--- 
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EvaluateBeanshell.java
 (original)
+++ 
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/EvaluateBeanshell.java
 Tue Jun 19 12:55:51 2007
@@ -27,7 +27,6 @@
 import org.apache.maven.shared.enforcer.rule.api.EnforcerRule;
 import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleException;
 import org.apache.maven.shared.enforcer.rule.api.EnforcerRuleHelper;
-import 
org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
 import org.codehaus.plexus.util.StringUtils;
 
 import bsh.EvalError;

Modified: 
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireJavaVersion.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireJavaVersion.java?view=diff&rev=548837&r1=548836&r2=548837
==============================================================================
--- 
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireJavaVersion.java
 (original)
+++ 
maven/plugins/trunk/maven-enforcer-plugin/src/main/java/org/apache/maven/plugin/enforcer/RequireJavaVersion.java
 Tue Jun 19 12:55:51 2007
@@ -36,7 +36,8 @@
  * This rule checks that the Java version is allowed.
  * 
  * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
- * @version $Id$
+ * @version $Id: RequireJavaVersion.java 525005 2007-04-03
+ *          02:46:44Z brianf $
  */
 public class RequireJavaVersion
     extends AbstractVersionEnforcer
@@ -63,11 +64,10 @@
     }
 
     /**
-     * Converts a jdk string from 1.5.0-11b12 to a single 3 digit version like
-     * 1.5.0-11
+     * Converts a jdk string from 1.5.0-11b12 to a single 3
+     * digit version like 1.5.0-11
      * 
-     * @param theJdkVersion
-     *            to be converted.
+     * @param theJdkVersion to be converted.
      * @return the converted string.
      */
     public static String normalizeJDKVersion( String theJdkVersion )
@@ -84,17 +84,19 @@
             String section = (String) iter.next();
             section = section.replaceAll( "[^0-9]", "" );
 
-            buffer.append( Integer.parseInt( section ) );
-
-            if ( i != 2 )
-            {
-                buffer.append( '.' );
-            }
-            else
+            if ( StringUtils.isNotEmpty( section ) )
             {
-                buffer.append( '-' );
-            }
+                buffer.append( Integer.parseInt( section ) );
 
+                if ( i != 2 )
+                {
+                    buffer.append( '.' );
+                }
+                else
+                {
+                    buffer.append( '-' );
+                }
+            }
         }
 
         String version = buffer.toString();

Modified: 
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireJavaVersion.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireJavaVersion.java?view=diff&rev=548837&r1=548836&r2=548837
==============================================================================
--- 
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireJavaVersion.java
 (original)
+++ 
maven/plugins/trunk/maven-enforcer-plugin/src/test/java/org/apache/maven/plugin/enforcer/TestRequireJavaVersion.java
 Tue Jun 19 12:55:51 2007
@@ -34,7 +34,8 @@
 {
     public void testFixJDKVersion()
     {
-        // test that we only take the first 3 versions for comparision
+        // test that we only take the first 3 versions for
+        // comparision
         assertEquals( "1.5.0-11", RequireJavaVersion.normalizeJDKVersion( 
"1.5.0_11" ) );
         assertEquals( "1.5.1", RequireJavaVersion.normalizeJDKVersion( "1.5.1" 
) );
         assertEquals( "1.5.2-1", RequireJavaVersion.normalizeJDKVersion( 
"1.5.2-1.b11" ) );
@@ -49,6 +50,8 @@
         assertEquals( "1.5.0-7", RequireJavaVersion.normalizeJDKVersion( 
"1.5.0-07" ) );
         assertEquals( "1.5.0-7", RequireJavaVersion.normalizeJDKVersion( 
"1.5.0-b7" ) );
         assertEquals( "1.5.0-7", RequireJavaVersion.normalizeJDKVersion( 
"1.5.0-;7" ) );
+        assertEquals( "1.6.0", RequireJavaVersion.normalizeJDKVersion( 
"1.6.0-dp" ) );
+        assertEquals( "1.6.0-2", RequireJavaVersion.normalizeJDKVersion( 
"1.6.0-dp2" ) );
     }
 
     public void testRule()