You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bi...@apache.org on 2022/10/21 16:29:48 UTC
[storm] branch master updated: [STORM-3883] Update Kryo to version 4.0.2 (#3502)
This is an automated email from the ASF dual-hosted git repository.
bipinprasad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/storm.git
The following commit(s) were added to refs/heads/master by this push:
new 5e110961a [STORM-3883] Update Kryo to version 4.0.2 (#3502)
5e110961a is described below
commit 5e110961a31a6fa33c9c0b54b84aedfdc442593f
Author: Bipin Prasad <bi...@apache.org>
AuthorDate: Fri Oct 21 09:29:35 2022 -0700
[STORM-3883] Update Kryo to version 4.0.2 (#3502)
* [STORM-3883] Update Kryo to version 4.0.2. Exclude 3.0.3 pulled in storm-clojure->com.twitter:carbonite->com.twitter:chill-java
* [STORM-3883] Update licenses
---
DEPENDENCY-LICENSES | 11 +++++++----
LICENSE-binary | 9 ++++-----
pom.xml | 2 +-
storm-clojure/pom.xml | 20 ++++++++++++++++++++
storm-core/pom.xml | 20 ++++++++++++++++++++
5 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/DEPENDENCY-LICENSES b/DEPENDENCY-LICENSES
index 54c68199d..8467b9938 100644
--- a/DEPENDENCY-LICENSES
+++ b/DEPENDENCY-LICENSES
@@ -2,6 +2,11 @@
List of third-party dependencies grouped by their license type.
+ 3-Clause BSD License
+
+ * Kryo (com.esotericsoftware:kryo:4.0.2 - https://github.com/EsotericSoftware/kryo/kryo)
+ * Kryo Shaded (com.esotericsoftware:kryo-shaded:4.0.2 - https://github.com/EsotericSoftware/kryo/kryo-shaded)
+
Apache-2.0
* Gson (com.google.code.gson:gson:2.8.9 - https://github.com/google/gson/gson)
@@ -435,7 +440,7 @@ List of third-party dependencies grouped by their license type.
* Netty (io.netty:netty:3.10.6.Final - http://netty.io/)
* Nimbus JOSE+JWT (com.nimbusds:nimbus-jose-jwt:7.9 - https://bitbucket.org/connect2id/nimbus-jose-jwt)
* Noggit (org.noggit:noggit:0.6 - http://github.com/yonik/noggit)
- * Objenesis (org.objenesis:objenesis:2.1 - http://objenesis.org)
+ * Objenesis (org.objenesis:objenesis:2.5.1 - http://objenesis.org)
* Objenesis (org.objenesis:objenesis:2.6 - http://objenesis.org)
* OkHttp (com.squareup.okhttp:okhttp:2.7.5 - https://github.com/square/okhttp/okhttp)
* Okio (com.squareup.okio:okio:1.6.0 - https://github.com/square/okio/okio)
@@ -568,13 +573,11 @@ List of third-party dependencies grouped by their license type.
* JPMML manager (org.jpmml:pmml-manager:1.0.22 - http://www.jpmml.org/pmml-manager)
* JPMML model (org.jpmml:pmml-model:1.0.22 - http://www.jpmml.org/pmml-model)
* JPMML schema (org.jpmml:pmml-schema:1.0.22 - http://www.jpmml.org/pmml-schema)
- * Kryo (com.esotericsoftware:kryo:3.0.3 - https://github.com/EsotericSoftware/kryo/kryo)
- * Kryo Shaded (com.esotericsoftware:kryo-shaded:3.0.3 - https://github.com/EsotericSoftware/kryo/kryo-shaded)
* leveldbjni-all (org.fusesource.leveldbjni:leveldbjni-all:1.8 - http://leveldbjni.fusesource.org/leveldbjni-all)
* MinLog (com.esotericsoftware:minlog:1.3.0 - https://github.com/EsotericSoftware/minlog)
* Protocol Buffer Java API (com.google.protobuf:protobuf-java:2.5.0 - http://code.google.com/p/protobuf)
* Protocol Buffers [Core] (com.google.protobuf:protobuf-java:3.1.0 - https://developers.google.com/protocol-buffers/protobuf-java/)
- * ReflectASM (com.esotericsoftware:reflectasm:1.10.1 - https://github.com/EsotericSoftware/reflectasm)
+ * ReflectASM (com.esotericsoftware:reflectasm:1.11.3 - https://github.com/EsotericSoftware/reflectasm)
BSD licence
diff --git a/LICENSE-binary b/LICENSE-binary
index 8386b61b7..6782c7cf1 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -900,7 +900,7 @@ The license texts of these dependencies can be found in the licenses directory.
* Metrics Integration with JMX (io.dropwizard.metrics:metrics-jmx:4.0.5 - http://metrics.dropwizard.io/metrics-jmx)
* Metrics Utility Servlets (io.dropwizard.metrics:metrics-servlets:4.0.5 - http://metrics.dropwizard.io/metrics-servlets)
* Nimbus JOSE+JWT (com.nimbusds:nimbus-jose-jwt:7.9 - https://bitbucket.org/connect2id/nimbus-jose-jwt)
- * Objenesis (org.objenesis:objenesis:2.1 - http://objenesis.org)
+ * Objenesis (org.objenesis:objenesis:2.5.1 - http://objenesis.org)
* OkHttp (com.squareup.okhttp:okhttp:2.7.5 - https://github.com/square/okhttp/okhttp)
* Okio (com.squareup.okio:okio:1.6.0 - https://github.com/square/okio/okio)
* opencsv (net.sf.opencsv:opencsv:2.3 - http://opencsv.sf.net)
@@ -962,18 +962,17 @@ The license texts of these dependencies can be found in the licenses directory.
* leveldbjni-all (org.fusesource.leveldbjni:leveldbjni-all:1.8 - http://leveldbjni.fusesource.org/leveldbjni-all)
* ANTLR 3 Runtime (org.antlr:antlr-runtime:3.5.2 - http://www.antlr.org)
* ANTLR ST4 4.0.4 (org.antlr:ST4:4.0.4 - http://www.stringtemplate.org)
- * ASM Core (org.ow2.asm:asm:5.0.3 - http://asm.objectweb.org/asm/)
* ParaNamer Core (com.thoughtworks.paranamer:paranamer:2.3 - http://paranamer.codehaus.org/paranamer)
* Stax2 API (org.codehaus.woodstox:stax2-api:3.1.4 - http://wiki.fasterxml.com/WoodstoxStax2)
* xmlenc Library (xmlenc:xmlenc:0.52 - http://xmlenc.sourceforge.net)
* Commons Compiler (org.codehaus.janino:commons-compiler:2.7.6 - http://docs.codehaus.org/display/JANINO/Home/commons-compiler)
* Janino (org.codehaus.janino:janino:2.7.6 - http://docs.codehaus.org/display/JANINO/Home/janino)
- * Kryo (com.esotericsoftware:kryo:3.0.3 - https://github.com/EsotericSoftware/kryo/kryo)
- * Kryo Shaded (com.esotericsoftware:kryo-shaded:3.0.3 - https://github.com/EsotericSoftware/kryo/kryo-shaded)
+ * Kryo (com.esotericsoftware:kryo:4.0.2 - https://github.com/EsotericSoftware/kryo/kryo)
+ * Kryo Shaded (com.esotericsoftware:kryo-shaded:4.0.2 - https://github.com/EsotericSoftware/kryo/kryo-shaded)
* MinLog (com.esotericsoftware:minlog:1.3.0 - https://github.com/EsotericSoftware/minlog)
* Protocol Buffer Java API (com.google.protobuf:protobuf-java:2.5.0 - http://code.google.com/p/protobuf)
* Protocol Buffers [Core] (com.google.protobuf:protobuf-java:3.1.0 - https://developers.google.com/protocol-buffers/protobuf-java/)
- * ReflectASM (com.esotericsoftware:reflectasm:1.10.1 - https://github.com/EsotericSoftware/reflectasm)
+ * ReflectASM (com.esotericsoftware:reflectasm:1.11.3 - https://github.com/EsotericSoftware/reflectasm)
BSD 2-Clause License
diff --git a/pom.xml b/pom.xml
index c2ee13c73..1586ccffa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,7 +319,7 @@
<hadoop.version>2.10.1</hadoop.version>
<hdfs.version>${hadoop.version}</hdfs.version>
<hbase.version>2.1.3</hbase.version>
- <kryo.version>3.0.3</kryo.version>
+ <kryo.version>4.0.2</kryo.version>
<servlet.version>3.1.0</servlet.version>
<joda-time.version>2.3</joda-time.version>
<thrift.version>0.13.0</thrift.version>
diff --git a/storm-clojure/pom.xml b/storm-clojure/pom.xml
index 83887d166..8ba86d912 100644
--- a/storm-clojure/pom.xml
+++ b/storm-clojure/pom.xml
@@ -45,10 +45,30 @@
<artifactId>json-simple</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.esotericsoftware</groupId>
+ <artifactId>kryo</artifactId>
+ <version>${kryo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.esotericsoftware</groupId>
+ <artifactId>kryo-shaded</artifactId>
+ <version>${kryo.version}</version>
+ </dependency>
<dependency>
<groupId>com.twitter</groupId>
<artifactId>carbonite</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.esotericsoftware</groupId>
+ <artifactId>kryo</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.esotericsoftware</groupId>
+ <artifactId>kryo-shaded</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.storm</groupId>
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 089dcafdf..e0e8f3a98 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -38,10 +38,30 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>com.esotericsoftware</groupId>
+ <artifactId>kryo</artifactId>
+ <version>${kryo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.esotericsoftware</groupId>
+ <artifactId>kryo-shaded</artifactId>
+ <version>${kryo.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.storm</groupId>
<artifactId>storm-clojure</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.esotericsoftware</groupId>
+ <artifactId>kryo</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.esotericsoftware</groupId>
+ <artifactId>kryo-shaded</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>