[xstream-scm] [2304] branches/v-1.4.x: Merge fixed scope of org.json:json from trunk ( XSTR-763).

Mon, 10 Nov 2014 16:26:00 -0800

Title: [2304] branches/v-1.4.x: Merge fixed scope of org.json:json from trunk (XSTR-763).
Revision
2304
Author
joehni
Date
2014-11-10 18:23:18 -0600 (Mon, 10 Nov 2014)

Log Message

Merge fixed scope of org.json:json from trunk (XSTR-763).

Modified Paths



Property Changed

Diff

Property changes: branches/v-1.4.x

Modified: svn:mergeinfo

+ /trunk:2151-2152,2154-2156,2158-2163,2165,2172,2175,2177,2188-2189,2197,2199-2201,2204,2206,2210,2212,2214-2217,2226,2229,2231,2233-2234,2236-2238,2247-2249,2279-2280,2285,2291-2292,2294,2298-2299,2301,2303

Modified: branches/v-1.4.x/xstream/pom.xml (2303 => 2304)


--- branches/v-1.4.x/xstream/pom.xml	2014-11-10 09:58:44 UTC (rev 2303)
+++ branches/v-1.4.x/xstream/pom.xml	2014-11-11 00:23:18 UTC (rev 2304)
@@ -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: branches/v-1.4.x/xstream-distribution/src/content/changes.html (2303 => 2304)


--- branches/v-1.4.x/xstream-distribution/src/content/changes.html	2014-11-10 09:58:44 UTC (rev 2303)
+++ branches/v-1.4.x/xstream-distribution/src/content/changes.html	2014-11-11 00:23:18 UTC (rev 2304)
@@ -42,6 +42,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:

http://xircles.codehaus.org/manage_email

Reply via email to