[xstream-scm] [2313] branches/v-1.4.x: Merge Java 9 runtime detection from trunk.

Wed, 28 Jan 2015 16:13:30 -0800

Title: [2313] branches/v-1.4.x: Merge Java 9 runtime detection from trunk.
Revision
2313
Author
joehni
Date
2015-01-28 18:13:06 -0600 (Wed, 28 Jan 2015)

Log Message

Merge Java 9 runtime detection from trunk.

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,2306-2310,2312

Modified: branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/core/JVM.java (2312 => 2313)


--- branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/core/JVM.java	2015-01-29 00:11:53 UTC (rev 2312)
+++ branches/v-1.4.x/xstream/src/java/com/thoughtworks/xstream/core/JVM.java	2015-01-29 00:13:06 UTC (rev 2313)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2004, 2005, 2006 Joe Walnes.
- * Copyright (C) 2006, 2007, 2008, 2010, 2011, 2012, 2013, 2014 XStream Committers.
+ * Copyright (C) 2006, 2007, 2008, 2010, 2011, 2012, 2013, 2014, 2015 XStream Committers.
  * All rights reserved.
  *
  * The software in this package is published under the terms of the BSD
@@ -219,6 +219,13 @@
         return majorJavaVersion >= 1.8f;
     }
 
+    /**
+     * @since upcoming
+     */
+    public static boolean is19() {
+        return majorJavaVersion >= 1.9f;
+    }
+
     private static boolean isIBM() {
     	return vendor.indexOf("IBM") != -1;
     }

Modified: branches/v-1.4.x/xstream-distribution/src/content/changes.html (2312 => 2313)


--- branches/v-1.4.x/xstream-distribution/src/content/changes.html	2015-01-29 00:11:53 UTC (rev 2312)
+++ branches/v-1.4.x/xstream-distribution/src/content/changes.html	2015-01-29 00:13:06 UTC (rev 2313)
@@ -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, 2014, 2015 XStream committers.
  All rights reserved.
  
  The software in this package is published under the terms of the BSD
@@ -39,6 +39,7 @@
     <h2>Minor changes</h2>
     
     <ul>
+    	<li>Detect Java 9 runtime.</li>
     	<li>XSTR-767: Deserialization of referenced lambda expressions fail.</li>
     	<li>XSTR-762: Private method readResolve() called on base classes.</li>
     	<li>XSTR-755: ExternalizableConverter does not respect writeReplace and readResolve.</li>
@@ -53,6 +54,7 @@
     <h2>API changes</h2>
     
     <ul>
+    	<li>Added c.t.x.util.JVM.is19().</li>
     	<li>c.t.x.converters.reflection.AbstractReflectionConverter.readResolve() is protected now.</li>
     	<li>c.t.x.mapper.AbstractAttributeAliasingMapper.readResolve() is protected now.</li>
     	<li>Deprecated c.t.x.converters.extended.StackTraceElementFactory, it is an internal helper class.</li>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to