[openwhisk] branch master updated: Update akka-management and discovery to 1.0.5. (#4749)

[chetanm]

This is an automated email from the ASF dual-hosted git repository.

chetanm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new c467d61  Update akka-management and discovery to 1.0.5. (#4749)
c467d61 is described below

commit c467d6130e67626c86c3a7fc500026cb8d3370ef
Author: Markus Thömmes <markusthoem...@me.com>
AuthorDate: Tue Dec 17 10:20:26 2019 +0100

    Update akka-management and discovery to 1.0.5. (#4749)
---
 core/controller/build.gradle                                        | 6 +++---
 .../openwhisk/core/loadBalancer/ShardingContainerPoolBalancer.scala | 2 +-
 settings.gradle                                                     | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/controller/build.gradle b/core/controller/build.gradle
index fead3e1..b086454 100644
--- a/core/controller/build.gradle
+++ b/core/controller/build.gradle
@@ -37,9 +37,9 @@ distDockerCoverage.dependsOn 
':common:scala:scoverageClasses', 'scoverageClasses
 
 dependencies {
     compile "org.scala-lang:scala-library:${gradle.scala.version}"
-    compile 
"com.lightbend.akka.management:akka-management-cluster-bootstrap_${gradle.scala.depVersion}:0.11.0"
-    compile 
"com.lightbend.akka.discovery:akka-discovery-kubernetes-api_${gradle.scala.depVersion}:0.11.0"
-    compile 
"com.lightbend.akka.discovery:akka-discovery-marathon-api_${gradle.scala.depVersion}:0.11.0"
+    compile 
"com.lightbend.akka.management:akka-management-cluster-bootstrap_${gradle.scala.depVersion}:${gradle.akka_management.version}"
+    compile 
"com.lightbend.akka.discovery:akka-discovery-kubernetes-api_${gradle.scala.depVersion}:${gradle.akka_management.version}"
+    compile 
"com.lightbend.akka.discovery:akka-discovery-marathon-api_${gradle.scala.depVersion}:${gradle.akka_management.version}"
     compile project(':common:scala')
     compile project(':core:invoker')
 }
diff --git 
a/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/ShardingContainerPoolBalancer.scala
 
b/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/ShardingContainerPoolBalancer.scala
index 61bb5e0..f06cb04 100644
--- 
a/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/ShardingContainerPoolBalancer.scala
+++ 
b/core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/ShardingContainerPoolBalancer.scala
@@ -24,7 +24,7 @@ import java.util.concurrent.ThreadLocalRandom
 import akka.actor.{Actor, ActorSystem, Cancellable, Props}
 import akka.cluster.ClusterEvent._
 import akka.cluster.{Cluster, Member, MemberStatus}
-import akka.management.AkkaManagement
+import akka.management.scaladsl.AkkaManagement
 import akka.management.cluster.bootstrap.ClusterBootstrap
 import akka.stream.ActorMaterializer
 import org.apache.kafka.clients.producer.RecordMetadata
diff --git a/settings.gradle b/settings.gradle
index ba8b4db..69ea863 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -48,6 +48,7 @@ gradle.ext.scalafmt = [
 gradle.ext.akka = [version : '2.5.26']
 gradle.ext.akka_kafka = [version : '1.1.0']
 gradle.ext.akka_http = [version : '10.1.11']
+gradle.ext.akka_management = [version : '1.0.5']
 
 gradle.ext.curator = [version : '4.0.0']
 gradle.ext.kube_client = [version: '4.4.2']