Skip to content

Commit

Permalink
[FLINK-23497][table-planner] Add dependency for scala-parser-combinators
Browse files Browse the repository at this point in the history
It is contained in Scala 2.11 but needs to be added explicitly for Scala 2.12.

This closes #16610.
  • Loading branch information
twalthr committed Jul 28, 2021
1 parent 47446cd commit 5c5e353
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
9 changes: 9 additions & 0 deletions flink-table/flink-table-planner/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 5c5e353

Please sign in to comment.