From 482159bd74fe857e12b206820ca60fe927e572ef Mon Sep 17 00:00:00 2001
From: joehni <joerg.schaible@gmx.de>
Date: Fri, 18 Oct 2024 17:31:52 +0200
Subject: [PATCH] Use Jettison 1.5.4.

---
 pom.xml                                                  | 4 ++--
 .../xstream/io/json/JettisonMappedXmlDriver.java         | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index dd5e9ade9..05943ab79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <!--
      Copyright (C) 2006 Joe Walnes.
-     Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 XStream committers.
+     Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023,2024 XStream committers.
      All rights reserved.
      
      The software in this package is published under the terms of the BSD
@@ -1108,7 +1108,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.4.1</version.org.codehaus.jettison>
+    <version.org.codehaus.jettison>1.5.4</version.org.codehaus.jettison>
     <version.com.fasterxml.woodstox.core>6.4.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/src/java/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.java b/xstream/src/java/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.java
index 0afa35c30..a6e7a183c 100644
--- a/xstream/src/java/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.java
+++ b/xstream/src/java/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2018, 2020 XStream Committers.
+ * Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2018, 2020, 2024 XStream Committers.
  * All rights reserved.
  *
  * The software in this package is published under the terms of the BSD
@@ -58,7 +58,7 @@ 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.
+     * Note, you should turn off Jettison's root element array wrapper.
      * </p>
      *
      * @param config the Jettison configuration
@@ -71,8 +71,9 @@ public JettisonMappedXmlDriver(final Configuration config) {
      * Construct a JettisonMappedXmlDriver with configuration.
      * <p>
      * This constructor has been added by special request of Jettison users to support JSON generated by older Jettison
-     * 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.
+     * 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. You should also turn off Jettison's root element
+     * wrapper.
      * </p>
      *
      * @param config the Jettison configuration or null for XStream's defaults