svn commit: r1709262 - in /ofbiz/trunk: README applications/order/build.xml build.xml common.xml framework/start/build.xml macros.xml

[Taher Alkhateeb]

Author: taher
Date: Sun Oct 18 11:15:59 2015
New Revision: 1709262

URL: http://svn.apache.org/viewvc?rev=1709262&view=rev
Log:
upgrade OFBiz to JDK 8 in reference to the JIRA https://issues.apache.org/jira/browse/OFBIZ-6458

This commit upgrades the framework to Java JDK 8 and prevents compiling
on earlier versions. Hence the build system should be updated to compile on
Java 8. After this point users can commit code holding Java 8 features such
as streams and lambdas

REFS OFBIZ-6458

Modified:
    ofbiz/trunk/README
    ofbiz/trunk/applications/order/build.xml
    ofbiz/trunk/build.xml
    ofbiz/trunk/common.xml
    ofbiz/trunk/framework/start/build.xml
    ofbiz/trunk/macros.xml

Modified: ofbiz/trunk/README
URL: http://svn.apache.org/viewvc/ofbiz/trunk/README?rev=1709262&r1=1709261&r2=1709262&view=diff
==============================================================================
--- ofbiz/trunk/README (original)
+++ ofbiz/trunk/README Sun Oct 18 11:15:59 2015
@@ -1,9 +1,9 @@
 
 Welcome to Apache OFBiz!
 
-All you need to run OFBiz is a 1.7 (version 7) JDK
+All you need to run OFBiz is a 1.8 (version 8) JDK
 (not just the JRE, the full JDK).
-http://java.sun.com/javase/downloads/index.jsp
+http://www.oracle.com/technetwork/java/javase/downloads/index.html
 
 You can load the demo data (strongly advised if you are new to
 OFBiz) with the following command on the command line

Modified: ofbiz/trunk/applications/order/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/build.xml?rev=1709262&r1=1709261&r2=1709262&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/build.xml (original)
+++ ofbiz/trunk/applications/order/build.xml Sun Oct 18 11:15:59 2015
@@ -57,10 +57,10 @@ under the License.
     <!-- ================================================================== -->
 
     <target name="classes" depends="prepare">
-        <javac17>
+        <javac18>
             <!-- exclude the payment processor packages; comment if you have libs -->
             <exclude name="org/ofbiz/order/thirdparty/taxware/**"/>
-        </javac17>
+        </javac18>
     </target>
 
     <target name="jar" depends="classes">

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1709262&r1=1709261&r2=1709262&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Sun Oct 18 11:15:59 2015
@@ -1364,8 +1364,8 @@ under the License.
         <sonar:sonar key="org.apache:ofbiz" version="${info.entry.commit(revision)}" xmlns:sonar="antlib:org.sonar.ant:sonar"/>
         <property name="sonar.dynamicAnalysis" value="reuseReports" />
         <property name="sonar.cobertura.reportPath" value="runtime/logs/cobertura-report/coverage.xml"/>
-        <property name="sonar.java.source" value="1.7" />
-        <property name="sonar.java.target" value="1.7" />
+        <property name="sonar.java.source" value="1.8" />
+        <property name="sonar.java.target" value="1.8" />
         <!-- default for jdbc url: jdbc:mysql://localhost:3306/sonar?useUnicode=true&amp;characterEncoding=utf8-->
         <property name="sonar.jdbc.url" value="${sonar.jdbc.url}"/>
         <property name="sonar.jdbc.driverClassName" value="com.mysql.jdbc.Driver" />

Modified: ofbiz/trunk/common.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/common.xml?rev=1709262&r1=1709261&r2=1709262&view=diff
==============================================================================
--- ofbiz/trunk/common.xml (original)
+++ ofbiz/trunk/common.xml Sun Oct 18 11:15:59 2015
@@ -88,7 +88,7 @@ under the License.
     <!-- ================================================================== -->
 
     <target name="classes" depends="prepare">
-        <javac17/>
+        <javac18/>
     </target>
 
     <target name="jar" depends="classes">

Modified: ofbiz/trunk/framework/start/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/start/build.xml?rev=1709262&r1=1709261&r2=1709262&view=diff
==============================================================================
--- ofbiz/trunk/framework/start/build.xml (original)
+++ ofbiz/trunk/framework/start/build.xml Sun Oct 18 11:15:59 2015
@@ -34,7 +34,7 @@ under the License.
 
     <target name="classes" depends="prepare">
         <!-- compile start -->
-        <javac17 destdir="${build.dir}/classes" srcdir="${src.dir}"/>
+        <javac18 destdir="${build.dir}/classes" srcdir="${src.dir}"/>
     </target>
 
     <target name="jar" depends="classes">

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1709262&r1=1709261&r2=1709262&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Sun Oct 18 11:15:59 2015
@@ -23,12 +23,12 @@ under the License.
  <antversion property="antversion" atleast="${minimumantversion}"/>
  <fail unless="antversion" message="Please upgrade ant to at least ${minimumantversion}. Current ant version is ${ant.version}"/>
 
- <condition property="javaatleast17">
+ <condition property="javaatleast18">
   <not>
-   <matches pattern="^1\.[0-6]($|\..*)" string="${ant.java.version}"/>
+   <matches pattern="^1\.[0-7]($|\..*)" string="${ant.java.version}"/>
   </not>
  </condition>
- <fail unless="javaatleast17" message="Please upgrade java to at least 1.7. Current Java version is ${ant.java.version}"/>
+ <fail unless="javaatleast18" message="Please upgrade java to at least 1.8. Current Java version is ${ant.java.version}"/>
 
  <dirname property="ofbiz.home.dir" file="${ant.file.Ant - Macros}"/>
  <macrodef name="iterate">
@@ -71,8 +71,8 @@ under the License.
   </javac>
  </presetdef>
 
- <presetdef name="javac17">
-  <default-javac compiler="javac1.7" target="1.7" source="1.7" encoding="UTF-8" includeantruntime="false">
+ <presetdef name="javac18">
+  <default-javac compiler="javac1.8" target="1.8" source="1.8" encoding="UTF-8" includeantruntime="false">
    <compilerarg value="-Xlint:-path"/>
    <!--
    Please leave this line here.  It makes it easier to enable/disable it.
@@ -107,7 +107,7 @@ under the License.
         <exclude name="**/JasperReportsJXlsViewHandler.java"/>
         <exclude name="**/JasperReportsPoiXlsViewHandler.java"/>
       </fileset>
-      <link href="http://java.sun.com/javase/7/docs/api/" offline="true" packagelistLoc="${ofbiz.home.dir}/tools/api-java17"/>
+      <link href="http://docs.oracle.com/javase/8/docs/api" offline="true" packagelistLoc="${ofbiz.home.dir}/tools/api-java18"/>
     </javadoc>
  </presetdef>