svn commit: r1612524 - in /ofbiz/trunk: build.xml macros.xml

[ja...@apache.org]

Author: jacopoc
Date: Tue Jul 22 09:59:09 2014
New Revision: 1612524

URL: http://svn.apache.org/r1612524
Log:
Some minor changes for r.1605524: Updated build files to use/require Java 7

Modified:
    ofbiz/trunk/build.xml
    ofbiz/trunk/macros.xml

Modified: ofbiz/trunk/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/build.xml?rev=1612524&r1=1612523&r2=1612524&view=diff
==============================================================================
--- ofbiz/trunk/build.xml (original)
+++ ofbiz/trunk/build.xml Tue Jul 22 09:59:09 2014
@@ -1226,8 +1226,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&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/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1612524&r1=1612523&r2=1612524&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Tue Jul 22 09:59:09 2014
@@ -117,7 +117,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="http://java.sun.com/javase/7/docs/api/" offline="true" packagelistLoc="${ofbiz.home.dir}/tools/api-java17"/>
     </javadoc>
  </presetdef>