Skip to content

Commit

Permalink
[hotfix] [build] Always include Kafka 0.11 connector
Browse files Browse the repository at this point in the history
Now that Flink only supports builds for Scala 2.11+ we can
unconditionally enable the Kafka 0.11 connector.

This closes apache#5195
  • Loading branch information
greghogan committed Dec 21, 2017
1 parent d3cd51a commit cc8f70b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
13 changes: 1 addition & 12 deletions flink-connectors/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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".
Expand Down
5 changes: 1 addition & 4 deletions tools/travis_mvn_watchdog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand All @@ -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)
Expand Down

0 comments on commit cc8f70b

Please sign in to comment.