From 3d765f262e4f3f73c9e0bb21ddc043c0fc1034f2 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Tue, 19 Apr 2016 03:19:04 +0700
Subject: [PATCH] IDEMPIERE-3077:update beanshell by security problem
 refer:https://github.com/beanshell/beanshell

---
 org.adempiere.base/.classpath           | 2 +-
 org.adempiere.base/META-INF/MANIFEST.MF | 4 ++--
 org.adempiere.base/build.properties     | 4 ++--
 org.adempiere.base/copyjars.xml         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath
index dca11cb25b..21a8494ee6 100644
--- a/org.adempiere.base/.classpath
+++ b/org.adempiere.base/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="bsh-2.0b6.jar"/>
 	<classpathentry exported="true" kind="lib" path="passay-1.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="bsh-2.0b5.jar"/>
 	<classpathentry exported="true" kind="lib" path="bsh-engine.jar"/>
 	<classpathentry exported="true" kind="lib" path="groovy-engine.jar"/>
 	<classpathentry exported="true" kind="lib" path="jython-engine.jar"/>
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 9fa4627e99..46edd7d5b2 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: iDempiere Core
 Bundle-SymbolicName: org.adempiere.base;singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-ClassPath: base.jar,
- bsh-2.0b5.jar,
  bsh-engine.jar,
  groovy-engine.jar,
  jython-engine.jar,
@@ -19,7 +18,8 @@ Bundle-ClassPath: base.jar,
  super-csv-2.2.0.jar,
  barcode4j-2.1.jar,
  bcprov-jdk15on-1.46.jar,
- passay-1.0.jar
+ passay-1.0.jar,
+ bsh-2.0b6.jar
 Export-Package: bsh,
  bsh.classpath,
  bsh.collection,
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index 8ad0b737b9..df32192598 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -1,7 +1,6 @@
 bin.includes = META-INF/,\
                base.jar,\
                plugin.xml,\
-               bsh-2.0b5.jar,\
                bsh-engine.jar,\
                groovy-engine.jar,\
                jython-engine.jar,\
@@ -34,7 +33,8 @@ bin.includes = META-INF/,\
                schema/,\
                barcode4j-2.1.jar,\
                bcprov-jdk15on-1.46.jar,\
-               passay-1.0.jar
+               passay-1.0.jar,\
+               bsh-2.0b6.jar
 output.base.jar = bin/
 src.includes = schema/
 source.base.jar = src/
diff --git a/org.adempiere.base/copyjars.xml b/org.adempiere.base/copyjars.xml
index 1fe2a28dad..7a56316f22 100644
--- a/org.adempiere.base/copyjars.xml
+++ b/org.adempiere.base/copyjars.xml
@@ -1,6 +1,6 @@
 <project name="zklibrary" basedir="." default="copy">
 	<target name="copy">
-		<get src="http://central.maven.org/maven2/org/beanshell/bsh/2.0b5/bsh-2.0b5.jar" dest="bsh-2.0b5.jar" usetimestamp="true" verbose="true" retries="5" />
+		<get src="http://central.maven.org/maven2/org/apache-extras/beanshell/bsh/2.0b6/bsh-2.0b6.jar" dest="bsh-2.0b6.jar" usetimestamp="true" verbose="true" retries="5" />
 		<!-- bsf-all-3.0-beta3.jar replace for grovy-engine, jyyhon-enjine, bsh-engine
 	      http://mvnrepository.com/artifact/org.apache.bsf/bsf-all/3.0-beta3
 		  <get src="http://central.maven.org/maven2/org/apache/bsf/bsf-all/3.0-beta3/bsf-all-3.0-beta3.jar" dest="bsf-all-3.0-beta3.jar" usetimestamp="true" verbose="true" retries="5"/>