Update kryo to 4.0.0

- WARN:Serialized bytes are not binary compatible - Release summary: https://github.com/EsotericSoftware/kryo/releases/tag/kryo-parent-4.0.0 - KryoNamespace: stop using direct buffer This might fix ONOS-5130 Change-Id: I6e1e00f147a90ae8bfded78b2fa3a77158602c76

Update kryo to 4.0.0
- WARN:Serialized bytes are not binary compatible - Release summary: https://github.com/EsotericSoftware/kryo/releases/tag/kryo-parent-4.0.0 - KryoNamespace: stop using direct buffer This might fix ONOS-5130 Change-Id: I6e1e00f147a90ae8bfded78b2fa3a77158602c76
Yuta HIGUCHI · Gerrit Code Review
Commit 86f142f958d99300262a0304a25bc4d3e5441944 86f142f9 1 parent 156d780d
Showing 6 changed files with 25 additions and 31 deletions
features/features.xml
lib/BUCK
lib/deps.json
lib/pom.xml
tools/build/libgen/src/main/java/org/onosproject/libgen/BuckLibGenerator.java
utils/misc/src/main/java/org/onlab/util/KryoNamespace.java
--- a/features/features.xml
View file @86f142f
+++ b/features/features.xml
View file @86f142f
@@ -40,9 +40,9 @@
         <bundle>mvn:io.dropwizard.metrics/metrics-json/3.1.2</bundle>
         <bundle>mvn:com.eclipsesource.minimal-json/minimal-json/0.9.4</bundle>
-        <bundle>mvn:com.esotericsoftware/kryo/3.0.3</bundle>
+        <bundle>mvn:com.esotericsoftware/kryo/4.0.0</bundle>
-        <bundle>mvn:com.esotericsoftware/reflectasm/1.11.0</bundle>
+        <bundle>mvn:com.esotericsoftware/reflectasm/1.11.3</bundle>
-        <bundle>mvn:org.ow2.asm/asm/5.0.3</bundle>
+        <bundle>mvn:org.ow2.asm/asm/5.0.4</bundle>
         <bundle>mvn:com.esotericsoftware/minlog/1.3.0</bundle>
         <bundle>mvn:org.objenesis/objenesis/2.2</bundle>
