Merge pull request #724 from yahoo/hp-java-11

Change to java 11, rename to cmak
yahoo · Feb 18, 2020 · a1dcb9d · a1dcb9d
2 parents 606ff09 + ec4dbb4
commit a1dcb9d
Show file tree

Hide file tree

Showing 14 changed files with 272 additions and 230 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,10 @@
 language: scala
 sudo: true
-jdk: openjdk8
+jdk: openjdk11
 install: true
 script: travis_wait 30 ./sbt clean coverage assembly
 scala:
-  - 2.12.8
+  - 2.12.10
 #after_success:
 #  - sbt coverageReport coveralls
 

diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ Requirements
 ------------
 
 1. [Kafka 0.8.*.* or 0.9.*.* or 0.10.*.* or 0.11.*.*](http://kafka.apache.org/downloads.html)
-2. Java 8+
+2. Java 11+
 
 Configuration
 -------------

diff --git a/app/kafka/manager/actor/cluster/KafkaStateActor.scala b/app/kafka/manager/actor/cluster/KafkaStateActor.scala
@@ -99,7 +99,7 @@ case class KafkaAdminClientActor(config: KafkaAdminClientActorConfig) extends Ba
     }.mkString(",")
     val props = new Properties()
     config.consumerProperties.foreach {
-      cp => props.putAll(cp)
+      cp => props.putAll(cp.asMap)
     }
     props.put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, config.clusterContext.config.securityProtocol.stringId)
     props.put(CommonClientConfigs.BOOTSTRAP_SERVERS_CONFIG, brokerListStr)
