svn commit: r1729609 - in /ofbiz/trunk: ./ applications/commonext/webapp/ofbizsetup/organization/ framework/base/lib/scripting/ specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/

[ja...@apache.org]

Author: jacopoc
Date: Wed Feb 10 14:38:00 2016
New Revision: 1729609

URL: http://svn.apache.org/viewvc?rev=1729609&view=rev
Log:
OFBIZ-6568: upgraded Groovy to the latest version (2.4.5).


Added:
    ofbiz/trunk/framework/base/lib/scripting/groovy-all-2.4.5.jar   (with props)
Removed:
    ofbiz/trunk/framework/base/lib/scripting/groovy-all-2.2.1.jar
Modified:
    ofbiz/trunk/.classpath
    ofbiz/trunk/LICENSE
    ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy
    ofbiz/trunk/macros.xml
    ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy

Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1729609&r1=1729608&r2=1729609&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Wed Feb 10 14:38:00 2016
@@ -88,7 +88,7 @@
 	<classpathentry kind="lib" path="framework/base/lib/scripting/asm-3.2.jar"/>
 	<classpathentry kind="lib" path="framework/base/lib/scripting/bsf-2.4.0.jar"/>
 	<classpathentry kind="lib" path="framework/base/lib/scripting/bsh-2.0b4.jar"/>
-	<classpathentry kind="lib" path="framework/base/lib/scripting/groovy-all-2.2.1.jar"/>
+	<classpathentry kind="lib" path="framework/base/lib/scripting/groovy-all-2.4.5.jar"/>
 	<classpathentry kind="lib" path="framework/base/lib/scripting/jakarta-oro-2.0.8.jar"/>
 	<classpathentry kind="lib" path="framework/base/lib/scripting/jython-nooro.jar"/>
 	<classpathentry kind="lib" path="framework/catalina/lib/ecj-4.4.2.jar"/>

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1729609&r1=1729608&r2=1729609&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Wed Feb 10 14:38:00 2016
@@ -73,7 +73,7 @@ framework/base/lib/j2eespecs/servlet-api
 framework/base/lib/owasp-java-html-sanitizer-r239.jar
 framework/base/lib/scripting/bsf-2.4.0.jar
 framework/base/lib/scripting/jakarta-oro-2.0.8.jar
-framework/base/lib/scripting/groovy-all-2.2.1.jar
+framework/base/lib/scripting/groovy-all-2.4.5.jar
 framework/base/lib/scripting/jansi-1.2.1.jar
 framework/base/lib/xmlrpc-client-3.1.2.jar
 framework/base/lib/xmlrpc-common-3.1.2.jar

Modified: ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy?rev=1729609&r1=1729608&r2=1729609&view=diff
==============================================================================
--- ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy (original)
+++ ofbiz/trunk/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy Wed Feb 10 14:38:00 2016
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+@BaseScript(org.ofbiz.service.engine.GroovyBaseScript)
+import groovy.transform.BaseScript
 import org.ofbiz.base.util.*;
 
 //partyAcctgPrefAndGroupList

Added: ofbiz/trunk/framework/base/lib/scripting/groovy-all-2.4.5.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/scripting/groovy-all-2.4.5.jar?rev=1729609&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/base/lib/scripting/groovy-all-2.4.5.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: ofbiz/trunk/macros.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/macros.xml?rev=1729609&r1=1729608&r2=1729609&view=diff
==============================================================================
--- ofbiz/trunk/macros.xml (original)
+++ ofbiz/trunk/macros.xml Wed Feb 10 14:38:00 2016
@@ -48,7 +48,7 @@ under the License.
  <patternset id="src.exc.set"/>
 
  <path id="groovy.class.path">
-  <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/groovy-all-2.2.1.jar"/>
+  <pathelement location="${ofbiz.home.dir}/framework/base/lib/scripting/groovy-all-2.4.5.jar"/>
  </path>
  <path id="rhino.class.path">
   <pathelement location="${ofbiz.home.dir}/extension/rhino/lib/js-1.7.R1.jar"/>

Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy?rev=1729609&r1=1729608&r2=1729609&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy Wed Feb 10 14:38:00 2016
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+@BaseScript(org.ofbiz.service.engine.GroovyBaseScript)
+import groovy.transform.BaseScript
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.entity.Delegator;
 import org.ofbiz.entity.*;