[FLINK-7303] [build] Build elasticsearch5 by default This closes #4426.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/3ed18ed1 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/3ed18ed1 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/3ed18ed1 Branch: refs/heads/master Commit: 3ed18ed11b331193d350000580c9f7aa2b588073 Parents: 32bc67e Author: zentol <[email protected]> Authored: Mon Jul 31 12:16:05 2017 +0200 Committer: zentol <[email protected]> Committed: Wed Aug 2 14:46:15 2017 +0200 ---------------------------------------------------------------------- flink-connectors/pom.xml | 15 +-------------- tools/travis_mvn_watchdog.sh | 9 +-------- 2 files changed, 2 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/3ed18ed1/flink-connectors/pom.xml ---------------------------------------------------------------------- diff --git a/flink-connectors/pom.xml b/flink-connectors/pom.xml index 5af85b8..bc3f82f 100644 --- a/flink-connectors/pom.xml +++ b/flink-connectors/pom.xml @@ -48,6 +48,7 @@ under the License. <module>flink-connector-elasticsearch-base</module> <module>flink-connector-elasticsearch</module> <module>flink-connector-elasticsearch2</module> + <module>flink-connector-elasticsearch5</module> <module>flink-connector-rabbitmq</module> <module>flink-connector-twitter</module> <module>flink-connector-nifi</module> @@ -86,20 +87,6 @@ under the License. <module>flink-connector-kinesis</module> </modules> </profile> - - <!-- - Since Elasticsearch 5.x requires Java 8 at a minimum, we use this profile - to include it as part of Java 8 builds only. - --> - <profile> - <id>include-elasticsearch5</id> - <activation> - <jdk>1.8</jdk> - </activation> - <modules> - <module>flink-connector-elasticsearch5</module> - </modules> - </profile> </profiles> </project> http://git-wip-us.apache.org/repos/asf/flink/blob/3ed18ed1/tools/travis_mvn_watchdog.sh ---------------------------------------------------------------------- diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh index c36cecf..a623798 100755 --- a/tools/travis_mvn_watchdog.sh +++ b/tools/travis_mvn_watchdog.sh @@ -79,6 +79,7 @@ flink-connectors/flink-jdbc,\ flink-connectors/flink-connector-cassandra,\ flink-connectors/flink-connector-elasticsearch,\ flink-connectors/flink-connector-elasticsearch2,\ +flink-connectors/flink-connector-elasticsearch5,\ flink-connectors/flink-connector-elasticsearch-base,\ flink-connectors/flink-connector-filesystem,\ flink-connectors/flink-connector-kafka-0.8,\ @@ -92,14 +93,6 @@ flink-connectors/flink-connector-twitter" MODULES_TESTS="\ flink-tests" -if [[ $PROFILE == *"jdk8"* ]]; then - case $TEST in - (connectors) - MODULES_CONNECTORS="$MODULES_CONNECTORS,flink-connectors/flink-connector-elasticsearch5" - ;; - esac -fi - if [[ $PROFILE == *"include-kinesis"* ]]; then case $TEST in (connectors)