@@ -262,7 +262,7 @@ case class KafkaManagedOffsetCache(clusterContext: ClusterContext
     props.put(VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.ByteArrayDeserializer")
     props.put(AUTO_OFFSET_RESET_CONFIG, "latest")
     consumerProperties.foreach {
-      cp => props.putAll(cp)
+      cp => props.putAll(cp.asMap)
     }
     props.put(CommonClientConfigs.SECURITY_PROTOCOL_CONFIG, clusterContext.config.securityProtocol.stringId)
     if(clusterContext.config.saslMechanism.nonEmpty){

diff --git a/app/kafka/manager/package.scala b/app/kafka/manager/package.scala
@@ -27,4 +27,7 @@ package object manager {
     str.getBytes(StandardCharsets.UTF_8)
   }
 
+  implicit class PropertiesHelper(p: java.util.Properties) {
+    def asMap: java.util.Map[_, _] = p.asInstanceOf[java.util.Map[_, _]]
+  }
 }
diff --git a/app/kafka/manager/utils/logkafka81/LogConfig.scala b/app/kafka/manager/utils/logkafka81/LogConfig.scala
@@ -18,6 +18,7 @@
 package kafka.manager.utils.logkafka81
 
 import java.util.Properties
+import kafka.manager._
 import scala.util.matching.Regex
 import kafka.manager.utils.LogkafkaNewConfigs
 
@@ -173,7 +174,7 @@ object LogConfig extends LogkafkaNewConfigs {
    */
   def fromProps(defaults: Properties, overrides: Properties): LogConfig = {
     val props = new Properties(defaults)
-    props.putAll(overrides)
+    props.putAll(overrides.asMap)
     fromProps(props)
   }
 

diff --git a/app/kafka/manager/utils/logkafka82/LogConfig.scala b/app/kafka/manager/utils/logkafka82/LogConfig.scala
@@ -18,6 +18,7 @@
 package kafka.manager.utils.logkafka82
 
 import java.util.Properties
+import kafka.manager._
 import scala.util.matching.Regex
 import kafka.manager.utils.LogkafkaNewConfigs
 
@@ -173,7 +174,7 @@ object LogConfig extends LogkafkaNewConfigs {
    */
   def fromProps(defaults: Properties, overrides: Properties): LogConfig = {
     val props = new Properties(defaults)
-    props.putAll(overrides)
+    props.putAll(overrides.asMap)
     fromProps(props)
   }
 

diff --git a/app/kafka/manager/utils/zero10/LogConfig.scala b/app/kafka/manager/utils/zero10/LogConfig.scala
@@ -18,7 +18,7 @@
 package kafka.manager.utils.zero10
 
 import java.util.{Collections, Locale, Properties}
-
+import kafka.manager._
 import scala.collection.JavaConverters._
 import kafka.api.ApiVersion
 import kafka.manager.utils.TopicConfigs
@@ -309,8 +309,8 @@ object LogConfig extends TopicConfigs {
     */
   def fromProps(defaults: java.util.Map[_ <: Object, _ <: Object], overrides: Properties): LogConfig = {
     val props = new Properties()
-    props.putAll(defaults)
-    props.putAll(overrides)
+    props.putAll(defaults.asInstanceOf[java.util.Map[_,_]])
+    props.putAll(overrides.asMap)
     LogConfig(props)
   }
 

diff --git a/app/kafka/manager/utils/zero11/LogConfig.scala b/app/kafka/manager/utils/zero11/LogConfig.scala
@@ -18,7 +18,7 @@
 package kafka.manager.utils.zero11
 
 import java.util.{Collections, Locale, Properties}
-
+import kafka.manager._
 import scala.collection.JavaConverters._
 import kafka.api.ApiVersion
 import kafka.manager.utils.TopicConfigs
@@ -269,8 +269,8 @@ object LogConfig extends TopicConfigs {
     */
   def fromProps(defaults: java.util.Map[_ <: Object, _ <: Object], overrides: Properties): LogConfig = {
     val props = new Properties()
-    props.putAll(defaults)
-    props.putAll(overrides)
+    props.putAll(defaults.asInstanceOf[java.util.Map[_, _]])
+    props.putAll(overrides.asMap)
     LogConfig(props)
   }
 

diff --git a/app/kafka/manager/utils/zero81/LogConfig.scala b/app/kafka/manager/utils/zero81/LogConfig.scala
@@ -18,6 +18,7 @@
 package kafka.manager.utils.zero81
 
 import java.util.Properties
+import kafka.manager._
 
 import kafka.manager.utils.TopicConfigs
 
@@ -114,7 +115,7 @@ object LogConfig extends TopicConfigs {
    */
   def fromProps(defaults: Properties, overrides: Properties): LogConfig = {
     val props = new Properties(defaults)
-    props.putAll(overrides)
+    props.putAll(overrides.asMap)
     fromProps(props)
   }
 

diff --git a/app/kafka/manager/utils/zero82/LogConfig.scala b/app/kafka/manager/utils/zero82/LogConfig.scala
@@ -18,7 +18,7 @@
 package kafka.manager.utils.zero82
 
 import java.util.Properties
-
+import kafka.manager._
 import kafka.manager.utils.TopicConfigs
 
 /**
@@ -181,7 +181,7 @@ object LogConfig extends TopicConfigs {
    */
   def fromProps(defaults: Properties, overrides: Properties): LogConfig = {
     val props = new Properties(defaults)
-    props.putAll(overrides)
+    props.putAll(overrides.asMap)
     fromProps(props)
   }
 

diff --git a/app/kafka/manager/utils/zero90/LogConfig.scala b/app/kafka/manager/utils/zero90/LogConfig.scala
@@ -18,7 +18,7 @@
 package kafka.manager.utils.zero90
 
 import java.util.Properties
-
+import kafka.manager._
 import kafka.manager.utils.TopicConfigs
 import org.apache.kafka.common.utils.Utils
 import org.apache.kafka.common.config.{AbstractConfig, ConfigDef}
@@ -173,8 +173,8 @@ object LogConfig extends TopicConfigs {
     */
   def fromProps(defaults: java.util.Map[_ <: Object, _ <: Object], overrides: Properties): LogConfig = {
     val props = new Properties()
-    props.putAll(defaults)
-    props.putAll(overrides)
+    props.putAll(defaults.asInstanceOf[java.util.Map[_, _]])
+    props.putAll(overrides.asMap)
     LogConfig(props)
   }
 

diff --git a/build.sbt b/build.sbt
@@ -2,12 +2,12 @@
  * Copyright 2015 Yahoo Inc. Licensed under the Apache License, Version 2.0
  * See accompanying LICENSE file.
  */
-name := """kafka-manager"""
+name := """cmak"""
 
 /* For packaging purposes, -SNAPSHOT MUST contain a digit */
-version := "2.0.0.2"
+version := "3.0.0.0"
 
-scalaVersion := "2.12.8"
+scalaVersion := "2.12.10"
 
 scalacOptions ++= Seq("-Xlint:-missing-interpolator","-Xfatal-warnings","-deprecation","-feature","-language:implicitConversions","-language:postfixOps","-Xmax-classfile-name","240")
 
@@ -78,16 +78,16 @@ dockerfile in docker := {
   val zipFile: File = dist.value
 
   new Dockerfile {
-    from("openjdk:8-jre-slim")
+    from("openjdk:11-jre-slim")
     runRaw("apt-get update && apt-get install -y --no-install-recommends unzip")
-    add(zipFile, file("/opt/kafka-manager.zip"))
+    add(zipFile, file("/opt/cmak.zip"))
     workDir("/opt")
-    run("unzip", "kafka-manager.zip")
-    run("rm", "-f", "kafka-manager.zip")
+    run("unzip", "cmak.zip")
+    run("rm", "-f", "cmak.zip")
 
     expose(9000)
 
-    cmd(s"kafka-manager-${version.value}/bin/kafka-manager")
+    cmd(s"cmak-${version.value}/bin/cmak")
   }
 }
 
@@ -129,8 +129,8 @@ packageDescription := "A tool for managing Apache Kafka"
 
 rpmRelease := "1"
 rpmVendor := "yahoo"
-rpmUrl := Some("https://github.com/yahoo/kafka-manager")
+rpmUrl := Some("https://github.com/yahoo/cmak")
 rpmLicense := Some("Apache")
-rpmGroup := Some("kafka-manager")
+rpmGroup := Some("cmak")
 
 /* End RPM Settings */
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.8