You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2015/02/17 17:59:10 UTC
svn commit: r1660446 - in /ofbiz/branches/release14.12: ./
applications/order/build.xml applications/party/build.xml
applications/product/build.xml applications/workeffort/build.xml
specialpurpose/ebay/build.xml specialpurpose/pos/build.xml
Author: jleroux
Date: Tue Feb 17 16:59:10 2015
New Revision: 1660446
URL: http://svn.apache.org/r1660446
Log:
"Applied fix from trunk for revision: 1660444 "
------------------------------------------------------------------------
r1660444 | jleroux | 2015-02-17 17:53:19 +0100 (mar., 17 févr. 2015) | 3 lines
A patch from Christian Carlow for "Trunk fails to compile with Java 1.8" https://issues.apache.org/jira/browse/OFBIZ-5835
Build errors occur for trunk due to missing build.xml fileset for party, workeffort, product, order, ebay, and pos apps when using Java 1.8
------------------------------------------------------------------------
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/applications/order/build.xml
ofbiz/branches/release14.12/applications/party/build.xml
ofbiz/branches/release14.12/applications/product/build.xml
ofbiz/branches/release14.12/applications/workeffort/build.xml
ofbiz/branches/release14.12/specialpurpose/ebay/build.xml
ofbiz/branches/release14.12/specialpurpose/pos/build.xml
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 17 16:59:10 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053,1660389
+/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053,1660389,1660444
Modified: ofbiz/branches/release14.12/applications/order/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/build.xml?rev=1660446&r1=1660445&r2=1660446&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/order/build.xml (original)
+++ ofbiz/branches/release14.12/applications/order/build.xml Tue Feb 17 16:59:10 2015
@@ -45,6 +45,7 @@ under the License.
<fileset dir="../../framework/webapp/lib" includes="*.jar"/>
<fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
<fileset dir="../../framework/common/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/widget/build/lib" includes="*.jar"/>
<fileset dir="../content/build/lib" includes="*.jar"/>
<fileset dir="../party/build/lib" includes="*.jar"/>
<fileset dir="../product/build/lib" includes="*.jar"/>
Modified: ofbiz/branches/release14.12/applications/party/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/party/build.xml?rev=1660446&r1=1660445&r2=1660446&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/party/build.xml (original)
+++ ofbiz/branches/release14.12/applications/party/build.xml Tue Feb 17 16:59:10 2015
@@ -42,6 +42,7 @@ under the License.
<fileset dir="../../framework/service/build/lib" includes="*.jar"/>
<fileset dir="../../framework/minilang/build/lib" includes="*.jar"/>
<fileset dir="../../framework/common/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/widget/build/lib" includes="*.jar"/>
<fileset dir="../content/build/lib" includes="*.jar"/>
</path>
</project>
Modified: ofbiz/branches/release14.12/applications/product/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/build.xml?rev=1660446&r1=1660445&r2=1660446&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/product/build.xml (original)
+++ ofbiz/branches/release14.12/applications/product/build.xml Tue Feb 17 16:59:10 2015
@@ -44,6 +44,7 @@ under the License.
<fileset dir="../../framework/webapp/lib" includes="*.jar"/>
<fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
<fileset dir="../../framework/common/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/widget/build/lib" includes="*.jar"/>
<fileset dir="../content/lib" includes="*.jar"/>
<fileset dir="../content/build/lib" includes="*.jar"/>
<fileset dir="../party/build/lib" includes="*.jar"/>
Modified: ofbiz/branches/release14.12/applications/workeffort/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/workeffort/build.xml?rev=1660446&r1=1660445&r2=1660446&view=diff
==============================================================================
--- ofbiz/branches/release14.12/applications/workeffort/build.xml (original)
+++ ofbiz/branches/release14.12/applications/workeffort/build.xml Tue Feb 17 16:59:10 2015
@@ -43,6 +43,7 @@ under the License.
<fileset dir="../../framework/webapp/lib" includes="*.jar"/>
<fileset dir="../../framework/webapp/build/lib" includes="*.jar"/>
<fileset dir="../../framework/common/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/widget/build/lib" includes="*.jar"/>
<fileset dir="../content/build/lib" includes="*.jar"/>
<fileset dir="../party/build/lib" includes="*.jar"/>
</path>
Modified: ofbiz/branches/release14.12/specialpurpose/ebay/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/ebay/build.xml?rev=1660446&r1=1660445&r2=1660446&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/ebay/build.xml (original)
+++ ofbiz/branches/release14.12/specialpurpose/ebay/build.xml Tue Feb 17 16:59:10 2015
@@ -45,5 +45,6 @@ under the License.
<fileset dir="../../applications/product/build/lib" includes="*.jar"/>
<fileset dir="../../applications/party/build/lib" includes="*.jar"/>
<fileset dir="../../applications/order/build/lib" includes="*.jar"/>
+ <fileset dir="../../applications/content/build/lib" includes="*.jar"/>
</path>
</project>
Modified: ofbiz/branches/release14.12/specialpurpose/pos/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/specialpurpose/pos/build.xml?rev=1660446&r1=1660445&r2=1660446&view=diff
==============================================================================
--- ofbiz/branches/release14.12/specialpurpose/pos/build.xml (original)
+++ ofbiz/branches/release14.12/specialpurpose/pos/build.xml Tue Feb 17 16:59:10 2015
@@ -35,6 +35,7 @@ under the License.
<fileset dir="../../framework/base/lib/j2eespecs" includes="*.jar"/>
<fileset dir="../../framework/base/lib/scripting" includes="*.jar"/>
<fileset dir="../../framework/base/build/lib" includes="*.jar"/>
+ <fileset dir="../../framework/start/build/lib" includes="*.jar"/>
<fileset dir="../../framework/entity/lib" includes="*.jar"/>
<fileset dir="../../framework/entity/build/lib" includes="*.jar"/>
<fileset dir="../../framework/security/build/lib" includes="*.jar"/>