Using kryo from com.esotericsoftware group library instead of from com.esotericsoftware.kryo5 group

Author: arkadius

build.sbt

@@ -52,7 +52,7 @@ val sharedSettings = Seq(
     "org.scalacheck" %% "scalacheck" % "1.15.2" % "test",
     "org.scalatest" %% "scalatest" % "3.2.15" % "test",
     "org.scalatestplus" %% "scalatestplus-scalacheck" % "3.1.0.0-RC2" % "test",
-    "com.esotericsoftware.kryo" % "kryo5" % kryoVersion
+    "com.esotericsoftware" % "kryo" % kryoVersion
   ),
   Test / parallelExecution := true,
   pomExtra := <url>https://github.com/xebialabs/chill</url>

chill-akka/src/main/scala/com/twitter/chill/akka/ActorRefSerializer.scala

@@ -14,8 +14,8 @@ package com.twitter.chill.akka
  */
 import akka.actor.{ActorPath, ActorRef, ExtendedActorSystem}
 import akka.serialization.Serialization
-import com.esotericsoftware.kryo.kryo5.{Kryo, Serializer}
-import com.esotericsoftware.kryo.kryo5.io.{Input, Output}
+import com.esotericsoftware.kryo.{Kryo, Serializer}
+import com.esotericsoftware.kryo.io.{Input, Output}
 
 import com.twitter.chill.{toRich, IKryoRegistrar}
 

chill-algebird/src/main/scala/com/twitter/chill/algebird/AlgebirdRegistrar.scala

@@ -15,8 +15,8 @@ limitations under the License.
  */
 package com.twitter.chill.algebird
 
-import com.esotericsoftware.kryo.kryo5.Kryo
-import com.esotericsoftware.kryo.kryo5.serializers.FieldSerializer
+import com.esotericsoftware.kryo.Kryo
+import com.esotericsoftware.kryo.serializers.FieldSerializer
 
 import com.twitter.chill.IKryoRegistrar
 

chill-algebird/src/main/scala/com/twitter/chill/algebird/AlgebirdSerializers.scala

@@ -15,9 +15,9 @@ limitations under the License.
  */
 package com.twitter.chill.algebird
 
-import com.esotericsoftware.kryo.kryo5.Kryo
-import com.esotericsoftware.kryo.kryo5.{Serializer => KSerializer}
-import com.esotericsoftware.kryo.kryo5.io.{Input, Output}
+import com.esotericsoftware.kryo.Kryo
+import com.esotericsoftware.kryo.{Serializer => KSerializer}
+import com.esotericsoftware.kryo.io.{Input, Output}
 
 import com.twitter.algebird.{AveragedValue, DecayedValue, HLL, HyperLogLog, HyperLogLogMonoid, Moments, QTree}
 

chill-avro/src/test/java/com/twitter/chill/avro/AvroSerializerJavaTest.java

@@ -1,9 +1,9 @@
 package com.twitter.chill.avro;
 
 import avro.FiscalRecord;
-import com.esotericsoftware.kryo.kryo5.Kryo;
-import com.esotericsoftware.kryo.kryo5.Serializer;
-import com.esotericsoftware.kryo.kryo5.objenesis.strategy.StdInstantiatorStrategy;
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.Serializer;
+import org.objenesis.strategy.StdInstantiatorStrategy;
 import com.twitter.chill.KryoInstantiator;
 import com.twitter.chill.KryoPool;
 import org.apache.avro.Schema;

chill-hadoop/src/main/java/com/twitter/chill/hadoop/KryoSerialization.java

@@ -16,9 +16,9 @@
 
 package com.twitter.chill.hadoop;
 
-import com.esotericsoftware.kryo.kryo5.Kryo;
-import com.esotericsoftware.kryo.kryo5.io.Output;
-import com.esotericsoftware.kryo.kryo5.objenesis.strategy.StdInstantiatorStrategy;
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryo.io.Output;
+import org.objenesis.strategy.StdInstantiatorStrategy;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;

chill-hadoop/src/test/scala/com/twitter/chill/hadoop/HadoopTests.scala

@@ -16,8 +16,8 @@ limitations under the License.
 
 package com.twitter.chill.hadoop
 
-import com.esotericsoftware.kryo.kryo5.Kryo
-import com.esotericsoftware.kryo.kryo5.objenesis.strategy.StdInstantiatorStrategy;
+import com.esotericsoftware.kryo.Kryo
+import org.objenesis.strategy.StdInstantiatorStrategy;
 
 import java.io.{ByteArrayInputStream => BAIn, ByteArrayOutputStream => BAOut}
 import org.apache.hadoop.conf.Configuration

chill-java/src/main/java/com/twitter/chill/ClassRegistrar.java

@@ -16,7 +16,7 @@
 
 package com.twitter.chill;
 
-import com.esotericsoftware.kryo.kryo5.Kryo;
+import com.esotericsoftware.kryo.Kryo;
 
 /** Register this class to be used with the default serializer for this class */
 public class ClassRegistrar<T> implements IKryoRegistrar {

chill-java/src/main/java/com/twitter/chill/IKryoRegistrar.java

@@ -16,7 +16,7 @@
 
 package com.twitter.chill;
 
-import com.esotericsoftware.kryo.kryo5.Kryo;
+import com.esotericsoftware.kryo.Kryo;
 import java.io.Serializable;
 
 /**

chill-java/src/main/java/com/twitter/chill/KryoInstantiator.java

@@ -16,8 +16,8 @@
 
 package com.twitter.chill;
 
-import com.esotericsoftware.kryo.kryo5.Kryo;
-import com.esotericsoftware.kryo.kryo5.objenesis.strategy.InstantiatorStrategy;
+import com.esotericsoftware.kryo.Kryo;
+import org.objenesis.strategy.InstantiatorStrategy;
 import java.io.Serializable;
 
 /** Class to create a new Kryo instance.