OFBiz › OFBiz - Dev

Re: svn commit: r1605524 - in /ofbiz/trunk: applications/order/build.xml common.xml framework/base/build.xml framework/bi/build.xml framework/sql/build.xml framework/start/build.xml macros.xml

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

Jacopo Cappellato-4

Re: svn commit: r1605524 - in /ofbiz/trunk: applications/order/build.xml common.xml framework/base/build.xml framework/bi/build.xml framework/sql/build.xml framework/start/build.xml macros.xml

Adam,

did you try this?

Jacopo

Index: build.xml
===================================================================
--- build.xml (revision 1612518)
+++ build.xml (working copy)
@@ -1226,8 +1226,8 @@
<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" />

<property name="sonar.jdbc.url" value="${sonar.jdbc.url}"/>
<property name="sonar.jdbc.driverClassName" value="com.mysql.jdbc.Driver" />

On Jun 25, 2014, at 11:53 PM, Adam Heath <[hidden email]> wrote:

> Nicely done. But now cobertura 1.9.4.1 produces byte-code that fails to verify under 1.7. :(
>
> Don't revert this change, obviously; this is a bug in cobertura. However, I tried to update it yesterday, but it pulled in a whole bunch of other deps, so I might need to play some more.
>
> On 06/25/2014 12:59 PM, [hidden email] wrote:
>> Author: adrianc
>> Date: Wed Jun 25 17:59:46 2014
>> New Revision: 1605524
>>
>> URL: http://svn.apache.org/r1605524
>> Log:
>> Updated build files to use/require Java 7.
>>
>> Modified:
>> ofbiz/trunk/applications/order/build.xml
>> ofbiz/trunk/common.xml
>> ofbiz/trunk/framework/base/build.xml
>> ofbiz/trunk/framework/bi/build.xml
>> ofbiz/trunk/framework/sql/build.xml
>> ofbiz/trunk/framework/start/build.xml
>> ofbiz/trunk/macros.xml
>>
>> Modified: ofbiz/trunk/applications/order/build.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/build.xml?rev=1605524&r1=1605523&r2=1605524&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/applications/order/build.xml (original)
>> +++ ofbiz/trunk/applications/order/build.xml Wed Jun 25 17:59:46 2014
>> @@ -56,10 +56,10 @@ under the License.
>> 
>> <target name="classes" depends="prepare">
>> - <javac16>
>> + <javac17>
>> 
>> <exclude name="org/ofbiz/order/thirdparty/taxware/**"/>
>> - </javac16>
>> + </javac17>
>> </target>
>> <target name="jar" depends="classes">
>>
>> Modified: ofbiz/trunk/common.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/common.xml?rev=1605524&r1=1605523&r2=1605524&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/common.xml (original)
>> +++ ofbiz/trunk/common.xml Wed Jun 25 17:59:46 2014
>> @@ -88,7 +88,7 @@ under the License.
>> 
>> <target name="classes" depends="prepare">
>> - <javac16/>
>> + <javac17/>
>> </target>
>> <target name="jar" depends="classes">
>>
>> Modified: ofbiz/trunk/framework/base/build.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/build.xml?rev=1605524&r1=1605523&r2=1605524&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/framework/base/build.xml (original)
>> +++ ofbiz/trunk/framework/base/build.xml Wed Jun 25 17:59:46 2014
>> @@ -84,13 +84,13 @@ under the License.
>> </target>
>> <target name="classes" depends="prepare,gen-src">
>> - <javac16>
>> + <javac17>
>> <sourcepath>
>> <dirset dir="build/gen-src">
>> <include name="javacc"/>
>> </dirset>
>> </sourcepath>
>> - </javac16>
>> + </javac17>
>> </target>
>> <target name="jar" depends="classes">
>>
>> Modified: ofbiz/trunk/framework/bi/build.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/build.xml?rev=1605524&r1=1605523&r2=1605524&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/framework/bi/build.xml (original)
>> +++ ofbiz/trunk/framework/bi/build.xml Wed Jun 25 17:59:46 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/trunk/framework/sql/build.xml
>> URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/build.xml?rev=1605524&r1=1605523&r2=1605524&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/framework/sql/build.xml (original)
>> +++ ofbiz/trunk/framework/sql/build.xml Wed Jun 25 17:59:46 2014
>> @@ -57,14 +57,14 @@ under the License.
>> </target>
>> <target name="classes" depends="prepare,gen-src">
>> - <javac16>
>> + <javac17>
>> <sourcepath>
>> <dirset dir="build/gen-src">
>> <include name="javacc"/>
>> <include name="jjtree"/>
>> </dirset>
>> </sourcepath>
>> - </javac16>
>> + </javac17>
>> </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=1605524&r1=1605523&r2=1605524&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/framework/start/build.xml (original)
>> +++ ofbiz/trunk/framework/start/build.xml Wed Jun 25 17:59:46 2014
>> @@ -34,7 +34,7 @@ under the License.
>> <target name="classes" depends="prepare">
>> 
>> - <javac16 destdir="${build.dir}/classes" srcdir="${src.dir}"/>
>> + <javac17 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=1605524&r1=1605523&r2=1605524&view=diff
>> ==============================================================================
>> --- ofbiz/trunk/macros.xml (original)
>> +++ ofbiz/trunk/macros.xml Wed Jun 25 17:59:46 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">
>> @@ -78,8 +78,8 @@ under the License.
>> </javac>
>> </presetdef>
>> - <presetdef name="javac16">
>> - <default-javac compiler="javac1.6" target="1.6" source="1.6" encoding="UTF-8" includeantruntime="false">
>> + <presetdef name="javac17">
>> + <default-javac compiler="javac1.7" target="1.7" source="1.7" encoding="UTF-8" includeantruntime="false">
>> <compilerarg value="-Xlint:-path"/>
>> <!--
>> Please leave this line here. It makes it easier to enable/disable it.
>>
>>
>