From 3da3bcfcd93773275f0ce2cbe89fd5459df6a261 Mon Sep 17 00:00:00 2001
From: Luca Cinquini <luca.cinquini@jpl.nasa.gov>
Date: Mon, 29 Oct 2018 08:27:56 -0600
Subject: [PATCH] Upgrading batik and bsh

---
 .classpath | 14 +++++++-------
 ivy.xml    |  9 +++++++++
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.classpath b/.classpath
index ef88003..61c7724 100644
--- a/.classpath
+++ b/.classpath
@@ -75,11 +75,6 @@
 	<classpathentry kind="lib" path="lib/fetched/spring-security-web-4.2.8.RELEASE.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/commons-lang-2.6.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/antisamy-1.5.7.jar"/>
-	<classpathentry kind="lib" path="lib/fetched/batik-constants-1.9.1.jar"/>
-	<classpathentry kind="lib" path="lib/fetched/batik-css-1.9.1.jar"/>
-	<classpathentry kind="lib" path="lib/fetched/batik-i18n-1.9.1.jar"/>
-	<classpathentry kind="lib" path="lib/fetched/batik-util-1.9.1.jar"/>
-	<classpathentry kind="lib" path="lib/fetched/bsh-core-2.0b4.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/commons-beanutils-core-1.8.3.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/commons-configuration-1.10.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/esapi-2.1.0.1.jar"/>
@@ -98,8 +93,6 @@
 	<classpathentry kind="lib" path="lib/fetched/xmlsec-1.4.7.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/commons-fileupload-1.3.3.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/dom4j-2.1.1.jar"/>
-	<classpathentry kind="lib" path="lib/fetched/esgf-security-2.8.7.jar"/>
-	<classpathentry kind="lib" path="lib/fetched/esgf-security-test-2.8.7.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/jaxb-api-2.2.12.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/jaxen-1.1.6.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/portlet-api-1.0.jar"/>
@@ -118,5 +111,12 @@
 	<classpathentry kind="lib" path="lib/fetched/stax-api-1.0-2.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/xpp3-1.1.4c.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/xsdlib-2013.6.1.jar"/>
+	<classpathentry kind="lib" path="lib/fetched/batik-constants-1.10.jar"/>
+	<classpathentry kind="lib" path="lib/fetched/batik-css-1.10.jar"/>
+	<classpathentry kind="lib" path="lib/fetched/batik-i18n-1.10.jar"/>
+	<classpathentry kind="lib" path="lib/fetched/batik-util-1.10.jar"/>
+	<classpathentry kind="lib" path="lib/fetched/bsh-core-2.0b6.jar"/>
+	<classpathentry kind="lib" path="lib/fetched/esgf-security-2.8.8.jar"/>
+	<classpathentry kind="lib" path="lib/fetched/esgf-security-test-2.8.8.jar"/>
 	<classpathentry kind="output" path="build"/>
 </classpath>
diff --git a/ivy.xml b/ivy.xml
index 8dc6852..75b39f8 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -149,6 +149,15 @@ Note: Check Maven for propery dependency parameter values @
     <dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1"/>
     
     <dependency org="org.dom4j" name="dom4j" rev="2.1.1"/>
+    
+    <!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-util -->
+	<dependency org="org.apache.xmlgraphics" name="batik-util" rev="1.10"/>
+	<dependency org="org.apache.xmlgraphics" name="batik-css" rev="1.10"/>
+	<!-- https://mvnrepository.com/artifact/org.apache-extras.beanshell/bsh -->
+	<dependency org="org.apache-extras.beanshell" name="bsh-core" rev="2.0b6"/>
+	<exclude org="org.beanshell" module="bsh-core" />
+	<conflict org="org.apache-extras.beanshell" module="bsh-core" rev="2.0b6"/>
+    
 
   </dependencies>