From 6bc38b65b60d081f23a520011f3d835a550baa46 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 2 Mar 2023 11:39:08 +0100
Subject: [PATCH] Move Kryo shading to atomix-storage

sal-akka-segmented-journal should not need to deal with Kryo, make sure
we contain the hacks at the source of the problem.

JIRA: CONTROLLER-2071
Change-Id: I0e82b532889babeacd47aade33268886620811d8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../md-sal/sal-akka-segmented-journal/pom.xml | 59 -------------------
 third-party/atomix/storage/pom.xml            | 42 ++++++++++++-
 2 files changed, 40 insertions(+), 61 deletions(-)

diff --git a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
index 93fef5cda7..dc77829936 100644
--- a/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
+++ b/opendaylight/md-sal/sal-akka-segmented-journal/pom.xml
@@ -65,37 +65,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>atomix-storage</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.esotericsoftware</groupId>
-            <artifactId>kryo</artifactId>
-            <version>4.0.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.esotericsoftware</groupId>
-            <artifactId>minlog</artifactId>
-            <version>1.3.1</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.esotericsoftware</groupId>
-            <artifactId>reflectasm</artifactId>
-            <version>1.11.8</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>5.2</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.objenesis</groupId>
-            <artifactId>objenesis</artifactId>
-            <version>2.6</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -110,34 +79,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <Import-Package>
-                            !COM.newmonics.*,
-                            !android.os,
-                            *
-                        </Import-Package>
-                        <Embed-Dependency>
-                            <!-- atomix.io is using an older Guava, and Kryo is using ancient objenesis,
-                                 so let's embed it to prevent duplicates -->
-                            *;inline=true;artifactId=atomix-storage,
-                            *;inline=true;groupId=com.esotericsoftware,
-                            *;inline=true;groupId=org.objenesis,
-                            *;inline=true;groupId=org.ow2.asm,
-                        </Embed-Dependency>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <scm>
         <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
         <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
diff --git a/third-party/atomix/storage/pom.xml b/third-party/atomix/storage/pom.xml
index c077f156f4..0650152143 100644
--- a/third-party/atomix/storage/pom.xml
+++ b/third-party/atomix/storage/pom.xml
@@ -26,6 +26,7 @@
 
   <artifactId>atomix-storage</artifactId>
   <name>Atomix Storage</name>
+  <packaging>bundle</packaging>
 
   <properties>
     <odlparent.checkstyle.skip>true</odlparent.checkstyle.skip>
@@ -46,6 +47,31 @@
       <groupId>com.esotericsoftware</groupId>
       <artifactId>kryo</artifactId>
       <version>4.0.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.esotericsoftware</groupId>
+      <artifactId>minlog</artifactId>
+      <version>1.3.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.esotericsoftware</groupId>
+      <artifactId>reflectasm</artifactId>
+      <version>1.11.8</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>5.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.objenesis</groupId>
+      <artifactId>objenesis</artifactId>
+      <version>2.6</version>
+      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -64,11 +90,23 @@
           <instructions>
             <Export-Package>
               io.atomix.storage.*,
-              io.atomix.utils.*
+              io.atomix.utils.*,
+              com.esotericsoftware.kryo.*;version=4.0.2
             </Export-Package>
             <Import-Package>
-              sun.nio.ch;resolution:=optional,sun.misc;resolution:=optional,*
+              sun.nio.ch;resolution:=optional,
+              sun.misc;resolution:=optional,
+              !COM.newmonics.*,
+              !android.os,
+              *
             </Import-Package>
+
+            <!-- Kryo is using ancient objenesis, so let's embed it to prevent duplicates -->
+            <Embed-Dependency>
+                *;inline=true;groupId=com.esotericsoftware,
+                *;inline=true;groupId=org.objenesis,
+                *;inline=true;groupId=org.ow2.asm,
+            </Embed-Dependency>
           </instructions>
         </configuration>
       </plugin>
-- 
2.36.6