Skip to content

Commit

Permalink
[FLINK-7303] [build] Build elasticsearch5 by default
Browse files Browse the repository at this point in the history
This closes apache#4426.
  • Loading branch information
zentol committed Aug 2, 2017
1 parent 32bc67e commit 3ed18ed
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 22 deletions.
15 changes: 1 addition & 14 deletions flink-connectors/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
9 changes: 1 addition & 8 deletions tools/travis_mvn_watchdog.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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,\
Expand All @@ -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)
Expand Down

0 comments on commit 3ed18ed

Please sign in to comment.