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

[adrianc]

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 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/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">
         <!-- 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/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.

[Adam Heath-2]

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 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/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">
>           <!-- 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/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.
>
>

[Adam Heath-2]

Supposedly cobertura 2.0.3 fixes this. But the fix was broken.  So a
2.0.4-SNAPSHOT was created, last fall.  But then the cloudbees ci server
has been hibernated, so you can't download that anymore.  So you clone
the repo on github.  But then when doing mvn package, it attempts to
fetch a plugin resource from oss.sonatype.org, which gives a 404.  And
nothing about this on the current mailing list.

Which then ended up being because I was using maven 2.x, instead of
3.x.  Which I installed, but then the version in debian wheezy is 3.0.4,
while cobertura requires 3.0.5 in several places.  But it doesn't,
really, so after changing 4 poms(s/3.0.5/3.0.4/), I now have
cobertura-2.0.4-SNAPSHOT.jar that works.

However, since the license of cobertura is not apache compatible, I
can't just add this to the repo; that's the whole point of the ivy
download target.  But I don't know how to make this available.  Any
suggestions?

On 06/25/2014 04:53 PM, Adam Heath 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.

ps: This requires upgrading asm from 3.2 to 4.1(which isn't the latest);
all test cases still pass with this update.