This is an automated email from the ASF dual-hosted git repository.
twalthr 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 5c5e353 [FLINK-23497][table-planner] Add dependency for
scala-parser-combinators
5c5e353 is described below
commit 5c5e353b03bce6e073ef4482ee7ff7c47e0184c0
Author: Timo Walther <[email protected]>
AuthorDate: Tue Jul 27 14:55:40 2021 +0200
[FLINK-23497][table-planner] Add dependency for scala-parser-combinators
It is contained in Scala 2.11 but needs to be added explicitly for Scala
2.12.
This closes #16610.
---
.../test-scripts/test_table_shaded_dependencies.sh | 1 +
flink-table/flink-table-planner/pom.xml | 9 +++++++++
.../flink-table-planner/src/main/resources/META-INF/NOTICE | 1 +
3 files changed, 11 insertions(+)
diff --git
a/flink-end-to-end-tests/test-scripts/test_table_shaded_dependencies.sh
b/flink-end-to-end-tests/test-scripts/test_table_shaded_dependencies.sh
index 9e58637..18ebfc1 100755
--- a/flink-end-to-end-tests/test-scripts/test_table_shaded_dependencies.sh
+++ b/flink-end-to-end-tests/test-scripts/test_table_shaded_dependencies.sh
@@ -89,6 +89,7 @@ function checkAllowedPackages {
grep -v "org/apache/calcite" |\
grep -v "com/esri/core" |\
grep -v "com/ibm/icu" |\
+ grep -v "scala/util/parsing" |\
grep -v "org/apache/flink" > $CONTENTS_FILE
if [[ `cat $CONTENTS_FILE | wc -l` -eq '0' ]]; then
echo "Success: There are no unwanted classes in the ${JAR} jar."
diff --git a/flink-table/flink-table-planner/pom.xml
b/flink-table/flink-table-planner/pom.xml
index f636981..edba278 100644
--- a/flink-table/flink-table-planner/pom.xml
+++ b/flink-table/flink-table-planner/pom.xml
@@ -215,6 +215,12 @@ under the License.
<version>67.1</version>
</dependency>
+ <!-- For legacy string expressions in Table API -->
+ <dependency>
+ <groupId>org.scala-lang.modules</groupId>
+
<artifactId>scala-parser-combinators_${scala.binary.version}</artifactId>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.flink</groupId>
@@ -389,6 +395,9 @@ under the License.
<!--
Tools to unify display format for different languages -->
<include>com.ibm.icu:icu4j</include>
+ <!--
For legacy string expressions in Table API -->
+
<include>org.scala-lang.modules:scala-parser-combinators_${scala.binary.version}</include>
+
<include>org.reflections:reflections</include>
</includes>
</artifactSet>
diff --git a/flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE
b/flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE
index 8b7fb38..d8b8233 100644
--- a/flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE
+++ b/flink-table/flink-table-planner/src/main/resources/META-INF/NOTICE
@@ -16,6 +16,7 @@ This project bundles the following dependencies under the
Apache Software Licens
- org.apache.calcite:calcite-core:1.26.0
- org.apache.calcite:calcite-linq4j:1.26.0
- org.apache.calcite.avatica:avatica-core:1.17.0
+- org.scala-lang.modules:scala-parser-combinators_2.11:1.1.1
- commons-codec:commons-codec:1.13
- commons-io:commons-io:2.8.0
