kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ij...@apache.org
Subject [kafka] branch trunk updated: Upgrade ZooKeeper to 3.4.12 and Scala to 2.12.6 (#4940)
Date Thu, 03 May 2018 16:25:40 GMT
This is an automated email from the ASF dual-hosted git repository.

ijuma pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 55cdc93  Upgrade ZooKeeper to 3.4.12 and Scala to 2.12.6 (#4940)
55cdc93 is described below

commit 55cdc934fb0e3bb184dc3fe3072acc918a0b1174
Author: Ismael Juma <ismael@juma.me.uk>
AuthorDate: Thu May 3 09:25:33 2018 -0700

    Upgrade ZooKeeper to 3.4.12 and Scala to 2.12.6 (#4940)
    
    Reviewers: Jun Rao <junrao@gmail.com>
---
 core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala     | 3 +--
 core/src/test/scala/unit/kafka/zookeeper/ZooKeeperClientTest.scala | 3 +--
 gradle/dependencies.gradle                                         | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala b/core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala
index 5e33816..596c353 100755
--- a/core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala
+++ b/core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala
@@ -23,7 +23,6 @@ import kafka.utils.TestUtils._
 import kafka.api.FetchRequestBuilder
 import kafka.message.ByteBufferMessageSet
 import java.io.File
-import java.net.UnknownHostException
 
 import kafka.log.LogManager
 import org.apache.kafka.clients.producer.{KafkaProducer, ProducerRecord}
@@ -131,7 +130,7 @@ class ServerShutdownTest extends ZooKeeperTestHarness {
     val newProps = TestUtils.createBrokerConfig(0, zkConnect)
     newProps.setProperty("zookeeper.connect", "some.invalid.hostname.foo.bar.local:65535")
     val newConfig = KafkaConfig.fromProps(newProps)
-    verifyCleanShutdownAfterFailedStartup[UnknownHostException](newConfig)
+    verifyCleanShutdownAfterFailedStartup[IllegalArgumentException](newConfig)
   }
 
   @Test
diff --git a/core/src/test/scala/unit/kafka/zookeeper/ZooKeeperClientTest.scala b/core/src/test/scala/unit/kafka/zookeeper/ZooKeeperClientTest.scala
index 4eb9e67..77e11ea 100644
--- a/core/src/test/scala/unit/kafka/zookeeper/ZooKeeperClientTest.scala
+++ b/core/src/test/scala/unit/kafka/zookeeper/ZooKeeperClientTest.scala
@@ -16,7 +16,6 @@
  */
 package kafka.zookeeper
 
-import java.net.UnknownHostException
 import java.nio.charset.StandardCharsets
 import java.util.UUID
 import java.util.concurrent.atomic.AtomicBoolean
@@ -58,7 +57,7 @@ class ZooKeeperClientTest extends ZooKeeperTestHarness {
     System.clearProperty(JaasUtils.JAVA_LOGIN_CONFIG_PARAM)
   }
 
-  @Test(expected = classOf[UnknownHostException])
+  @Test(expected = classOf[IllegalArgumentException])
   def testUnresolvableConnectString(): Unit = {
     new ZooKeeperClient("some.invalid.hostname.foo.bar.local", -1, -1, Int.MaxValue, time,
"testMetricGroup",
       "testMetricType").close()
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 56abe88..db056b7 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -30,7 +30,7 @@ ext {
 
 // Add Scala version
 def defaultScala211Version = '2.11.12'
-def defaultScala212Version = '2.12.4'
+def defaultScala212Version = '2.12.6'
 if (hasProperty('scalaVersion')) {
   if (scalaVersion == '2.11') {
     versions["scala"] = defaultScala211Version
@@ -81,7 +81,7 @@ versions += [
   slf4j: "1.7.25",
   snappy: "1.1.7.1",
   zkclient: "0.10",
-  zookeeper: "3.4.10"
+  zookeeper: "3.4.12"
 ]
 
 libs += [

-- 
To stop receiving notification emails like this one, please contact
ijuma@apache.org.

Mime
View raw message