Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MINOR: Revert to ZooKeeper 3.4.10 due to ZOOKEEPER-2960 #4678

Merged
merged 1 commit into from
Mar 12, 2018
Merged

MINOR: Revert to ZooKeeper 3.4.10 due to ZOOKEEPER-2960 #4678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/src/test/scala/unit/kafka/server/ServerShutdownTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ 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}
Expand Down Expand Up @@ -130,7 +131,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[IllegalArgumentException](newConfig)
verifyCleanShutdownAfterFailedStartup[UnknownHostException](newConfig)
}

@Test
Expand Down
3 changes: 2 additions & 1 deletion core/src/test/scala/unit/kafka/zookeeper/ZooKeeperClientTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package kafka.zookeeper

import java.net.UnknownHostException
import java.nio.charset.StandardCharsets
import java.util.UUID
import java.util.concurrent.atomic.AtomicBoolean
Expand Down Expand Up @@ -57,7 +58,7 @@ class ZooKeeperClientTest extends ZooKeeperTestHarness {
System.clearProperty(JaasUtils.JAVA_LOGIN_CONFIG_PARAM)
}

@Test(expected = classOf[IllegalArgumentException])
@Test(expected = classOf[UnknownHostException])
def testUnresolvableConnectString(): Unit = {
new ZooKeeperClient("some.invalid.hostname.foo.bar.local", -1, -1, Int.MaxValue, time, "testMetricGroup",
"testMetricType").close()
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ versions += [
slf4j: "1.7.25",
snappy: "1.1.7.1",
zkclient: "0.10",
zookeeper: "3.4.11",
zookeeper: "3.4.10",
jfreechart: "1.0.0",
mavenArtifact: "3.5.2"
]
Expand Down