Skip to content

Commit 2f3d1a0

Browse files
committed
Upgrading batik and bsh
1 parent 707fa3b commit 2f3d1a0

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

.classpath

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,6 @@
113113
<classpathentry kind="lib" path="lib/fetched/tiles-servlet-3.0.8.jar"/>
114114
<classpathentry kind="lib" path="lib/fetched/tiles-template-3.0.8.jar"/>
115115
<classpathentry kind="lib" path="lib/fetched/antisamy-1.5.7.jar"/>
116-
<classpathentry kind="lib" path="lib/fetched/batik-constants-1.9.1.jar"/>
117-
<classpathentry kind="lib" path="lib/fetched/batik-css-1.9.1.jar"/>
118-
<classpathentry kind="lib" path="lib/fetched/batik-i18n-1.9.1.jar"/>
119-
<classpathentry kind="lib" path="lib/fetched/batik-util-1.9.1.jar"/>
120-
<classpathentry kind="lib" path="lib/fetched/bsh-core-2.0b4.jar"/>
121116
<classpathentry kind="lib" path="lib/fetched/commons-beanutils-core-1.8.3.jar"/>
122117
<classpathentry kind="lib" path="lib/fetched/commons-configuration-1.10.jar"/>
123118
<classpathentry kind="lib" path="lib/fetched/commons-lang-2.6.jar"/>
@@ -160,10 +155,6 @@
160155
<classpathentry kind="lib" path="lib/fetched/xmltooling-1.4.6.jar"/>
161156
<classpathentry kind="lib" path="lib/fetched/xom-1.2.5.jar"/>
162157
<classpathentry kind="lib" path="lib/fetched/dom4j-2.1.1.jar"/>
163-
<classpathentry kind="lib" path="lib/fetched/esg-orp-2.10.7.jar"/>
164-
<classpathentry kind="lib" path="lib/fetched/esg-orp-test-2.10.7.jar"/>
165-
<classpathentry kind="lib" path="lib/fetched/esgf-security-2.8.7.jar"/>
166-
<classpathentry kind="lib" path="lib/fetched/esgf-security-test-2.8.7.jar"/>
167158
<classpathentry kind="lib" path="lib/fetched/jaxb-api-2.2.12.jar"/>
168159
<classpathentry kind="lib" path="lib/fetched/jaxen-1.1.6.jar"/>
169160
<classpathentry kind="lib" path="lib/fetched/pull-parser-2.jar"/>
@@ -181,5 +172,15 @@
181172
<classpathentry kind="lib" path="lib/fetched/stax-api-1.0-2.jar"/>
182173
<classpathentry kind="lib" path="lib/fetched/xpp3-1.1.4c.jar"/>
183174
<classpathentry kind="lib" path="lib/fetched/xsdlib-2013.6.1.jar"/>
175+
<classpathentry kind="lib" path="lib/fetched/batik-constants-1.10.jar"/>
176+
<classpathentry kind="lib" path="lib/fetched/batik-css-1.10.jar"/>
177+
<classpathentry kind="lib" path="lib/fetched/batik-i18n-1.10.jar"/>
178+
<classpathentry kind="lib" path="lib/fetched/batik-util-1.10.jar"/>
179+
<classpathentry kind="lib" path="lib/fetched/bsh-core-2.0b6.jar"/>
180+
<classpathentry kind="lib" path="lib/fetched/commons-fileupload-1.3.3.jar"/>
181+
<classpathentry kind="lib" path="lib/fetched/esg-orp-2.10.8.jar"/>
182+
<classpathentry kind="lib" path="lib/fetched/esg-orp-test-2.10.8.jar"/>
183+
<classpathentry kind="lib" path="lib/fetched/esgf-security-2.8.8.jar"/>
184+
<classpathentry kind="lib" path="lib/fetched/esgf-security-test-2.8.8.jar"/>
184185
<classpathentry kind="output" path="build"/>
185186
</classpath>

ivy.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,16 @@ Note: Check Maven for propery dependency parameter values @
141141

142142
<dependency org="org.dom4j" name="dom4j" rev="2.1.1"/>
143143

144+
<!-- https://mvnrepository.com/artifact/org.apache.xmlgraphics/batik-util -->
145+
<dependency org="org.apache.xmlgraphics" name="batik-util" rev="1.10"/>
146+
<dependency org="org.apache.xmlgraphics" name="batik-css" rev="1.10"/>
147+
<!-- https://mvnrepository.com/artifact/org.apache-extras.beanshell/bsh -->
148+
<dependency org="org.apache-extras.beanshell" name="bsh-core" rev="2.0b6"/>
149+
<exclude org="org.beanshell" module="bsh-core" />
150+
144151
<conflict org="xml-apis" module="xml-apis" rev="1.4.01"/>
145152
<conflict org="xml-security" module="xmlsec" rev="1.4.7"/>
146153

147-
148-
149-
150154
</dependencies>
151155

152156

0 commit comments

Comments
 (0)