Use Jettison 1.4.1 with appropriate configuration. Closes #72.

joehni · joehni · commit 2613c833f1ef · 2020-03-19T01:11:00.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -1105,7 +1105,7 @@
     <version.junit>3.8.1</version.junit>
     <version.net.sf.kxml.kxml2>2.3.0</version.net.sf.kxml.kxml2>
     <version.org.apache.felix>6.0.3</version.org.apache.felix>
-    <version.org.codehaus.jettison>1.2</version.org.codehaus.jettison>
+    <version.org.codehaus.jettison>1.4.1</version.org.codehaus.jettison>
     <version.com.fasterxml.woodstox.core>5.2.0</version.com.fasterxml.woodstox.core>
     <version.org.dom4j>2.0.2</version.org.dom4j>
     <version.org.hibernate.core>4.2.5.Final</version.org.hibernate.core>
diff --git a/xstream-distribution/src/content/changes.html b/xstream-distribution/src/content/changes.html
@@ -1,7 +1,7 @@
 <html>
 <!--
  Copyright (C) 2005, 2006 Joe Walnes.
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 XStream committers.
+ Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 XStream committers.
  All rights reserved.
  
  The software in this package is published under the terms of the BSD
@@ -60,6 +60,7 @@ <h2>Minor changes</h2>
 		<li>No need for reflection in StackTraceElementFactory anymore since Java 5.</li>
 		<li>StaxReader did not propagate close for Reader and InputStream.</li>
 		<li>Add SimpleStaxDriver without namespace support as possible alternative to default driver.</li>
+		<li>GHI:#72: Finally it is possible to use Jettison 1.4.1 or higher.</li>
 	</ul>
 
 	<h2>API changes</h2>
diff --git a/xstream-distribution/src/content/download.html b/xstream-distribution/src/content/download.html
@@ -71,8 +71,7 @@ <h1 id="optional-deps">Optional Dependencies</h1>
       	  <li><a href="https://repo1.maven.org/maven2/javax/activation/jaxax.activation-api/1.2.0/jaxax.activation-api-1.2.0.jar">Java Activation module</a> for the ActivationDataFlavorConverter. The dependency is required for the Java 11 runtime.</li>
       	  <li><a href="https://github.com/JodaOrg/joda-time/releases/download/v2.10.1/joda-time-2.10.1-dist.zip">Joda Time</a> for optional ISO8601 date/time converters in JDK 1.7 or below.</li>
       	  <li><a href="http://downloads.sourceforge.net/cglib/cglib-nodep-2.2.jar">CGLIB</a> for optional support of some proxies generated with the CGLIB Enhancer.</li>
-      	  <li><a href="https://repo1.maven.org/maven2/org/codehaus/jettison/jettison/1.2/jettison-1.2.jar">Jettison</a> for serialization and deserialization support with JSON. Note, that newer versions 1.3.x are no longer compatible with XStream.</li>
-      	  <li><a href="https://repo1.maven.org/maven2/org/codehaus/jettison/jettison/1.0/jettison-1.0.jar">Jettison 1.0.1</a> for serialization and deserialization support with JSON in JDK 1.4. Note, that newer version 1.1 is not compatible with XStream.</li>
+      	  <li><a href="https://repo1.maven.org/maven2/org/codehaus/jettison/jettison/1.4.1/jettison-1.4.1.jar">Jettison</a> for serialization and deserialization support with JSON. Note, except Jettison 1.2 no lower version is compatible.</li>
         </ul>
       </li>
     </ul>
diff --git a/xstream/src/java/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.java b/xstream/src/java/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2018 XStream Committers.
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2018, 2020 XStream Committers.
  * All rights reserved.
  *
  * The software in this package is published under the terms of the BSD
  * style license a copy of which has been included with this distribution in
  * the LICENSE.txt file.
- * 
+ *
  * Created on 30. March 2007 by Joerg Schaible
  */
 package com.thoughtworks.xstream.io.json;
@@ -36,8 +36,9 @@
 
 
 /**
- * Simple XStream driver wrapping Jettison's Mapped reader and writer. Serializes object from and to JSON.
- * 
+ * Simple XStream driver wrapping Jettison's Mapped reader and writer. Serializes object from and to JSON. Use exactly
+ * Jettison 1.2 or at least 1.4.1. Versions in between are not compatible.
+ *
  * @author Dejan Bosanac
  */
 public class JettisonMappedXmlDriver extends AbstractDriver {
@@ -56,7 +57,10 @@ public JettisonMappedXmlDriver() {
 
     /**
      * Construct a JettisonMappedXmlDriver with configuration.
-     * 
+     * <p>
+     * Note, you should turn off Jettison's root element array wrapper using Jettison 1.4.1 or higher.
+     * </p>
+     *
      * @param config the Jettison configuration
      */
     public JettisonMappedXmlDriver(final Configuration config) {
@@ -70,13 +74,16 @@ public JettisonMappedXmlDriver(final Configuration config) {
      * versions. if the driver is setup to ignore the XStream hints for JSON arrays, there is neither support from
      * XStream's side nor are there any tests to ensure this mode.
      * </p>
-     * 
-     * @param config the Jettison configuration
+     *
+     * @param config the Jettison configuration or null for XStream's defaults
      * @param useSerializeAsArray flag to use XStream's hints for collections and arrays
      * @since 1.4
      */
     public JettisonMappedXmlDriver(Configuration config, final boolean useSerializeAsArray) {
-        config = config == null ? new Configuration() : config;
+        if (config == null) {
+            config = new Configuration();
+            config.setRootElementArrayWrapper(false);
+        }
         mof = new MappedXMLOutputFactory(config);
         mif = new MappedXMLInputFactory(config);
         convention = new MappedNamespaceConvention(config);
