From 08a00d798f748022635be2473789f274547407e1 Mon Sep 17 00:00:00 2001
From: Stian Soiland-Reyes <stain@apache.org>
Date: Tue, 12 Jul 2016 22:33:37 +0100
Subject: [PATCH 1/3] Use newer BeanShell 2.0b6

This fixes the possibly remote code execution security vulnerability [CVE-2016-2510](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-2510)

See https://github.com/beanshell/beanshell/releases/tag/2.0b6 for details.

(2.0b6 should be backwards compatible with 2.0b4 - however it is released under the Apache License 2.0 - see NOTICE and LICENSE at https://github.com/beanshell/beanshell)
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3c2bf25a9..a835771e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -748,9 +748,9 @@
 				<version>1.0.1</version>
 			</dependency>
 			<dependency>
-				<groupId>org.beanshell</groupId>
+				<groupId>org.apache-extras.beanshell</groupId>
 				<artifactId>bsh</artifactId>
-				<version>2.0b4</version>
+				<version>2.0b6</version>
 			</dependency>
 			<dependency>
 				<groupId>jfree</groupId>

From 64dd6185ef9d2b451958fd0f9f824cf16dfc5a30 Mon Sep 17 00:00:00 2001
From: Stian Soiland-Reyes <stain@apache.org>
Date: Wed, 13 Jul 2016 11:57:41 +0100
Subject: [PATCH 2/3] groupId org.apache-extras.beanshell

Fixes build error in #230
---
 52n-wps-sextante/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/52n-wps-sextante/pom.xml b/52n-wps-sextante/pom.xml
index 78a11df20..6072bc243 100644
--- a/52n-wps-sextante/pom.xml
+++ b/52n-wps-sextante/pom.xml
@@ -71,7 +71,7 @@
 			<artifactId>sextante_gt27_bindings</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.beanshell</groupId>
+			<groupId>org.apache-extras.beanshell</groupId>
 			<artifactId>bsh</artifactId>
 		</dependency>
 		<dependency>

From cfc5fbf4eb63e9cb8716c444273ac2c28773865e Mon Sep 17 00:00:00 2001
From: Stian Soiland-Reyes <stain@apache.org>
Date: Wed, 13 Jul 2016 11:58:31 +0100
Subject: [PATCH 3/3] Beanshell 2.0b6 license: Apache License 2.0

---
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTICE b/NOTICE
index 7921943d6..6473a0293 100644
--- a/NOTICE
+++ b/NOTICE
@@ -58,7 +58,7 @@ This project includes:
   Axiom API under The Apache Software License, Version 2.0
   Axiom Impl under The Apache Software License, Version 2.0
   bcprov-jdk15 under Bouncycastle license, http://www.bouncycastle.org/licence.html (MIT-style license)
-  BeanShell under GNU LESSER GENERAL PUBLIC LICENSE
+  BeanShell under The Apache Software License, Version 2.0
   Collections under The Apache Software License, Version 2.0
   common under Eclipse Public License (EPL)
   Commons Codec under The Apache Software License, Version 2.0