svn commit: r1639985 - in /ofbiz/branches/release13.07: applications/order/build.xml build.xml common.xml framework/base/build.xml framework/bi/build.xml framework/sql/build.xml framework/start/build.xml macros.xml
Locked
svn commit: r1639985 - in /ofbiz/branches/release13.07: applications/order/build.xml build.xml common.xml framework/base/build.xml framework/bi/build.xml framework/sql/build.xml framework/start/build.xml macros.xml
 
|
Author: jleroux
Date: Sun Nov 16 13:46:52 2014 New Revision: 1639985 URL: http://svn.apache.org/r1639985 Log: Forces the branch 13 to use Java 1.7 This is related with the Poodle vulnerability (OFBIZ-4848) which requires to use Java 1.7 Modified: ofbiz/branches/release13.07/applications/order/build.xml ofbiz/branches/release13.07/build.xml ofbiz/branches/release13.07/common.xml ofbiz/branches/release13.07/framework/base/build.xml ofbiz/branches/release13.07/framework/bi/build.xml ofbiz/branches/release13.07/framework/sql/build.xml ofbiz/branches/release13.07/framework/start/build.xml ofbiz/branches/release13.07/macros.xml Modified: ofbiz/branches/release13.07/applications/order/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/build.xml?rev=1639985&r1=1639984&r2=1639985&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/build.xml (original) +++ ofbiz/branches/release13.07/applications/order/build.xml Sun Nov 16 13:46:52 2014 @@ -56,10 +56,10 @@ under the License. <!-- ================================================================== --> <target name="classes" depends="prepare"> - <javac16> + <javac17> <!-- exclude the payment processor packages; comment if you have libs --> <exclude name="org/ofbiz/order/thirdparty/taxware/**"/> - </javac16> + </javac17> </target> <target name="jar" depends="classes"> Modified: ofbiz/branches/release13.07/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/build.xml?rev=1639985&r1=1639984&r2=1639985&view=diff ============================================================================== --- ofbiz/branches/release13.07/build.xml (original) +++ ofbiz/branches/release13.07/build.xml Sun Nov 16 13:46:52 2014 @@ -1130,8 +1130,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.6" /> - <property name="sonar.java.target" value="1.6" /> + <property name="sonar.java.source" value="1.7" /> + <property name="sonar.java.target" value="1.7" /> <!-- default for jdbc url: jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8--> <property name="sonar.jdbc.url" value="${sonar.jdbc.url}"/> <property name="sonar.jdbc.driverClassName" value="com.mysql.jdbc.Driver" /> Modified: ofbiz/branches/release13.07/common.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/common.xml?rev=1639985&r1=1639984&r2=1639985&view=diff ============================================================================== --- ofbiz/branches/release13.07/common.xml (original) +++ ofbiz/branches/release13.07/common.xml Sun Nov 16 13:46:52 2014 @@ -88,7 +88,7 @@ under the License. <!-- ================================================================== --> <target name="classes" depends="prepare"> - <javac16/> + <javac17/> </target> <target name="jar" depends="classes"> Modified: ofbiz/branches/release13.07/framework/base/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/base/build.xml?rev=1639985&r1=1639984&r2=1639985&view=diff ============================================================================== --- ofbiz/branches/release13.07/framework/base/build.xml (original) +++ ofbiz/branches/release13.07/framework/base/build.xml Sun Nov 16 13:46:52 2014 @@ -87,7 +87,7 @@ under the License. </target> <target name="classes" depends="prepare,gen-src"> - <javac16/> + <javac17/> </target> <target name="jar" depends="classes"> Modified: ofbiz/branches/release13.07/framework/bi/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/bi/build.xml?rev=1639985&r1=1639984&r2=1639985&view=diff ============================================================================== --- ofbiz/branches/release13.07/framework/bi/build.xml (original) +++ ofbiz/branches/release13.07/framework/bi/build.xml Sun Nov 16 13:46:52 2014 @@ -46,6 +46,6 @@ under the License. <!-- ================================================================== --> <target name="classes" depends="prepare"> - <javac16 classpathref="local.class.path"/> + <javac17 classpathref="local.class.path"/> </target> </project> Modified: ofbiz/branches/release13.07/framework/sql/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/sql/build.xml?rev=1639985&r1=1639984&r2=1639985&view=diff ============================================================================== --- ofbiz/branches/release13.07/framework/sql/build.xml (original) +++ ofbiz/branches/release13.07/framework/sql/build.xml Sun Nov 16 13:46:52 2014 @@ -61,7 +61,7 @@ under the License. </target> <target name="classes" depends="prepare,gen-src"> - <javac16/> + <javac17/> </target> <target name="jar" depends="classes"> Modified: ofbiz/branches/release13.07/framework/start/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/start/build.xml?rev=1639985&r1=1639984&r2=1639985&view=diff ============================================================================== --- ofbiz/branches/release13.07/framework/start/build.xml (original) +++ ofbiz/branches/release13.07/framework/start/build.xml Sun Nov 16 13:46:52 2014 @@ -34,7 +34,7 @@ under the License. <target name="classes" depends="prepare"> <!-- compile start --> - <javac16 destdir="${build.dir}/classes" srcdir="${src.dir}"/> + <javac17 destdir="${build.dir}/classes" srcdir="${src.dir}"/> </target> <target name="jar" depends="classes"> Modified: ofbiz/branches/release13.07/macros.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/macros.xml?rev=1639985&r1=1639984&r2=1639985&view=diff ============================================================================== --- ofbiz/branches/release13.07/macros.xml (original) +++ ofbiz/branches/release13.07/macros.xml Sun Nov 16 13:46:52 2014 @@ -23,12 +23,12 @@ under the License. </condition> <fail unless="antatleast171" message="Please upgrade ant to at least 1.7.1"/> - <condition property="javaatleast16"> + <condition property="javaatleast17"> <not> - <matches pattern="^1\.[0-5]($|\..*)" string="${ant.java.version}"/> + <matches pattern="^1\.[0-6]($|\..*)" string="${ant.java.version}"/> </not> </condition> - <fail unless="javaatleast16" message="Please upgrade java to at least 1.6"/> + <fail unless="javaatleast17" message="Please upgrade java to at least 1.7"/> <dirname property="ofbiz.home.dir" file="${ant.file.Ant - Macros}"/> <macrodef name="iterate"> @@ -77,8 +77,8 @@ under the License. </javac> </presetdef> - <presetdef name="javac16"> - <default-javac compiler="javac1.6" target="1.6" source="1.6" encoding="UTF-8" sourcepathref="src-path" includeantruntime="false"> + <presetdef name="javac17"> + <default-javac compiler="javac1.7" target="1.7" source="1.7" encoding="UTF-8" sourcepathref="src-path" includeantruntime="false"> <compilerarg value="-Xlint:-path"/> <!-- Please leave this line here. It makes it easier to enable/disable it. @@ -119,7 +119,7 @@ under the License. <exclude name="**/FreeMarkerViewRenderer.java"/> <exclude name="**/JpCacheIncludeTransform.java"/> </fileset> - <link href="http://java.sun.com/javase/6/docs/api/" offline="true" packagelistLoc="${ofbiz.home.dir}/tools/api-java16"/> + <link href="https://docs.oracle.com/javase/7/docs/api/" offline="true" packagelistLoc="${ofbiz.home.dir}/tools/api-java17"/> </javadoc> </presetdef> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |