Enable modernizer in atomix-storage

[controller.git] / third-party / atomix / storage / pom.xml

diff --git a/third-party/atomix/storage/pom.xml b/third-party/atomix/storage/pom.xml
index c077f156f49b2538bc1827a412368291da0d29c6..51f3f98196143981d6d19c2f70466b87e1b1aa4b 100644 (file)
--- a/third-party/atomix/storage/pom.xml
+++ b/third-party/atomix/storage/pom.xml
@@ -26,10 +26,10 @@
 
   <artifactId>atomix-storage</artifactId>
   <name>Atomix Storage</name>
+  <packaging>bundle</packaging>
 
   <properties>
     <odlparent.checkstyle.skip>true</odlparent.checkstyle.skip>
-    <odlparent.modernizer.skip>true</odlparent.modernizer.skip>
     <odlparent.spotbugs.skip>true</odlparent.spotbugs.skip>
   </properties>
 
@@ -46,6 +46,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>
@@ -63,12 +88,24 @@
         <configuration>
           <instructions>
             <Export-Package>
-              io.atomix.storage.*,
-              io.atomix.utils.*
+              io.atomix.storage.journal.*,
+              io.atomix.utils.serializer.*,
+              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>