From 5b3c55e338ae5c6de80a6ec959fa5e049eceabb9 Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Fri, 23 Nov 2018 17:36:16 +0100
Subject: [PATCH] Kryo/Objenesis versions conflict.

Objenesis 2.1 was included via Kryo add Objenesis 2.6 explicitly.
They both ended up on classpath and might cause class loading issues.

As a fix Kryo is now does't include Objenesis 2.1 transitively, instead using Objenesis 2.6

CPP-14559 CLion plugin: Kryo Exception in case of reopening project
---
 .idea/libraries/Kryo.xml                     | 8 +++++---
 plugins/gradle/intellij.gradle.common.iml    | 1 +
 plugins/gradle/java/intellij.gradle.java.iml | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.idea/libraries/Kryo.xml b/.idea/libraries/Kryo.xml
index 53d40510f582..0a818becdedc 100644
--- a/.idea/libraries/Kryo.xml
+++ b/.idea/libraries/Kryo.xml
@@ -1,16 +1,18 @@
 <component name="libraryTable">
   <library name="Kryo" type="repository">
-    <properties maven-id="com.esotericsoftware.kryo:kryo:2.24.0" />
+    <properties maven-id="com.esotericsoftware.kryo:kryo:2.24.0">
+      <exclude>
+        <dependency maven-id="org.objenesis:objenesis" />
+      </exclude>
+    </properties>
     <CLASSES>
       <root url="jar://$MAVEN_REPOSITORY$/com/esotericsoftware/kryo/kryo/2.24.0/kryo-2.24.0.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/com/esotericsoftware/minlog/minlog/1.2/minlog-1.2.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.1/objenesis-2.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
       <root url="jar://$MAVEN_REPOSITORY$/com/esotericsoftware/kryo/kryo/2.24.0/kryo-2.24.0-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/com/esotericsoftware/minlog/minlog/1.2/minlog-1.2-sources.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/2.1/objenesis-2.1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/plugins/gradle/intellij.gradle.common.iml b/plugins/gradle/intellij.gradle.common.iml
index 24264e4ba2bb..a2500758dfb3 100644
--- a/plugins/gradle/intellij.gradle.common.iml
+++ b/plugins/gradle/intellij.gradle.common.iml
@@ -19,6 +19,7 @@
     <orderEntry type="library" exported="" name="Slf4j" level="project" />
     <orderEntry type="library" exported="" name="Gradle" level="project" />
     <orderEntry type="library" name="Kryo" level="project" />
+    <orderEntry type="library" name="Objenesis" level="project" />
     <orderEntry type="library" name="Groovy" level="project" />
     <orderEntry type="library" name="gson" level="project" />
   </component>
diff --git a/plugins/gradle/java/intellij.gradle.java.iml b/plugins/gradle/java/intellij.gradle.java.iml
index 72277fe09a4f..f79777fc8394 100644
--- a/plugins/gradle/java/intellij.gradle.java.iml
+++ b/plugins/gradle/java/intellij.gradle.java.iml
@@ -25,6 +25,7 @@
     <orderEntry type="library" name="swingx" level="project" />
     <orderEntry type="module" module-name="intellij.platform.smRunner" />
     <orderEntry type="library" name="Kryo" level="project" />
+    <orderEntry type="library" name="Objenesis" level="project" />
     <orderEntry type="library" name="Ant" level="project" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="intellij.platform.jps.build" />