diff --git a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java index a41ea0ce..a6ddae74 100644 --- a/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java +++ b/basic/kafka/src/main/java/org/springframework/integration/samples/kafka/Application.java @@ -1,5 +1,5 @@ /* - * Copyright 2015 the original author or authors. + * Copyright 2015-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ import java.util.Properties; import org.I0Itec.zkclient.ZkClient; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; +import org.apache.kafka.common.errors.TopicExistsException; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; @@ -53,7 +54,6 @@ import org.springframework.messaging.PollableChannel; import org.springframework.messaging.support.GenericMessage; import kafka.admin.AdminUtils; -import kafka.common.TopicExistsException; import kafka.utils.ZKStringSerializer$; import kafka.utils.ZkUtils; diff --git a/build.gradle b/build.gradle index 6edd6d4c..03a42275 100644 --- a/build.gradle +++ b/build.gradle @@ -196,12 +196,12 @@ subprojects { subproject -> postgresVersion = '9.1-901-1.jdbc4' subethasmtpVersion = '1.2' slf4jVersion = '1.7.11' - springIntegrationVersion = '4.3.10.RELEASE' + springIntegrationVersion = '4.3.11.RELEASE' springIntegrationDslVersion = '1.2.2.RELEASE' springIntegrationKafkaVersion = '2.1.0.RELEASE' springIntegrationSplunkVersion = '1.1.0.RELEASE' springKafkaVersion = '1.1.6.RELEASE' - springVersion = '4.3.9.RELEASE' + springVersion = '4.3.10.RELEASE' springSecurityVersion = '4.1.4.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1' diff --git a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java index a1e4ecff..06e8ebe4 100644 --- a/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java +++ b/dsl/kafka-dsl/src/main/java/org/springframework/integration/samples/dsl/kafka/Application.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 the original author or authors. + * Copyright 2016-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ import javax.annotation.PostConstruct; import org.I0Itec.zkclient.ZkClient; import org.apache.kafka.clients.consumer.ConsumerConfig; import org.apache.kafka.clients.producer.ProducerConfig; +import org.apache.kafka.common.errors.TopicExistsException; import org.apache.kafka.common.serialization.StringDeserializer; import org.apache.kafka.common.serialization.StringSerializer; @@ -46,7 +47,6 @@ import org.springframework.kafka.core.ProducerFactory; import org.springframework.messaging.Message; import kafka.admin.AdminUtils; -import kafka.common.TopicExistsException; import kafka.utils.ZKStringSerializer$; import kafka.utils.ZkUtils;