SONAR-5189 Remove Kryo

diff --git a/pom.xml b/pom.xml
index c220883917086846f1833483713f5c198a69da12..b1053d36b2f79a9016587f3cc72de75bd7095b67 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1105,11 +1105,6 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>com.esotericsoftware.kryo</groupId>
-        <artifactId>kryo</artifactId>
-        <version>2.23.0</version>
-      </dependency>
       <dependency>
         <groupId>com.github.kevinsawicki</groupId>
         <artifactId>http-request</artifactId>

diff --git a/sonar-batch/pom.xml b/sonar-batch/pom.xml
index dae636cb3e737dae08002afd1028499d53b5195d..8e527478c01118590111de4d3a946b608d67544c 100644 (file)
--- a/sonar-batch/pom.xml
+++ b/sonar-batch/pom.xml
@@ -24,10 +24,6 @@
       <groupId>com.akiban</groupId>
       <artifactId>akiban-persistit</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.esotericsoftware.kryo</groupId>
-      <artifactId>kryo</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.sonar</groupId>
       <artifactId>sonar-core</artifactId>

diff --git a/sonar-batch/src/main/java/org/sonar/batch/index/Caches.java b/sonar-batch/src/main/java/org/sonar/batch/index/Caches.java
index eeb4909f291b6eb4c51652e22040cf9ccb75e3a1..087b323fbd7c02542cb5dac5304f03dc3d514c46 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/index/Caches.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/index/Caches.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.batch.index;
 
-import com.esotericsoftware.kryo.Kryo;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Sets;
 import com.persistit.Exchange;
@@ -29,7 +28,6 @@ import com.persistit.Volume;
 import com.persistit.exception.PersistitException;
 import com.persistit.logging.Slf4jAdapter;
 import org.apache.commons.io.FileUtils;
-import org.objenesis.strategy.SerializingInstantiatorStrategy;
 import org.picocontainer.Startable;
 import org.slf4j.LoggerFactory;
 import org.sonar.api.BatchComponent;
@@ -53,7 +51,6 @@ public class Caches implements BatchComponent, Startable {
   private Persistit persistit;
   private Volume volume;
   private final TempFolder tempFolder;
-  private Kryo kryo;
 
   public Caches(TempFolder tempFolder) {
     this.tempFolder = tempFolder;
@@ -65,8 +62,6 @@ public class Caches implements BatchComponent, Startable {
       tempDir = tempFolder.newDir("caches");
       persistit = new Persistit();
       persistit.setPersistitLogger(new Slf4jAdapter(LoggerFactory.getLogger("PERSISTIT")));
-      kryo = new Kryo();
-      kryo.setInstantiatorStrategy(new SerializingInstantiatorStrategy());
       Properties props = new Properties();
       props.setProperty("datapath", tempDir.getAbsolutePath());
       props.setProperty("logpath", "${datapath}/log");