Upgrading batik and bsh

ESGF · Oct 29, 2018 · 2f3d1a0 · 2f3d1a0
1 parent 707fa3b
commit 2f3d1a0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/.classpath b/.classpath
@@ -113,11 +113,6 @@
 	<classpathentry kind="lib" path="lib/fetched/tiles-servlet-3.0.8.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/tiles-template-3.0.8.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/commons-lang-2.6.jar"/>
@@ -160,10 +155,6 @@
 	<classpathentry kind="lib" path="lib/fetched/xmltooling-1.4.6.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/xom-1.2.5.jar"/>
 	<classpathentry kind="lib" path="lib/fetched/dom4j-2.1.1.jar"/>
-	<classpathentry kind="lib" path="lib/fetched/esg-orp-2.10.7.jar"/>
-	<classpathentry kind="lib" path="lib/fetched/esg-orp-test-2.10.7.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/pull-parser-2.jar"/>
@@ -181,5 +172,15 @@
 	<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/commons-fileupload-1.3.3.jar"/>
+	<classpathentry kind="lib" path="lib/fetched/esg-orp-2.10.8.jar"/>
+	<classpathentry kind="lib" path="lib/fetched/esg-orp-test-2.10.8.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
@@ -141,12 +141,16 @@ Note: Check Maven for propery dependency parameter values @
 
     <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="xml-apis" module="xml-apis" rev="1.4.01"/>
     <conflict org="xml-security" module="xmlsec" rev="1.4.7"/>
 
-
-
-
   </dependencies>