Skip to content

Commit 482159b

Browse files
committed
Use Jettison 1.5.4.
1 parent c8a9390 commit 482159b

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<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">
22
<!--
33
Copyright (C) 2006 Joe Walnes.
4-
Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 XStream committers.
4+
Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023,2024 XStream committers.
55
All rights reserved.
66
77
The software in this package is published under the terms of the BSD
@@ -1108,7 +1108,7 @@
11081108
<version.junit>3.8.1</version.junit>
11091109
<version.net.sf.kxml.kxml2>2.3.0</version.net.sf.kxml.kxml2>
11101110
<version.org.apache.felix>6.0.3</version.org.apache.felix>
1111-
<version.org.codehaus.jettison>1.4.1</version.org.codehaus.jettison>
1111+
<version.org.codehaus.jettison>1.5.4</version.org.codehaus.jettison>
11121112
<version.com.fasterxml.woodstox.core>6.4.0</version.com.fasterxml.woodstox.core>
11131113
<version.org.dom4j>2.0.2</version.org.dom4j>
11141114
<version.org.hibernate.core>4.2.5.Final</version.org.hibernate.core>

xstream/src/java/com/thoughtworks/xstream/io/json/JettisonMappedXmlDriver.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2018, 2020 XStream Committers.
2+
* Copyright (c) 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2018, 2020, 2024 XStream Committers.
33
* All rights reserved.
44
*
55
* The software in this package is published under the terms of the BSD
@@ -58,7 +58,7 @@ public JettisonMappedXmlDriver() {
5858
/**
5959
* Construct a JettisonMappedXmlDriver with configuration.
6060
* <p>
61-
* Note, you should turn off Jettison's root element array wrapper using Jettison 1.4.1 or higher.
61+
* Note, you should turn off Jettison's root element array wrapper.
6262
* </p>
6363
*
6464
* @param config the Jettison configuration
@@ -71,8 +71,9 @@ public JettisonMappedXmlDriver(final Configuration config) {
7171
* Construct a JettisonMappedXmlDriver with configuration.
7272
* <p>
7373
* This constructor has been added by special request of Jettison users to support JSON generated by older Jettison
74-
* versions. if the driver is setup to ignore the XStream hints for JSON arrays, there is neither support from
75-
* XStream's side nor are there any tests to ensure this mode.
74+
* versions. If the driver is setup to ignore the XStream hints for JSON arrays, there is neither support from
75+
* XStream's side nor are there any tests to ensure this mode. You should also turn off Jettison's root element
76+
* wrapper.
7677
* </p>
7778
*
7879
* @param config the Jettison configuration or null for XStream's defaults

0 commit comments

Comments
 (0)