You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ji...@apache.org on 2019/07/12 01:22:25 UTC
[flink] branch master updated: [FLINK-12602][travis] Correct the flink pom `artifactId` config and s… (#8563)
This is an automated email from the ASF dual-hosted git repository.
jincheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 5762170 [FLINK-12602][travis] Correct the flink pom `artifactId` config and s… (#8563)
5762170 is described below
commit 57621703b7342442f3a0ec62315ce1cefa0a8287
Author: Jincheng Sun <ji...@apache.org>
AuthorDate: Fri Jul 12 09:22:03 2019 +0800
[FLINK-12602][travis] Correct the flink pom `artifactId` config and s… (#8563)
Brief change log:
- remove the scala version suffix for connector-hive and queryable-state-client-java
- add the scala dependencies for table-api-scala and flink-sql-connectors
- correct the scala-free check logic in `verify_scala_suffixes.sh`
---
docs/dev/stream/state/queryable_state.md | 2 +-
docs/dev/stream/state/queryable_state.zh.md | 2 +-
flink-connectors/flink-connector-cassandra/pom.xml | 2 +-
flink-connectors/flink-connector-filesystem/pom.xml | 2 +-
flink-connectors/flink-connector-kafka-0.10/pom.xml | 2 +-
flink-connectors/flink-connector-kafka-0.11/pom.xml | 2 +-
flink-connectors/flink-connector-kafka-0.8/pom.xml | 2 +-
flink-connectors/flink-connector-kafka-0.9/pom.xml | 2 +-
flink-connectors/flink-connector-kafka-base/pom.xml | 2 +-
flink-connectors/flink-connector-kafka/pom.xml | 2 +-
flink-connectors/flink-connector-kinesis/pom.xml | 2 +-
flink-connectors/flink-connector-nifi/pom.xml | 2 +-
flink-end-to-end-tests/flink-queryable-state-test/pom.xml | 2 +-
flink-fs-tests/pom.xml | 2 +-
flink-libraries/flink-cep-scala/pom.xml | 2 +-
flink-libraries/flink-gelly-examples/pom.xml | 2 +-
flink-libraries/flink-gelly-scala/pom.xml | 2 +-
flink-libraries/flink-state-processing-api/pom.xml | 2 +-
flink-queryable-state/flink-queryable-state-client-java/pom.xml | 2 +-
flink-queryable-state/flink-queryable-state-runtime/pom.xml | 2 +-
flink-runtime/pom.xml | 2 +-
flink-streaming-scala/pom.xml | 2 +-
flink-table/flink-table-api-scala/pom.xml | 9 ++++++++-
flink-table/flink-table-planner/pom.xml | 2 +-
flink-tests/pom.xml | 2 +-
flink-yarn-tests/pom.xml | 2 +-
tools/verify_scala_suffixes.sh | 6 +++---
27 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/docs/dev/stream/state/queryable_state.md b/docs/dev/stream/state/queryable_state.md
index fb14cb4..ee6b4be 100644
--- a/docs/dev/stream/state/queryable_state.md
+++ b/docs/dev/stream/state/queryable_state.md
@@ -174,7 +174,7 @@ jar which must be explicitly included as a dependency in the `pom.xml` of your p
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-queryable-state-client-java{{ site.scala_version_suffix }}</artifactId>
+ <artifactId>flink-queryable-state-client-java</artifactId>
<version>{{ site.version }}</version>
</dependency>
{% endhighlight %}
diff --git a/docs/dev/stream/state/queryable_state.zh.md b/docs/dev/stream/state/queryable_state.zh.md
index c9a16c4..a101110 100644
--- a/docs/dev/stream/state/queryable_state.zh.md
+++ b/docs/dev/stream/state/queryable_state.zh.md
@@ -174,7 +174,7 @@ jar which must be explicitly included as a dependency in the `pom.xml` of your p
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-queryable-state-client-java{{ site.scala_version_suffix }}</artifactId>
+ <artifactId>flink-queryable-state-client-java</artifactId>
<version>{{ site.version }}</version>
</dependency>
{% endhighlight %}
diff --git a/flink-connectors/flink-connector-cassandra/pom.xml b/flink-connectors/flink-connector-cassandra/pom.xml
index 0218d6e..6338b18 100644
--- a/flink-connectors/flink-connector-cassandra/pom.xml
+++ b/flink-connectors/flink-connector-cassandra/pom.xml
@@ -211,7 +211,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/flink-connectors/flink-connector-filesystem/pom.xml b/flink-connectors/flink-connector-filesystem/pom.xml
index 0202986..d6af8f3 100644
--- a/flink-connectors/flink-connector-filesystem/pom.xml
+++ b/flink-connectors/flink-connector-filesystem/pom.xml
@@ -99,7 +99,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
diff --git a/flink-connectors/flink-connector-kafka-0.10/pom.xml b/flink-connectors/flink-connector-kafka-0.10/pom.xml
index e65a22e..4b18c8f 100644
--- a/flink-connectors/flink-connector-kafka-0.10/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.10/pom.xml
@@ -145,7 +145,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connectors/flink-connector-kafka-0.11/pom.xml b/flink-connectors/flink-connector-kafka-0.11/pom.xml
index e984dce..8c69539 100644
--- a/flink-connectors/flink-connector-kafka-0.11/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.11/pom.xml
@@ -153,7 +153,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connectors/flink-connector-kafka-0.8/pom.xml b/flink-connectors/flink-connector-kafka-0.8/pom.xml
index 1770a9b..3b63498 100644
--- a/flink-connectors/flink-connector-kafka-0.8/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.8/pom.xml
@@ -183,7 +183,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connectors/flink-connector-kafka-0.9/pom.xml b/flink-connectors/flink-connector-kafka-0.9/pom.xml
index 13dbde9..fceb1c3 100644
--- a/flink-connectors/flink-connector-kafka-0.9/pom.xml
+++ b/flink-connectors/flink-connector-kafka-0.9/pom.xml
@@ -125,7 +125,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connectors/flink-connector-kafka-base/pom.xml b/flink-connectors/flink-connector-kafka-base/pom.xml
index b9396f2..f8ea29f 100644
--- a/flink-connectors/flink-connector-kafka-base/pom.xml
+++ b/flink-connectors/flink-connector-kafka-base/pom.xml
@@ -168,7 +168,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connectors/flink-connector-kafka/pom.xml b/flink-connectors/flink-connector-kafka/pom.xml
index 5540f82..4ca4aa0 100644
--- a/flink-connectors/flink-connector-kafka/pom.xml
+++ b/flink-connectors/flink-connector-kafka/pom.xml
@@ -136,7 +136,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-connectors/flink-connector-kinesis/pom.xml b/flink-connectors/flink-connector-kinesis/pom.xml
index 6218692..fcb9818 100644
--- a/flink-connectors/flink-connector-kinesis/pom.xml
+++ b/flink-connectors/flink-connector-kinesis/pom.xml
@@ -66,7 +66,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
diff --git a/flink-connectors/flink-connector-nifi/pom.xml b/flink-connectors/flink-connector-nifi/pom.xml
index 38c08fc..2b1f439 100644
--- a/flink-connectors/flink-connector-nifi/pom.xml
+++ b/flink-connectors/flink-connector-nifi/pom.xml
@@ -61,7 +61,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/flink-end-to-end-tests/flink-queryable-state-test/pom.xml b/flink-end-to-end-tests/flink-queryable-state-test/pom.xml
index 4ff6676..bc72df7 100644
--- a/flink-end-to-end-tests/flink-queryable-state-test/pom.xml
+++ b/flink-end-to-end-tests/flink-queryable-state-test/pom.xml
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-queryable-state-client-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-queryable-state-client-java</artifactId>
<version>${project.version}</version>
<!-- compile scope since it is used by the client jar -->
</dependency>
diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml
index e5e3916..f7a845e 100644
--- a/flink-fs-tests/pom.xml
+++ b/flink-fs-tests/pom.xml
@@ -27,7 +27,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-fs-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-fs-tests</artifactId>
<name>flink-fs-tests</name>
<packaging>jar</packaging>
diff --git a/flink-libraries/flink-cep-scala/pom.xml b/flink-libraries/flink-cep-scala/pom.xml
index 3d1792b..e19735f 100644
--- a/flink-libraries/flink-cep-scala/pom.xml
+++ b/flink-libraries/flink-cep-scala/pom.xml
@@ -82,7 +82,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
diff --git a/flink-libraries/flink-gelly-examples/pom.xml b/flink-libraries/flink-gelly-examples/pom.xml
index f7045e6..5eca560 100644
--- a/flink-libraries/flink-gelly-examples/pom.xml
+++ b/flink-libraries/flink-gelly-examples/pom.xml
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/flink-libraries/flink-gelly-scala/pom.xml b/flink-libraries/flink-gelly-scala/pom.xml
index 34e3a2a..d679ad0 100644
--- a/flink-libraries/flink-gelly-scala/pom.xml
+++ b/flink-libraries/flink-gelly-scala/pom.xml
@@ -80,7 +80,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
diff --git a/flink-libraries/flink-state-processing-api/pom.xml b/flink-libraries/flink-state-processing-api/pom.xml
index 41b3340..f136017 100644
--- a/flink-libraries/flink-state-processing-api/pom.xml
+++ b/flink-libraries/flink-state-processing-api/pom.xml
@@ -78,7 +78,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-queryable-state/flink-queryable-state-client-java/pom.xml b/flink-queryable-state/flink-queryable-state-client-java/pom.xml
index 1c9d753..3b28707 100644
--- a/flink-queryable-state/flink-queryable-state-client-java/pom.xml
+++ b/flink-queryable-state/flink-queryable-state-client-java/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-queryable-state-client-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-queryable-state-client-java</artifactId>
<name>flink-queryable-state-client-java</name>
<packaging>jar</packaging>
diff --git a/flink-queryable-state/flink-queryable-state-runtime/pom.xml b/flink-queryable-state/flink-queryable-state-runtime/pom.xml
index e32b936..fdadf9f 100644
--- a/flink-queryable-state/flink-queryable-state-runtime/pom.xml
+++ b/flink-queryable-state/flink-queryable-state-runtime/pom.xml
@@ -54,7 +54,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-queryable-state-client-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-queryable-state-client-java</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index 6691ea7..b97e1db 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -52,7 +52,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-queryable-state-client-java_${scala.binary.version}</artifactId>
+ <artifactId>flink-queryable-state-client-java</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/flink-streaming-scala/pom.xml b/flink-streaming-scala/pom.xml
index 249ae7b..489592f 100644
--- a/flink-streaming-scala/pom.xml
+++ b/flink-streaming-scala/pom.xml
@@ -93,7 +93,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
diff --git a/flink-table/flink-table-api-scala/pom.xml b/flink-table/flink-table-api-scala/pom.xml
index 37a1bcf..b16a5d1 100644
--- a/flink-table/flink-table-api-scala/pom.xml
+++ b/flink-table/flink-table-api-scala/pom.xml
@@ -48,12 +48,19 @@ under the License.
<artifactId>flink-table-api-java</artifactId>
<version>${project.version}</version>
</dependency>
-
<!-- External dependencies -->
<dependency>
<groupId>org.scala-lang</groupId>
+ <artifactId>scala-reflect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-compiler</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/flink-table/flink-table-planner/pom.xml b/flink-table/flink-table-planner/pom.xml
index 450c989..f63bb2b 100644
--- a/flink-table/flink-table-planner/pom.xml
+++ b/flink-table/flink-table-planner/pom.xml
@@ -230,7 +230,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
index b749dc1..d3e6a49 100644
--- a/flink-tests/pom.xml
+++ b/flink-tests/pom.xml
@@ -30,7 +30,7 @@ under the License.
<relativePath>..</relativePath>
</parent>
- <artifactId>flink-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-tests</artifactId>
<name>flink-tests</name>
<packaging>jar</packaging>
diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml
index 0ae8333..6c0b2cb 100644
--- a/flink-yarn-tests/pom.xml
+++ b/flink-yarn-tests/pom.xml
@@ -33,7 +33,7 @@ under the License.
We need the YARN fat jar build by flink-dist for the tests.
-->
- <artifactId>flink-yarn-tests_${scala.binary.version}</artifactId>
+ <artifactId>flink-yarn-tests</artifactId>
<name>flink-yarn-tests</name>
<packaging>jar</packaging>
diff --git a/tools/verify_scala_suffixes.sh b/tools/verify_scala_suffixes.sh
index 2123ab1..0b021fd 100755
--- a/tools/verify_scala_suffixes.sh
+++ b/tools/verify_scala_suffixes.sh
@@ -110,14 +110,14 @@ while read line; do
block_name=""
block_infected=0
elif [[ $in_block -eq 1 ]]; then
- echo $line | grep "org.scala-lang" | grep --invert-match "org.scala-lang.*:.*:.*:test" >/dev/null
+ echo $line | grep -E "org.scala-lang|- [^:]+:[^:]+_2\.1[0-9]" | grep --invert-match "org.scala-lang.*:.*:.*:test" | grep --invert-match "[^:]*:[^:]*_2\.1[0-9]:.*:.*:test" >/dev/null
if [ $? -eq 0 ]; then
#echo $block_name
infected="$block_name $infected"
block_infected=1
fi
fi
-done < <(mvn -nsu dependency:tree -Dincludes=org.scala-lang -pl ${excluded_modules} ${MAVEN_ARGUMENTS} | tee /dev/tty)
+done < <(mvn -nsu dependency:tree -Dincludes=org.scala-lang,:*_2.1*:: -pl ${excluded_modules} ${MAVEN_ARGUMENTS} | tee /dev/tty)
# deduplicate and sort
@@ -141,7 +141,7 @@ echo
echo "Checking Scala-free modules:"
for module in $clean; do
- out=`find . -maxdepth 3 -name 'pom.xml' -not -path '*target*' -exec grep "${module}_\d\+\.\d\+</artifactId>" "{}" \;`
+ out=`find . -maxdepth 3 -name 'pom.xml' -not -path '*target*' -exec grep "${module}_\\${scala.binary.version}</artifactId>" "{}" \;`
if [[ "$out" == "" ]]; then
printf "$GREEN OK $NC $module\n"
else