Update XOM to version 1.3.2 and fix transitive dependencies.

kalzokalz · May 3, 2019 · 1e933c6 · 1e933c6
1 parent 176ee06
commit 1e933c6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -413,8 +413,8 @@
         <version>${version.xom}</version>
         <exclusions>
           <exclusion>
-            <groupId>xerces</groupId>
-            <artifactId>xmlParserAPIs</artifactId>
+            <groupId>xml-apis</groupId>
+            <artifactId>xml-apis</artifactId>
           </exclusion>
           <exclusion>
             <groupId>xerces</groupId>
@@ -424,10 +424,6 @@
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
           </exclusion>
-          <exclusion>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-          </exclusion>
         </exclusions>
       </dependency>
 
@@ -462,6 +458,12 @@
         <groupId>org.codehaus.jettison</groupId>
         <artifactId>jettison</artifactId>
         <version>${version.org.codehaus.jettison}</version>
+        <exclusions>
+            <exclusion>
+                <groupId>stax</groupId>
+                <artifactId>stax-api</artifactId>
+            </exclusion>
+        </exclusions>
       </dependency>
 
       <dependency>
@@ -988,7 +990,7 @@
     <version.xerces.impl>2.8.1</version.xerces.impl>
     <version.xml-apis>1.3.04</version.xml-apis>
     <version.xmlpull>1.1.3.1</version.xmlpull>
-    <version.xom>1.2.5</version.xom>
+    <version.xom>1.3.2</version.xom>
     <version.xpp3>1.1.4c</version.xpp3>
 
     <javadoc.link.javase>http://docs.oracle.com/javase/8/docs/api/</javadoc.link.javase>

diff --git a/xstream-distribution/src/content/download.html b/xstream-distribution/src/content/download.html
@@ -1,7 +1,7 @@
 <html>
 <!--
  Copyright (C) 2005, 2006 Joe Walnes.
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018 XStream committers.
+ Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2019 XStream committers.
  All rights reserved.
  
  The software in this package is published under the terms of the BSD
@@ -63,7 +63,7 @@ <h1 id="optional-deps">Optional Dependencies</h1>
         <li><a href="http://www.jdom.org/dist/binary/jdom-2.0.6.zip">JDOM2</a>, easy XML representation and manipulation, successor of JDOM.</li>
         <li>StaX, the <a href="http://repo1.maven.org/maven2/stax/stax-1.2.0.jar">reference implementation</a> of the <a href="http://repo1.maven.org/maven2/stax/stax-api-1.0.1.jar">Streaming API for XML</a>.</li>
         <li><a href="http://repo1.maven.org/maven2/com.fasterxml.woodstox/woodstox-core-5.2.0.jar">Woodstox</a>, an alternate open source StaX implementation.</li>
-        <li><a href="http://www.cafeconleche.org/XOM/xom-1.2.5.zip">XOM</a>, another alternative XML API.</li>
+        <li><a href="http://www.cafeconleche.org/XOM/xom-1.3.2.zip">XOM</a>, another alternative XML API.</li>
       </ul>
       </li>
         <li>Other optional 3rd party dependencies: