You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gr...@apache.org on 2017/12/22 19:12:27 UTC
[4/5] flink git commit: [hotfix] [build] Always include Kafka 0.11
connector
[hotfix] [build] Always include Kafka 0.11 connector
Now that Flink only supports builds for Scala 2.11+ we can
unconditionally enable the Kafka 0.11 connector.
This closes #5195
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/cc8f70b1
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/cc8f70b1
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/cc8f70b1
Branch: refs/heads/master
Commit: cc8f70b17aec29f9d92dd537402b4d1c15ad10a7
Parents: d3cd51a
Author: Greg Hogan <co...@greghogan.com>
Authored: Wed Dec 20 12:11:00 2017 -0500
Committer: Greg Hogan <co...@greghogan.com>
Committed: Thu Dec 21 11:46:27 2017 -0500
----------------------------------------------------------------------
flink-connectors/pom.xml | 13 +------------
tools/travis_mvn_watchdog.sh | 5 +----
2 files changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/cc8f70b1/flink-connectors/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/pom.xml b/flink-connectors/pom.xml
index e8dd7a8..6f048ca 100644
--- a/flink-connectors/pom.xml
+++ b/flink-connectors/pom.xml
@@ -45,6 +45,7 @@ under the License.
<module>flink-connector-kafka-0.8</module>
<module>flink-connector-kafka-0.9</module>
<module>flink-connector-kafka-0.10</module>
+ <module>flink-connector-kafka-0.11</module>
<module>flink-connector-elasticsearch-base</module>
<module>flink-connector-elasticsearch</module>
<module>flink-connector-elasticsearch2</module>
@@ -75,18 +76,6 @@ under the License.
<!-- See main pom.xml for explanation of profiles -->
<profiles>
- <!-- Kafka 0.11 does not support scala 2.10-->
- <profile>
- <id>scala-2.11</id>
- <activation>
- <property>
- <name>!scala-2.10</name>
- </property>
- </activation>
- <modules>
- <module>flink-connector-kafka-0.11</module>
- </modules>
- </profile>
<!--
We include the kinesis module only optionally because it contains a dependency
licenced under the "Amazon Software License".
http://git-wip-us.apache.org/repos/asf/flink/blob/cc8f70b1/tools/travis_mvn_watchdog.sh
----------------------------------------------------------------------
diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh
index 42f7ae3..036ad29 100755
--- a/tools/travis_mvn_watchdog.sh
+++ b/tools/travis_mvn_watchdog.sh
@@ -91,6 +91,7 @@ flink-connectors/flink-connector-filesystem,\
flink-connectors/flink-connector-kafka-0.8,\
flink-connectors/flink-connector-kafka-0.9,\
flink-connectors/flink-connector-kafka-0.10,\
+flink-connectors/flink-connector-kafka-0.11,\
flink-connectors/flink-connector-kafka-base,\
flink-connectors/flink-connector-nifi,\
flink-connectors/flink-connector-rabbitmq,\
@@ -99,10 +100,6 @@ flink-connectors/flink-connector-twitter"
MODULES_TESTS="\
flink-tests"
-if [[ $PROFILE != *"scala-2.10"* ]]; then
- MODULES_CONNECTORS="$MODULES_CONNECTORS,flink-connectors/flink-connector-kafka-0.11"
-fi
-
if [[ $PROFILE == *"include-kinesis"* ]]; then
case $TEST in
(connectors)