Log Message
Set scope of org.json:json to test (XSTR-763).
Modified Paths
Diff
Modified: trunk/xstream/pom.xml (2302 => 2303)
--- trunk/xstream/pom.xml 2014-10-30 13:18:10 UTC (rev 2302)
+++ trunk/xstream/pom.xml 2014-11-10 09:58:44 UTC (rev 2303)
@@ -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 XStream committers.
+ Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 XStream committers.
All rights reserved.
The software in this package is published under the terms of the BSD
@@ -97,12 +97,6 @@
</dependency>
<dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <optional>true</optional>
- </dependency>
-
- <dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<optional>true</optional>
@@ -120,6 +114,12 @@
</dependency>
<dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>com.megginson.sax</groupId>
<artifactId>xml-writer</artifactId>
<scope>test</scope>
Modified: trunk/xstream-distribution/src/content/changes.html (2302 => 2303)
--- trunk/xstream-distribution/src/content/changes.html 2014-10-30 13:18:10 UTC (rev 2302)
+++ trunk/xstream-distribution/src/content/changes.html 2014-11-10 09:58:44 UTC (rev 2303)
@@ -67,6 +67,7 @@
<li>Fix: WeakCache.entrySet().iterator().next.setValue(value) returns the reference instead of the old value.</li>
<li>Fix: SqlTimestampConverter throws IllegalArgumentException instead of ConversionException on fromString().</li>
<li>Fix: CGLIBEnhancedConverter does not initialize transient members of parent after deserialization.</li>
+ <li>XSTR-763: Set scope of org.json:json to test instead declaring the dependency as optional.</li>
</ul>
<h2>API changes</h2>
To unsubscribe from this list please visit:
