Fixed deployment to allow all the Kryo related stuff to operate in the OSGi context.
diff --git a/features/features.xml b/features/features.xml
index 5ad9f95..9fb78d3 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -6,10 +6,13 @@
<feature name="onos-thirdparty-base" version="1.0.0"
description="ONOS 3rd party dependencies">
<bundle>mvn:commons-lang/commons-lang/2.6</bundle>
+ <bundle>mvn:org.apache.commons/commons-lang3/3.3.2</bundle>
<bundle>mvn:com.google.guava/guava/18.0</bundle>
<bundle>mvn:io.netty/netty/3.9.2.Final</bundle>
+
<bundle>mvn:com.esotericsoftware.kryo/kryo/2.24.0</bundle>
- <bundle>mvn:com.esotericsoftware.minlog/minlog/1.3</bundle>
+ <bundle>mvn:com.esotericsoftware/minlog/1.3.0</bundle>
+ <bundle>mvn:org.objenesis/objenesis/2.1</bundle>
</feature>
<feature name="onos-thirdparty-web" version="1.0.0"
diff --git a/pom.xml b/pom.xml
index 18dd5b1..0d57c3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,8 +73,6 @@
<version>3.9.0.Final</version>
</dependency>
-
-
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-testlib</artifactId>
@@ -88,6 +86,13 @@
<version>2.6</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.3.2</version>
+ </dependency>
+
+
<!-- Web related -->
<dependency>
<groupId>com.sun.jersey</groupId>
@@ -139,17 +144,21 @@
<version>2.24.0</version>
</dependency>
<dependency>
+ <groupId>com.esotericsoftware</groupId>
+ <artifactId>minlog</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
<groupId>de.javakaffee</groupId>
<artifactId>kryo-serializers</artifactId>
<version>0.27</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
- </dependency>
-
<!-- ONOS related -->
<dependency>
<groupId>org.onlab.onos</groupId>
diff --git a/utils/misc/pom.xml b/utils/misc/pom.xml
index b70bbe5..f49f0fa 100644
--- a/utils/misc/pom.xml
+++ b/utils/misc/pom.xml
@@ -31,12 +31,21 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>com.esotericsoftware.kryo</groupId>
<artifactId>kryo</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>com.esotericsoftware</groupId>
+ <artifactId>minlog</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
</dependency>
</dependencies>