OFBIZ-6568: upgraded Groovy to the latest version (2.4.5).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1729609 13f79535-47bb-0310-9956-ffa450edef68
xxwwbb3 · Feb 10, 2016 · 6a9a38f · 6a9a38f
1 parent 76382f9
commit 6a9a38f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 3 deletions.
diff --git a/.classpath b/.classpath
@@ -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"/>

diff --git a/LICENSE b/LICENSE
@@ -73,7 +73,7 @@ framework/base/lib/j2eespecs/servlet-api-3.0.jar
 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

diff --git a/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy b/applications/commonext/webapp/ofbizsetup/organization/changeOrgPartyId.groovy
@@ -17,6 +17,8 @@
  * under the License.
  */
 
+@BaseScript(org.ofbiz.service.engine.GroovyBaseScript)
+import groovy.transform.BaseScript
 import org.ofbiz.base.util.*;
 
 //partyAcctgPrefAndGroupList

diff --git a/framework/base/lib/scripting/groovy-all-2.2.1.jar b/framework/base/lib/scripting/groovy-all-2.2.1.jar
diff --git a/framework/base/lib/scripting/groovy-all-2.4.5.jar b/framework/base/lib/scripting/groovy-all-2.4.5.jar
diff --git a/macros.xml b/macros.xml
@@ -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"/>

diff --git a/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy b/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/actions/order/ShipmentStatus.groovy
@@ -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.*;