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
commit 1c7ca7cb5192be0a2d2ea358ed08b34f2cbd597c
Author: Sergey Nuyanzin <snuyan...@gmail.com>
AuthorDate: Tue Jun 27 16:45:41 2023 +0200
[hotfix][sql-client] Apply same relocation rules for flink-sql-parser as in
flink-table-planner
---
flink-table/flink-sql-client/pom.xml | 19 +++++++++++++++++++
flink-table/flink-sql-jdbc-driver/pom.xml | 6 ------
flink-table/flink-table-planner/pom.xml | 1 +
3 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/flink-table/flink-sql-client/pom.xml
b/flink-table/flink-sql-client/pom.xml
index f4d8093c1a1..1ebbe966b31 100644
--- a/flink-table/flink-sql-client/pom.xml
+++ b/flink-table/flink-sql-client/pom.xml
@@ -256,6 +256,25 @@ under the License.
<include>org.apache.flink:flink-sql-parser</include>
</includes>
</artifactSet>
+ <!-- Keep it in sync
with table-planner -->
+ <relocations>
+ <relocation>
+
<pattern>com.google</pattern>
+
<shadedPattern>org.apache.flink.calcite.shaded.com.google</shadedPattern>
+ </relocation>
+ <relocation>
+
<pattern>org.apache.commons.codec</pattern>
+
<shadedPattern>org.apache.flink.calcite.shaded.org.apache.commons.codec</shadedPattern>
+ </relocation>
+ <relocation>
+
<pattern>org.apache.commons.io</pattern>
+
<shadedPattern>org.apache.flink.calcite.shaded.org.apache.commons.io</shadedPattern>
+ </relocation>
+ <relocation>
+
<pattern>org.checkerframework</pattern>
+
<shadedPattern>org.apache.flink.calcite.shaded.org.checkerframework</shadedPattern>
+ </relocation>
+ </relocations>
</configuration>
</execution>
</executions>
diff --git a/flink-table/flink-sql-jdbc-driver/pom.xml
b/flink-table/flink-sql-jdbc-driver/pom.xml
index 1b82576fb54..32ed400537f 100644
--- a/flink-table/flink-sql-jdbc-driver/pom.xml
+++ b/flink-table/flink-sql-jdbc-driver/pom.xml
@@ -91,12 +91,6 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/flink-table/flink-table-planner/pom.xml
b/flink-table/flink-table-planner/pom.xml
index 9dd0857a603..22d82d19340 100644
--- a/flink-table/flink-table-planner/pom.xml
+++ b/flink-table/flink-table-planner/pom.xml
@@ -320,6 +320,7 @@ under the License.
</relocation>-->
<!-- Calcite's dependencies -->
+ <!-- Keep it in sync with
flink-sql-client -->
<relocation>
<pattern>com.google</pattern>
<shadedPattern>org.apache.flink.calcite.shaded.com.google</shadedPattern>
