This is an automated email from the ASF dual-hosted git repository.
xilangyan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-livy.git
The following commit(s) were added to refs/heads/master by this push:
new 1a57012c Fixes [LIVY-783]
https://issues.apache.org/jira/browse/LIVY-783
new b8165682 Merge pull request #313 from Minutis/master
1a57012c is described below
commit 1a57012cb586621fe7c4cc3d3afe25c92ea4a5cc
Author: Minutis <[email protected]>
AuthorDate: Mon Dec 28 23:13:40 2020 +0200
Fixes [LIVY-783] https://issues.apache.org/jira/browse/LIVY-783
---
client-common/pom.xml | 2 +-
pom.xml | 2 +-
repl/pom.xml | 10 ++++++++++
rsc/pom.xml | 5 ++---
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/client-common/pom.xml b/client-common/pom.xml
index 6533d69b..ffc63b9a 100644
--- a/client-common/pom.xml
+++ b/client-common/pom.xml
@@ -37,7 +37,7 @@
<dependency>
<groupId>com.esotericsoftware</groupId>
- <artifactId>kryo</artifactId>
+ <artifactId>kryo-shaded</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/pom.xml b/pom.xml
index d2e535a7..93ece137 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,7 +270,7 @@
<dependency>
<groupId>com.esotericsoftware</groupId>
- <artifactId>kryo</artifactId>
+ <artifactId>kryo-shaded</artifactId>
<version>${kryo.version}</version>
</dependency>
diff --git a/repl/pom.xml b/repl/pom.xml
index 88b341f8..dec6b092 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -123,6 +123,11 @@
<artifactId>json4s-jackson_${scala.binary.version}</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.esotericsoftware</groupId>
+ <artifactId>kryo-shaded</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
@@ -176,6 +181,7 @@
<include>org.json4s:json4s-core_${scala.binary.version}</include>
<include>org.json4s:json4s-jackson_${scala.binary.version}</include>
<include>org.json4s:json4s-scalap_${scala.binary.version}</include>
+ <include>com.esotericsoftware:kryo-shaded</include>
</includes>
</artifactSet>
<filters>
@@ -192,6 +198,10 @@
<pattern>org.json4s</pattern>
<shadedPattern>org.apache.livy.shaded.json4s</shadedPattern>
</relocation>
+ <relocation>
+ <pattern>com.esotericsoftware</pattern>
+ <shadedPattern>org.apache.livy.shaded.kryo</shadedPattern>
+ </relocation>
</relocations>
</configuration>
</execution>
diff --git a/rsc/pom.xml b/rsc/pom.xml
index 833ad836..01a82805 100644
--- a/rsc/pom.xml
+++ b/rsc/pom.xml
@@ -59,7 +59,7 @@
<dependency>
<groupId>com.esotericsoftware</groupId>
- <artifactId>kryo</artifactId>
+ <artifactId>kryo-shaded</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
@@ -140,9 +140,8 @@
<artifactSet>
<includes>
<include>org.apache.livy:livy-client-common</include>
- <include>com.esotericsoftware:kryo</include>
+ <include>com.esotericsoftware:kryo-shaded</include>
<include>com.esotericsoftware:minlog</include>
- <include>com.esotericsoftware:reflectasm</include>
</includes>
</artifactSet>
<filters>
