You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2018/05/29 11:19:15 UTC
[4/6] flink git commit: [FLINK-7850][build] Add activation property
to maven profiles
[FLINK-7850][build] Add activation property to maven profiles
This closes #5840.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/950fc03f
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/950fc03f
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/950fc03f
Branch: refs/heads/master
Commit: 950fc03f73eb0db1277950da433141c42acc00c1
Parents: 0861a78
Author: kai-chi <ka...@gmail.com>
Authored: Thu Apr 12 16:08:26 2018 +0200
Committer: zentol <ch...@apache.org>
Committed: Tue May 29 09:33:50 2018 +0200
----------------------------------------------------------------------
.../flink-connector-kafka-0.11/pom.xml | 5 +++++
flink-connectors/flink-hbase/pom.xml | 5 +++++
flink-connectors/pom.xml | 5 +++++
flink-formats/flink-json/pom.xml | 5 +++++
flink-libraries/flink-ml/pom.xml | 6 ++++++
flink-libraries/flink-python/pom.xml | 5 +++++
.../flink-shaded-hadoop2/pom.xml | 5 +++++
pom.xml | 20 ++++++++++++++++++++
tools/force-shading/pom.xml | 5 +++++
9 files changed, 61 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/950fc03f/flink-connectors/flink-connector-kafka-0.11/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-0.11/pom.xml b/flink-connectors/flink-connector-kafka-0.11/pom.xml
index 8b40439..aa60004 100644
--- a/flink-connectors/flink-connector-kafka-0.11/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.11/pom.xml
@@ -215,6 +215,11 @@ under the License.
<profile>
<!-- Create SQL Client uber jars for releases -->
<id>release</id>
+ <activation>
+ <property>
+ <name>release</name>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/flink/blob/950fc03f/flink-connectors/flink-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-hbase/pom.xml b/flink-connectors/flink-hbase/pom.xml
index 313c0e6..15774c8 100644
--- a/flink-connectors/flink-hbase/pom.xml
+++ b/flink-connectors/flink-hbase/pom.xml
@@ -300,6 +300,11 @@ under the License.
<profiles>
<profile>
<id>cdh5.1.3</id>
+ <activation>
+ <property>
+ <name>cdh5.1.3</name>
+ </property>
+ </activation>
<properties>
<hbase.version>0.98.1-cdh5.1.3</hbase.version>
<hadoop.version>2.3.0-cdh5.1.3</hadoop.version>
http://git-wip-us.apache.org/repos/asf/flink/blob/950fc03f/flink-connectors/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/pom.xml b/flink-connectors/pom.xml
index bb98403..782d2be 100644
--- a/flink-connectors/pom.xml
+++ b/flink-connectors/pom.xml
@@ -89,6 +89,11 @@ under the License.
-->
<profile>
<id>include-kinesis</id>
+ <activation>
+ <property>
+ <name>include-kinesis</name>
+ </property>
+ </activation>
<modules>
<module>flink-connector-kinesis</module>
</modules>
http://git-wip-us.apache.org/repos/asf/flink/blob/950fc03f/flink-formats/flink-json/pom.xml
----------------------------------------------------------------------
diff --git a/flink-formats/flink-json/pom.xml b/flink-formats/flink-json/pom.xml
index 2c8db2d..defa004 100644
--- a/flink-formats/flink-json/pom.xml
+++ b/flink-formats/flink-json/pom.xml
@@ -91,6 +91,11 @@ under the License.
<profile>
<!-- Create SQL Client uber jars for releases -->
<id>release</id>
+ <activation>
+ <property>
+ <name>release</name>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/flink/blob/950fc03f/flink-libraries/flink-ml/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-ml/pom.xml b/flink-libraries/flink-ml/pom.xml
index aca2561..157124a 100644
--- a/flink-libraries/flink-ml/pom.xml
+++ b/flink-libraries/flink-ml/pom.xml
@@ -113,6 +113,9 @@
<profile>
<id>windows</id>
<activation>
+ <property>
+ <name>windows</name>
+ </property>
<os>
<family>windows</family>
</os>
@@ -126,6 +129,9 @@
<id>default</id>
<activation>
<activeByDefault>true</activeByDefault>
+ <property>
+ <name>default</name>
+ </property>
</activation>
<properties>
<suffix.test>(?<!(IT|Integration))(Test|Suite|Case)</suffix.test>
http://git-wip-us.apache.org/repos/asf/flink/blob/950fc03f/flink-libraries/flink-python/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-python/pom.xml b/flink-libraries/flink-python/pom.xml
index 30ba11a..3fd866b 100644
--- a/flink-libraries/flink-python/pom.xml
+++ b/flink-libraries/flink-python/pom.xml
@@ -88,6 +88,11 @@ under the License.
<profiles>
<profile>
<id>generate-config-docs</id>
+ <activation>
+ <property>
+ <name>generate-config-docs</name>
+ </property>
+ </activation>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/flink/blob/950fc03f/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
index 1c195d4..7a565ff 100644
--- a/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
+++ b/flink-shaded-hadoop/flink-shaded-hadoop2/pom.xml
@@ -668,6 +668,11 @@ under the License.
<profile>
<!-- MapR build profile -->
<id>mapr</id>
+ <activation>
+ <property>
+ <name>mapr</name>
+ </property>
+ </activation>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/flink/blob/950fc03f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5a5ad5c..cf4a256 100644
--- a/pom.xml
+++ b/pom.xml
@@ -782,6 +782,11 @@ under the License.
<profile>
<id>vendor-repos</id>
+ <activation>
+ <property>
+ <name>vendor-repos</name>
+ </property>
+ </activation>
<!-- Add vendor maven repositories -->
<repositories>
<!-- Cloudera -->
@@ -826,6 +831,11 @@ under the License.
to be able to locate the MapR Hadoop / Zookeeper dependencies.
-->
<id>mapr</id>
+ <activation>
+ <property>
+ <name>mapr</name>
+ </property>
+ </activation>
<!--
use MapR Hadoop / Zookeeper dependencies appropriate for MapR 5.2.0;
@@ -866,6 +876,11 @@ under the License.
<profile>
<!-- used for SNAPSHOT and regular releases -->
<id>docs-and-source</id>
+ <activation>
+ <property>
+ <name>docs-and-source</name>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>
@@ -918,6 +933,11 @@ under the License.
<profile>
<id>release</id>
+ <activation>
+ <property>
+ <name>release</name>
+ </property>
+ </activation>
<properties>
<java.version>1.8</java.version>
</properties>
http://git-wip-us.apache.org/repos/asf/flink/blob/950fc03f/tools/force-shading/pom.xml
----------------------------------------------------------------------
diff --git a/tools/force-shading/pom.xml b/tools/force-shading/pom.xml
index eefed0c..ad322c5 100644
--- a/tools/force-shading/pom.xml
+++ b/tools/force-shading/pom.xml
@@ -45,6 +45,11 @@ under the License.
<profiles>
<profile>
<id>release</id>
+ <activation>
+ <property>
+ <name>release</name>
+ </property>
+ </activation>
<build>
<plugins>
<plugin>