BUG-7183: Bump aeron/Agrona to latest versions

This is a bump to latest versions, which require leak of
com.sun.media.sound from the boot class path to work.

Change-Id: I5a7bbf8b1cf8c28e14af9a8d92a03be0072022b4
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
index 269f6e27db0f8c6a9aadf7f4450fbe0508d114c4..e15bee243ac052675ac5e2c6ce3d21434efb5d78 100644 (file)
--- a/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
+++ b/features-test/src/main/java/org/opendaylight/odlparent/featuretest/SingleFeatureTest.java
@@ -166,6 +166,8 @@ public class SingleFeatureTest {
                     System.getProperty(ORG_OPENDAYLIGHT_FEATURETEST_FEATURENAME_PROP)),
             CoreOptions.systemProperty(ORG_OPENDAYLIGHT_FEATURETEST_FEATUREVERSION_PROP).value(
                     System.getProperty(ORG_OPENDAYLIGHT_FEATURETEST_FEATUREVERSION_PROP)),
+            // Needed for Agrona/aeron.io
+            CoreOptions.systemPackages("com.sun.media.sound", "sun.nio.ch"),
         };
     }
 

diff --git a/features/features-akka/src/main/feature/feature.xml b/features/features-akka/src/main/feature/feature.xml
index c22fe3827654b65994f0bf2bf975a3f5b62cb03c..d4fc43d28b41bfea366c7e417a893b8caf317f86 100644 (file)
--- a/features/features-akka/src/main/feature/feature.xml
+++ b/features/features-akka/src/main/feature/feature.xml
@@ -45,9 +45,9 @@
         <bundle>mvn:com.typesafe.akka/akka-protobuf_${scala.version}/${akka.version}</bundle>
         <bundle>mvn:com.typesafe.akka/akka-remote_${scala.version}/${akka.version}</bundle>
         <bundle>mvn:com.typesafe.akka/akka-stream_${scala.version}/${akka.version}</bundle>
-        <bundle>wrap:mvn:org.agrona/Agrona/0.5.6</bundle>
-        <bundle>wrap:mvn:io.aeron/aeron-client/1.0.3</bundle>
-        <bundle>wrap:mvn:io.aeron/aeron-driver/1.0.3</bundle>
+        <bundle>mvn:org.agrona/Agrona/0.9.0</bundle>
+        <bundle>mvn:io.aeron/aeron-client/1.0.4</bundle>
+        <bundle>mvn:io.aeron/aeron-driver/1.0.4</bundle>
         <bundle>mvn:io.netty/netty/3.10.6.Final</bundle>
         <bundle>mvn:org.reactivestreams/reactive-streams/1.0.0</bundle>
     </feature>

diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties b/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
index 3eddcf38b33e9e69baa7eeb7fd82362304bf5e39..e2bb24e34bb906d6bbae81ddfeb6db63d86d593b 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
+++ b/karaf/opendaylight-karaf-resources/src/main/resources/etc/custom.properties
@@ -1,5 +1,5 @@
 # Extra packages to import from the boot class loader
-org.osgi.framework.system.packages.extra=org.apache.karaf.branding,sun.reflect,sun.reflect.misc,sun.misc,sun.nio.ch
+org.osgi.framework.system.packages.extra=org.apache.karaf.branding,sun.reflect,sun.reflect.misc,sun.misc,sun.nio.ch,com.sun.media.sound
 
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=325578
 # Extend the framework to avoid the resources to be presented with

diff --git a/karaf/opendaylight-karaf4-resources/src/main/resources/etc/custom.properties b/karaf/opendaylight-karaf4-resources/src/main/resources/etc/custom.properties
index 3eddcf38b33e9e69baa7eeb7fd82362304bf5e39..e2bb24e34bb906d6bbae81ddfeb6db63d86d593b 100644 (file)
--- a/karaf/opendaylight-karaf4-resources/src/main/resources/etc/custom.properties
+++ b/karaf/opendaylight-karaf4-resources/src/main/resources/etc/custom.properties
@@ -1,5 +1,5 @@
 # Extra packages to import from the boot class loader
-org.osgi.framework.system.packages.extra=org.apache.karaf.branding,sun.reflect,sun.reflect.misc,sun.misc,sun.nio.ch
+org.osgi.framework.system.packages.extra=org.apache.karaf.branding,sun.reflect,sun.reflect.misc,sun.misc,sun.nio.ch,com.sun.media.sound
 
 # https://bugs.eclipse.org/bugs/show_bug.cgi?id=325578
 # Extend the framework to avoid the resources to be presented with

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index d93adedb9cbfbb0ee5187d04bfada78f8370a023..9f7bd885ca266e7c9056a85762542e7540547fe0 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -1122,17 +1122,17 @@
       <dependency>
         <groupId>org.agrona</groupId>
         <artifactId>Agrona</artifactId>
-        <version>0.5.6</version>
+        <version>0.9.0</version>
       </dependency>
       <dependency>
         <groupId>io.aeron</groupId>
         <artifactId>aeron-client</artifactId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
       </dependency>
       <dependency>
         <groupId>io.aeron</groupId>
         <artifactId>aeron-driver</artifactId>
-        <version>1.0.3</version>
+        <version>1.0.4</version>
       </dependency>
 
       <!-- Scala -->