Return-Path: <commits-return-13681-archive-asf-public=cust-asf.ponee.io@flink.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id DB58C200CE7
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed,  2 Aug 2017 14:46:55 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id D9F151695BD; Wed,  2 Aug 2017 12:46:55 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 3368E1695C3
	for <archive-asf-public@cust-asf.ponee.io>; Wed,  2 Aug 2017 14:46:55 +0200 (CEST)
Received: (qmail 16585 invoked by uid 500); 2 Aug 2017 12:46:54 -0000
Mailing-List: contact commits-help@flink.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flink.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flink.apache.org>
List-Post: <mailto:commits@flink.apache.org>
List-Id: <commits.flink.apache.org>
Reply-To: dev@flink.apache.org
Delivered-To: mailing list commits@flink.apache.org
Received: (qmail 16530 invoked by uid 99); 2 Aug 2017 12:46:53 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Aug 2017 12:46:53 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id AE3C6F3329; Wed,  2 Aug 2017 12:46:52 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: chesnay@apache.org
To: commits@flink.apache.org
Date: Wed, 02 Aug 2017 12:46:54 -0000
Message-Id: <9bea73cff32c484897368b72430aafc0@git.apache.org>
In-Reply-To: <95978bdc975f427bb54e29fc0d4f3498@git.apache.org>
References: <95978bdc975f427bb54e29fc0d4f3498@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [3/7] flink git commit: [FLINK-7303] [build] Build elasticsearch5 by
 default
archived-at: Wed, 02 Aug 2017 12:46:56 -0000

[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 <chesnay@apache.org>
Authored: Mon Jul 31 12:16:05 2017 +0200
Committer: zentol <chesnay@apache.org>
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)