--- a/lib/BUCK
View file @86f142f
+++ b/lib/BUCK
View file @86f142f
-# ***** This file was auto-generated at Thu Aug 11 12:54:15 PDT 2016. Do not edit this file manually. *****
+# ***** This file was auto-generated at Tue Aug 16 15:39:29 PDT 2016. Do not edit this file manually. *****
 osgi_feature_group(
   name = 'COMPILE',
   visibility = ['PUBLIC'],
@@ -124,10 +124,10 @@ remote_jar (
 remote_jar (
   name = 'asm',
-  out = 'asm-5.0.3.jar',
+  out = 'asm-5.0.4.jar',
-  url = 'mvn:org.ow2.asm:asm:jar:5.0.3',
+  url = 'mvn:org.ow2.asm:asm:jar:5.0.4',
-  sha1 = 'dcc2193db20e19e1feca8b1240dbbc4e190824fa',
+  sha1 = '0da08b8cce7bbf903602a25a3a163ae252435795',
-  maven_coords = 'org.ow2.asm:asm:5.0.3',
+  maven_coords = 'org.ow2.asm:asm:5.0.4',
   visibility = [ 'PUBLIC' ],
 )
@@ -628,10 +628,10 @@ remote_jar (
 remote_jar (
   name = 'kryo',
-  out = 'kryo-3.0.3.jar',
+  out = 'kryo-4.0.0.jar',
-  url = 'mvn:com.esotericsoftware:kryo:jar:3.0.3',
+  url = 'mvn:com.esotericsoftware:kryo:jar:4.0.0',
-  sha1 = '01ebca99f633ef31484176a727093e78c7fa43e7',
+  sha1 = '9f5c64c1315ec79bee0f56bb88e4ae94b65048ce',
-  maven_coords = 'com.esotericsoftware:kryo:3.0.3',
+  maven_coords = 'com.esotericsoftware:kryo:4.0.0',
   visibility = [ 'PUBLIC' ],
 )
--- a/lib/deps.json
View file @86f142f
+++ b/lib/deps.json
View file @86f142f
@@ -85,7 +85,7 @@
   "artifacts": {
     "gmetric4j": "mvn:info.ganglia.gmetric4j:gmetric4j:1.0.10",
     "aopalliance-repackaged": "mvn:org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b34",
-    "asm": "mvn:org.ow2.asm:asm:5.0.3",
+    "asm": "mvn:org.ow2.asm:asm:5.0.4",
     "atomix": "mvn:io.atomix:atomix-all:1.0.0-rc9",
     "commons-codec": "mvn:commons-codec:commons-codec:1.10",
     "commons-collections": "mvn:commons-collections:commons-collections:3.2.2",
@@ -141,7 +141,7 @@
     "jsch": "mvn:com.jcraft:jsch:0.1.53",
     "jsr305": "mvn:com.google.code.findbugs:jsr305:3.0.1",
     "junit": "mvn:junit:junit:4.12",
-    "kryo": "mvn:com.esotericsoftware:kryo:3.0.3",
+    "kryo": "mvn:com.esotericsoftware:kryo:4.0.0",
     "mapdb": "mvn:org.mapdb:mapdb:1.0.9",
     "metrics-core": "mvn:io.dropwizard.metrics:metrics-core:3.1.0",
     "metrics-ganglia": "mvn:io.dropwizard.metrics:metrics-ganglia:3.1.2",
--- a/lib/pom.xml
View file @86f142f
+++ b/lib/pom.xml
View file @86f142f
@@ -263,18 +263,17 @@
             <dependency>
                 <groupId>com.esotericsoftware</groupId>
                 <artifactId>kryo</artifactId>
-                <version>3.0.3</version>
+                <version>4.0.0</version>
             </dependency>
             <dependency>
                 <groupId>com.esotericsoftware</groupId>
                 <artifactId>reflectasm</artifactId>
-                <version>1.11.0</version>
+                <version>1.11.3</version>
-                <type>bundle</type>
             </dependency>
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm</artifactId>
-                <version>5.0.3</version>
+                <version>5.0.4</version>
             </dependency>
             <dependency>
                 <groupId>com.esotericsoftware</groupId>
--- a/tools/build/libgen/src/main/java/org/onosproject/libgen/BuckLibGenerator.java
View file @86f142f
+++ b/tools/build/libgen/src/main/java/org/onosproject/libgen/BuckLibGenerator.java
View file @86f142f
@@ -174,6 +174,7 @@ public class BuckLibGenerator {
             writer.write(String.format(
                     "# ***** This file was auto-generated at %s. Do not edit this file manually. *****\n",
                     new Date().toString()));
+            writer.write("# ***** Use onos-lib-gen *****\n");
             libraries.forEach(library -> writer.print(library.getBuckFragment()));
             artifacts.forEach(artifact -> writer.print(artifact.getBuckFragment()));
             writer.flush();
--- a/utils/misc/src/main/java/org/onlab/util/KryoNamespace.java
View file @86f142f
+++ b/utils/misc/src/main/java/org/onlab/util/KryoNamespace.java
View file @86f142f
@@ -21,6 +21,7 @@ import com.esotericsoftware.kryo.Serializer;
 import com.esotericsoftware.kryo.io.ByteBufferInput;
 import com.esotericsoftware.kryo.io.ByteBufferOutput;
 import com.esotericsoftware.kryo.io.Input;
+import com.esotericsoftware.kryo.io.Output;
 import com.esotericsoftware.kryo.pool.KryoCallback;
 import com.esotericsoftware.kryo.pool.KryoFactory;
 import com.esotericsoftware.kryo.pool.KryoPool;
@@ -271,19 +272,12 @@ public final class KryoNamespace implements KryoFactory, KryoPool {
      * @return serialized bytes
      */
     public byte[] serialize(final Object obj, final int bufferSize) {
-        ByteBufferOutput out = new ByteBufferOutput(bufferSize, MAX_BUFFER_SIZE);
+        Output out = new Output(bufferSize, MAX_BUFFER_SIZE);
-        try {
+        return pool.run(kryo -> {
-            Kryo kryo = borrow();
+            kryo.writeClassAndObject(out, obj);
-            try {
+            out.flush();
-                kryo.writeClassAndObject(out, obj);
+            return out.toBytes();
-                out.flush();
+        });
-                return out.toBytes();
-            } finally {
-                release(kryo);
-            }
-        } finally {
-            out.release();
-        }
     }
     /**