[jboss-svn-commits] JBL Code SVN: r15675 - in labs/jbossrules/trunk: drools-compiler/src/main/java/org/drools/rule/builder/dialect/java and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2007-10-08 22:00:09 -0400 (Mon, 08 Oct 2007)
New Revision: 15675

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialectConfiguration.java
   labs/jbossrules/trunk/drools-jbrms/pom.xml
   labs/jbossrules/trunk/pom.xml
Log:
JBRULES-1261 Update to JDK1.5 minimum

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2007-10-09 01:46:02 UTC (rev 15674)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java	2007-10-09 02:00:09 UTC (rev 15675)
@@ -496,11 +496,6 @@
                 String lngLevel = this.configuration.getJavaLanguageLevel();
                 settings.setTargetVersion( lngLevel );
 
-                if ( lngLevel == "1.4" ) {
-                    // 1.5 is the minimum for source langauge level, so we can use static imports.
-                    lngLevel = "1.5";
-                }
-
                 settings.setSourceVersion(  lngLevel );
                 break;
             }

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialectConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialectConfiguration.java	2007-10-09 01:46:02 UTC (rev 15674)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialectConfiguration.java	2007-10-09 02:00:09 UTC (rev 15675)
@@ -18,9 +18,9 @@
  * The valid values are "ECLIPSE" and "JANINO" only. 
  * 
  * drools.dialect.java.compiler = <ECLIPSE|JANINO>
- * drools.dialect.java.lngLevel = <1.4|1.5|1.6>
+ * drools.dialect.java.lngLevel = <1.5|1.6>
  * 
- * The default compiler is Eclipse and the default lngLevel is 1.4.
+ * The default compiler is Eclipse and the default lngLevel is 1.5.
  * The lngLevel will attempt to autodiscover your system using the 
  * system property "java.version"
  * 
@@ -37,7 +37,7 @@
     public static final int             ECLIPSE         = 0;
     public static final int             JANINO          = 1;
 
-    public static final String[]        LANGUAGE_LEVELS = new String[]{"1.4", "1.5", "1.6"};
+    public static final String[]        LANGUAGE_LEVELS = new String[]{"1.5", "1.6"};
 
     private String                      languageLevel;
 
@@ -145,14 +145,12 @@
 
         if ( level == null ) {
             String version = System.getProperty( "java.version" );
-            if ( version.startsWith( "1.4" ) ) {
-                level = "1.4";
-            } else if ( version.startsWith( "1.5" ) ) {
+            if ( version.startsWith( "1.5" ) ) {
                 level = "1.5";
             } else if ( version.startsWith( "1.6" ) ) {
                 level = "1.6";
             } else {
-                level = "1.4";
+                level = "1.5";
             }
         }
 

Modified: labs/jbossrules/trunk/drools-jbrms/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-jbrms/pom.xml	2007-10-09 01:46:02 UTC (rev 15674)
+++ labs/jbossrules/trunk/drools-jbrms/pom.xml	2007-10-09 02:00:09 UTC (rev 15675)
@@ -30,15 +30,6 @@
     <!-- Need Java 5 source enabled -->
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.0.1</version>
-          <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
-          </configuration>
-        </plugin>
 	    <plugin>
 	      <artifactId>maven-clean-plugin</artifactId>
 	      <configuration>

Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml	2007-10-09 01:46:02 UTC (rev 15674)
+++ labs/jbossrules/trunk/pom.xml	2007-10-09 02:00:09 UTC (rev 15675)
@@ -346,8 +346,8 @@
           <artifactId>maven-compiler-plugin</artifactId>
           <version>2.0.2</version>
           <configuration>
-            <source>1.4</source>
-            <target>1.4</target>
+            <source>1.5</source>
+            <target>1.5</target>
           </configuration>
         </plugin>
         <plugin>