From 905e61664b7958e812463e1551d9fb40c7a01f19 Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Sun, 17 Dec 2017 17:34:07 +0100
Subject: [PATCH] Aeron 1.7.0

---
 .../src/main/scala/akka/remote/artery/ArteryTransport.scala  | 5 +++--
 akka-remote/src/test/java/akka/remote/artery/AeronStat.java  | 2 +-
 project/Dependencies.scala                                   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala
index ea6559eea2..6593073384 100644
--- a/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala
+++ b/akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala
@@ -17,6 +17,7 @@ import scala.concurrent.{ Await, Future, Promise }
 import scala.concurrent.duration._
 import scala.util.Failure
 import scala.util.Success
+import scala.util.Try
 import scala.util.control.NoStackTrace
 import scala.util.control.NonFatal
 
@@ -59,7 +60,7 @@ import io.aeron.exceptions.DriverTimeoutException
 import org.agrona.{ DirectBuffer, ErrorHandler, IoUtil }
 import org.agrona.concurrent.BackoffIdleStrategy
 import akka.remote.artery.Decoder.InboundCompressionAccess
-import io.aeron.driver.status.ChannelEndpointStatus
+import io.aeron.status.ChannelEndpointStatus
 import org.agrona.collections.IntObjConsumer
 import org.agrona.concurrent.status.CountersReader.MetaData
 
@@ -880,7 +881,7 @@ private[remote] class ArteryTransport(_system: ExtendedActorSystem, _provider: R
     if (hasBeenShutdown.compareAndSet(false, true)) {
       log.debug("Shutting down [{}]", localAddress)
       if (system.settings.JvmShutdownHooks)
-        Runtime.getRuntime.removeShutdownHook(shutdownHook)
+        Try(Runtime.getRuntime.removeShutdownHook(shutdownHook)) // may throw if shutdown already in progress
       val allAssociations = associationRegistry.allAssociations
       val flushing: Future[Done] =
         if (allAssociations.isEmpty) Future.successful(Done)
diff --git a/akka-remote/src/test/java/akka/remote/artery/AeronStat.java b/akka-remote/src/test/java/akka/remote/artery/AeronStat.java
index 0e5850f8e6..e4654e1d22 100644
--- a/akka-remote/src/test/java/akka/remote/artery/AeronStat.java
+++ b/akka-remote/src/test/java/akka/remote/artery/AeronStat.java
@@ -25,7 +25,7 @@ import java.util.regex.Pattern;
 
 import io.aeron.CncFileDescriptor;
 import io.aeron.CommonContext;
-import io.aeron.driver.status.ChannelEndpointStatus;
+import io.aeron.status.ChannelEndpointStatus;
 import org.agrona.DirectBuffer;
 import org.agrona.IoUtil;
 import org.agrona.concurrent.status.CountersReader;
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index df0e230693..64d69e9270 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -17,7 +17,7 @@ object Dependencies {
   val sslConfigVersion = "0.2.2"
   val slf4jVersion = "1.7.25"
   val scalaXmlVersion = "1.0.6"
-  val aeronVersion = "1.3.0"
+  val aeronVersion = "1.7.0"
 
   val Versions = Seq(
     crossScalaVersions := Seq("2.11.12", "2.12.4"),