root
/
kafka
mirror of https://github.com/apache/kafka.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Upgrade ZooKeeper to 3.4.12 and Scala to 2.12.6 (#4940) 

Reviewers: Jun Rao <junrao@gmail.com>
This commit is contained in:
Ismael Juma 2018-05-03 09:25:33 -07:00 committed by GitHub
parent 04a70bd3fe
commit 55cdc934fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala
View File

@ -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

3
core/src/test/scala/unit/kafka/zookeeper/ZooKeeperClientTest.scala
View File

@ -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()

4
gradle/dependencies.gradle
View File

@ -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 += [