[xstream-scm] [2352] trunk: Merge relevant changes of release 1.4.x in branch.

Wed, 18 Feb 2015 14:06:13 -0800

Title: [2352] trunk: Merge relevant changes of release 1.4.x in branch.

Diff

Property changes: trunk

Modified: svn:mergeinfo

+ /branches/v-1.4.x:2169,2179,2181,2183,2193,2253-2256,2261-2266,2268-2272,2287,2296,2343-2348

Modified: trunk/pom.xml (2351 => 2352)


--- trunk/pom.xml	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/pom.xml	2015-02-18 22:05:03 UTC (rev 2352)
@@ -114,7 +114,7 @@
     <profile>
       <id>xstream-release</id>
       <properties>
-        <version.java.enforced>[1.8;1.9)</version.java.enforced>
+        <version.java.enforced>[1.8,1.9)</version.java.enforced>
       </properties>
       <build>
         <plugins>

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/XStream.java (2351 => 2352)


--- trunk/xstream/src/java/com/thoughtworks/xstream/XStream.java	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/XStream.java	2015-02-18 22:05:03 UTC (rev 2352)
@@ -601,7 +601,7 @@
     }
 
     /**
-     * @deprecated As of upcoming
+     * @deprecated As of 1.4.8
      */
     @Deprecated
     protected boolean useXStream11XmlFriendlyMapper() {

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/converters/basic/BooleanConverter.java (2351 => 2352)


--- trunk/xstream/src/java/com/thoughtworks/xstream/converters/basic/BooleanConverter.java	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/converters/basic/BooleanConverter.java	2015-02-18 22:05:03 UTC (rev 2352)
@@ -40,7 +40,7 @@
     }
 
     /**
-     * @deprecated As of upcoming use {@link #canConvert(Class)}
+     * @deprecated As of 1.4.8 use {@link #canConvert(Class)}
      */
     @Deprecated
     public boolean shouldConvert(final Class<?> type, final Object value) {

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/StackTraceElementFactory.java (2351 => 2352)


--- trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/StackTraceElementFactory.java	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/converters/extended/StackTraceElementFactory.java	2015-02-18 22:05:03 UTC (rev 2352)
@@ -16,7 +16,7 @@
  *
  * @author <a href="" K. Oxley (binkley)</a>
  * @author Joe Walnes
- * @deprecated As of upcoming, it is an internal helper class
+ * @deprecated As of 1.4.8, it is an internal helper class
  */
 @Deprecated
 public class StackTraceElementFactory {

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/AbstractReflectionConverter.java (2351 => 2352)


--- trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/AbstractReflectionConverter.java	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/AbstractReflectionConverter.java	2015-02-18 22:05:03 UTC (rev 2352)
@@ -49,7 +49,7 @@
     protected final ReflectionProvider reflectionProvider;
     protected final Mapper mapper;
     /**
-     * @deprecated As of upcoming, use {@link #serializationMembers}.
+     * @deprecated As of 1.4.8, use {@link #serializationMembers}.
      */
     @Deprecated
     protected transient SerializationMethodInvoker serializationMethodInvoker;

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/LambdaConverter.java (2351 => 2352)


--- trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/LambdaConverter.java	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/LambdaConverter.java	2015-02-18 22:05:03 UTC (rev 2352)
@@ -22,7 +22,7 @@
  * The implementation maps any non-serializable lambda instance to {@code null}.
  * 
  * @author J&ouml;rg Schaible
- * @since upcoming
+ * @since 1.4.8
  */
 public class LambdaConverter extends SerializableConverter {
 
@@ -32,7 +32,7 @@
      * @param mapper
      * @param reflectionProvider
      * @param classLoaderReference
-     * @since upcoming
+     * @since 1.4.8
      */
     public LambdaConverter(
             final Mapper mapper, final ReflectionProvider reflectionProvider,

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/SerializationMethodInvoker.java (2351 => 2352)


--- trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/SerializationMethodInvoker.java	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/SerializationMethodInvoker.java	2015-02-18 22:05:03 UTC (rev 2352)
@@ -23,7 +23,7 @@
  *
  * @author Joe Walnes
  * @author J&ouml;rg Schaible
- * @deprecated As of upcoming, moved into internal util package.
+ * @deprecated As of 1.4.8, moved into internal util package.
  */
 @Deprecated
 public class SerializationMethodInvoker implements Caching {
@@ -33,7 +33,7 @@
     /**
      * Resolves an object as native serialization does by calling readResolve(), if available.
      * 
-     * @deprecated As of upcoming, moved into internal util package.
+     * @deprecated As of 1.4.8, moved into internal util package.
      */
     @Deprecated
     public Object callReadResolve(final Object result) {
@@ -41,7 +41,7 @@
     }
 
     /**
-     * @deprecated As of upcoming, moved into internal util package.
+     * @deprecated As of 1.4.8, moved into internal util package.
      */
     @Deprecated
     public Object callWriteReplace(final Object object) {
@@ -49,7 +49,7 @@
     }
 
     /**
-     * @deprecated As of upcoming, moved into internal util package.
+     * @deprecated As of 1.4.8, moved into internal util package.
      */
     @Deprecated
     public boolean supportsReadObject(final Class<?> type, final boolean includeBaseClasses) {
@@ -57,7 +57,7 @@
     }
 
     /**
-     * @deprecated As of upcoming, moved into internal util package.
+     * @deprecated As of 1.4.8, moved into internal util package.
      */
     @Deprecated
     public void callReadObject(final Class<?> type, final Object object, final ObjectInputStream stream) {
@@ -65,7 +65,7 @@
     }
 
     /**
-     * @deprecated As of upcoming, moved into internal util package.
+     * @deprecated As of 1.4.8, moved into internal util package.
      */
     @Deprecated
     public boolean supportsWriteObject(final Class<?> type, final boolean includeBaseClasses) {
@@ -73,7 +73,7 @@
     }
 
     /**
-     * @deprecated As of upcoming, moved into internal util package.
+     * @deprecated As of 1.4.8, moved into internal util package.
      */
     @Deprecated
     public void callWriteObject(final Class<?> type, final Object instance, final ObjectOutputStream stream) {
@@ -81,7 +81,7 @@
     }
 
     /**
-     * @deprecated As of upcoming, moved into internal util package.
+     * @deprecated As of 1.4.8, moved into internal util package.
      */
     @Override
     @Deprecated

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/Sun14ReflectionProvider.java (2351 => 2352)


--- trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/Sun14ReflectionProvider.java	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/converters/reflection/Sun14ReflectionProvider.java	2015-02-18 22:05:03 UTC (rev 2352)
@@ -18,12 +18,12 @@
  * 
  * @author Joe Walnes
  * @author Brian Slesinsky
- * @deprecated As of upcoming use {@link SunUnsafeReflectionProvider}
+ * @deprecated As of 1.4.7 use {@link SunUnsafeReflectionProvider}
  */
 @Deprecated
 public class Sun14ReflectionProvider extends SunUnsafeReflectionProvider {
     /**
-     * @deprecated As of upcoming use {@link SunUnsafeReflectionProvider#SunUnsafeReflectionProvider()}
+     * @deprecated As of 1.4.7 use {@link SunUnsafeReflectionProvider#SunUnsafeReflectionProvider()}
      */
     @Deprecated
     public Sun14ReflectionProvider() {
@@ -31,7 +31,7 @@
     }
 
     /**
-     * @deprecated As of upcoming use {@link SunUnsafeReflectionProvider#SunUnsafeReflectionProvider(FieldDictionary)}
+     * @deprecated As of 1.4.7 use {@link SunUnsafeReflectionProvider#SunUnsafeReflectionProvider(FieldDictionary)}
      */
     @Deprecated
     public Sun14ReflectionProvider(final FieldDictionary dic) {

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/core/JVM.java (2351 => 2352)


--- trunk/xstream/src/java/com/thoughtworks/xstream/core/JVM.java	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/core/JVM.java	2015-02-18 22:05:03 UTC (rev 2352)
@@ -248,7 +248,7 @@
     }
 
     /**
-     * @since upcoming
+     * @since 1.4.8
      */
     public static boolean is19() {
         return majorJavaVersion >= 1.9f;
@@ -496,7 +496,7 @@
     }
 
     /**
-     * @since upcoming
+     * @since 1.4.8
      */
     public static boolean canParseISO8601TimeZoneInDateFormat() {
         return canParseISO8601TimeZoneInDateFormat;

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/core/util/OrderRetainingMap.java (2351 => 2352)


--- trunk/xstream/src/java/com/thoughtworks/xstream/core/util/OrderRetainingMap.java	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/core/util/OrderRetainingMap.java	2015-02-18 22:05:03 UTC (rev 2352)
@@ -22,7 +22,7 @@
 
 
 /**
- * @deprecated As of upcoming use {@link java.util.LinkedHashMap}
+ * @deprecated As of 1.4.8 use {@link java.util.LinkedHashMap}
  */
 @Deprecated
 public class OrderRetainingMap<K, V> extends HashMap<K, V> {

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/core/util/Types.java (2351 => 2352)


--- trunk/xstream/src/java/com/thoughtworks/xstream/core/util/Types.java	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/core/util/Types.java	2015-02-18 22:05:03 UTC (rev 2352)
@@ -13,7 +13,7 @@
  * Helper methods for class types.
  * 
  * @author J&ouml;rg Schaible
- * @since upcoming
+ * @since 1.4.8
  */
 public class Types {
     private static final Pattern lambdaPattern = Pattern.compile(".*\\$\\$Lambda\\$[0-9]+/.*");

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/io/AttributeNameIterator.java (2351 => 2352)


--- trunk/xstream/src/java/com/thoughtworks/xstream/io/AttributeNameIterator.java	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/io/AttributeNameIterator.java	2015-02-18 22:05:03 UTC (rev 2352)
@@ -18,7 +18,7 @@
  * Provide an iterator over the attribute names of the current node of a reader.
  * 
  * @author Joe Walnes
- * @deprecated As of upcoming, it is an internal helper class only
+ * @deprecated As of 1.4.8, it is an internal helper class only
  */
 @Deprecated
 public class AttributeNameIterator implements Iterator<String> {

Modified: trunk/xstream/src/java/com/thoughtworks/xstream/mapper/LambdaMapper.java (2351 => 2352)


--- trunk/xstream/src/java/com/thoughtworks/xstream/mapper/LambdaMapper.java	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream/src/java/com/thoughtworks/xstream/mapper/LambdaMapper.java	2015-02-18 22:05:03 UTC (rev 2352)
@@ -18,7 +18,7 @@
  * Mapper.Null.
  * 
  * @author J&ouml;rg Schaible
- * @since upcoming
+ * @since 1.4.8
  */
 public class LambdaMapper extends MapperWrapper {
 
@@ -26,7 +26,7 @@
      * Constructs a LambdaMapper.
      *
      * @param wrapped mapper
-     * @since upcoming
+     * @since 1.4.8
      */
     public LambdaMapper(final Mapper wrapped) {
         super(wrapped);

Modified: trunk/xstream-distribution/src/content/changes.html (2351 => 2352)


--- trunk/xstream-distribution/src/content/changes.html	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream-distribution/src/content/changes.html	2015-02-18 22:05:03 UTC (rev 2352)
@@ -50,11 +50,15 @@
    		<li>Generification of the API.</li>
    		<li>Remove any stuff deprecated in XStream 1.2.x.</li>
     </ul>
-
+<!--
     <h1 id="upcoming-1.4.x">Upcoming 1.4.x maintenance release</h1>
 
     <p>Not yet released.</p>
+-->
+    <h1 id="1.4.8">1.4.8</h1>
 
+    <p>Released February 18, 2015.</p>
+
     <h2>Major changes</h2>
 
     <ul>

Modified: trunk/xstream-distribution/src/content/download.html (2351 => 2352)


--- trunk/xstream-distribution/src/content/download.html	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream-distribution/src/content/download.html	2015-02-18 22:05:03 UTC (rev 2352)
@@ -1,7 +1,7 @@
 <html>
 <!--
  Copyright (C) 2005, 2006 Joe Walnes.
- Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 XStream committers.
+ Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015 XStream committers.
  All rights reserved.
  
  The software in this package is published under the terms of the BSD
@@ -18,18 +18,18 @@
 
     <p><a href="" XStream version numbers...</a></p>
 
-    <h1 id="stable">Stable Version: <span class="version">1.4.7</span></h1>
+    <h1 id="stable">Stable Version: <span class="version">1.4.8</span></h1>
 
     <ul>
-      <li><b><a href="" distribution:</a></b>
+      <li><b><a href="" distribution:</a></b>
       Contains the XStream jar files, the Hibernate and Benchmark modules and all the dependencies.</li>
-      <li><b><a href="" distribution:</a></b>
+      <li><b><a href="" distribution:</a></b>
       Contains the complete XStream project as if checked out from the Subversion version tag.</li>
-      <li><b><a href="" Core only:</a>
+      <li><b><a href="" Core only:</a>
       The xstream.jar only as it is downloaded automatically when it is referenced as Maven dependency.</b></li>
-      <li><b><a href="" Hibernate module:</a></b>
+      <li><b><a href="" Hibernate module:</a></b>
       The xstream-hibernate.jar as it is downloaded automatically when it is referenced as Maven dependency.</li>
-      <li><b><a href="" Benchmark module:</a></b>
+      <li><b><a href="" Benchmark module:</a></b>
       The xstream-benchmark.jar as it is downloaded automatically when it is referenced as Maven dependency.</li>
     </ul>
 
@@ -49,10 +49,10 @@
     <p>Below are builds of the latest 1.4.x branch version of XStream from the <a href=""
 
     <ul>
-      <li><a href="" distributions (1.4.x)</a></li>
-      <li><a href="" Core only (1.4.x)</a></li>
-      <li><a href="" Hibernate module (1.4.x)</a></li>
-      <li><a href="" Benchmark module (1.4.x)</a></li>
+      <li><a href="" distributions (1.4.x)</a></li>
+      <li><a href="" Core only (1.4.x)</a></li>
+      <li><a href="" Hibernate module (1.4.x)</a></li>
+      <li><a href="" Benchmark module (1.4.x)</a></li>
     </ul>
 
     <h1 id="previous-releases">Previous Releases</h1>

Modified: trunk/xstream-distribution/src/content/index.html (2351 => 2352)


--- trunk/xstream-distribution/src/content/index.html	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream-distribution/src/content/index.html	2015-02-18 22:05:03 UTC (rev 2352)
@@ -1,7 +1,7 @@
 <html>
 <!--
  Copyright (C) 2005, 2006 Joe Walnes.
- Copyright (C) 2006, 2007, 2008, 2011, 2012, 2013, 2014 XStream committers.
+ Copyright (C) 2006, 2007, 2008, 2011, 2012, 2013, 2014, 2015 XStream committers.
  All rights reserved.
  
  The software in this package is published under the terms of the BSD
@@ -73,12 +73,11 @@
 
     <h1 id="news">Latest News</h1>
 
-    <h2 id="1.4.7"><b>February 8, 2014</b> XStream 1.4.7 released</h2>
+    <h2 id="1.4.8"><b>February 18, 2015</b> XStream 1.4.8 released</h2>
 
-      <p class="highlight">This maintenance release addresses mainly the security vulnerability CVE-2013-7285, an
-      arbitrary execution of commands when unmarshalling.  All previous versions are affected running at least Java 5.</p>
+      <p>Maintenance release 1.4.8 of XStream with bug fixes and improvements running with Java 8.</p>
 
-      <p>XStream contains now a security framework to fine-control the unmarshalled types.</p>
+      <p>XStream supports now serializable lambda types for a Java 9 runtime.</p>
 
       <p>View the complete <a href="" log</a> and <a href=""

Modified: trunk/xstream-distribution/src/content/news.html (2351 => 2352)


--- trunk/xstream-distribution/src/content/news.html	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream-distribution/src/content/news.html	2015-02-18 22:05:03 UTC (rev 2352)
@@ -1,7 +1,7 @@
 <html>
 <!--
  Copyright (C) 2005, 2006 Joe Walnes.
- Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012, 2013, 2014 XStream committers.
+ Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012, 2013, 2014, 2015 XStream committers.
  All rights reserved.
  
  The software in this package is published under the terms of the BSD
@@ -16,6 +16,16 @@
 
   <body>
 
+    <h2 id="1.4.8"><b>February 18, 2015</b> XStream 1.4.8 released</h2>
+
+      <p>Maintenance release 1.4.8 of XStream with bug fixes and improvements running with Java 8.</p>
+
+      <p>XStream supports now serializable lambda types for a Java 8 runtime.</p>
+
+      <p>View the complete <a href="" log</a> and <a href=""
+
+      <p>Note, the next major release 1.5 will require Java 6.</p>
+
     <h2 id="1.4.7"><b>February 8, 2014</b> XStream 1.4.7 released</h2>
 
       <p class="highlight">This maintenance release addresses mainly the security vulnerability CVE-2013-7285, an
@@ -25,8 +35,6 @@
 
       <p>View the complete <a href="" log</a> and <a href=""
 
-      <p>Note, the next major release 1.5 will require Java 6.</p>
-
     <h2 id="1.4.6"><b>December 12, 2013</b> XStream 1.4.6 released</h2>
 
       <p>Maintenance release 1.4.6 of XStream with bug fixes and improvements running with Java 8, in a GAE runtime

Modified: trunk/xstream-hibernate/pom.xml (2351 => 2352)


--- trunk/xstream-hibernate/pom.xml	2015-02-18 19:06:22 UTC (rev 2351)
+++ trunk/xstream-hibernate/pom.xml	2015-02-18 22:05:03 UTC (rev 2352)
@@ -102,10 +102,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to