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 5e4d13bcaacf6079d99df678ee9ec4934253b9c5
Author: slinkydeveloper <francescogu...@gmail.com>
AuthorDate: Wed Jan 5 16:28:27 2022 +0100
[hotfix][table-runtime][table-planner] Fix the shading package name of
com.jayway and remove bad transitive deps
---
.../env/beam/ProcessPythonEnvironmentManager.java | 17 ++++++------
flink-table/flink-table-planner/pom.xml | 32 ++++++++++------------
flink-table/flink-table-runtime/pom.xml | 3 +-
3 files changed, 24 insertions(+), 28 deletions(-)
diff --git
a/flink-python/src/main/java/org/apache/flink/python/env/beam/ProcessPythonEnvironmentManager.java
b/flink-python/src/main/java/org/apache/flink/python/env/beam/ProcessPythonEnvironmentManager.java
index ab8413a..ac63769 100644
---
a/flink-python/src/main/java/org/apache/flink/python/env/beam/ProcessPythonEnvironmentManager.java
+++
b/flink-python/src/main/java/org/apache/flink/python/env/beam/ProcessPythonEnvironmentManager.java
@@ -35,7 +35,6 @@ import org.apache.flink.util.function.FunctionWithException;
import org.apache.flink.shaded.guava30.com.google.common.base.Strings;
-import org.codehaus.commons.nullanalysis.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -96,16 +95,16 @@ public final class ProcessPythonEnvironmentManager
implements PythonEnvironmentM
private transient PythonEnvResources.PythonLeasedResource resource;
- @NotNull private final PythonDependencyInfo dependencyInfo;
- @NotNull private final Map<String, String> systemEnv;
- @NotNull private final String[] tmpDirectories;
- @NotNull private final JobID jobID;
+ private final PythonDependencyInfo dependencyInfo;
+ private final Map<String, String> systemEnv;
+ private final String[] tmpDirectories;
+ private final JobID jobID;
public ProcessPythonEnvironmentManager(
- @NotNull PythonDependencyInfo dependencyInfo,
- @NotNull String[] tmpDirectories,
- @NotNull Map<String, String> systemEnv,
- @NotNull JobID jobID) {
+ PythonDependencyInfo dependencyInfo,
+ String[] tmpDirectories,
+ Map<String, String> systemEnv,
+ JobID jobID) {
this.dependencyInfo = Objects.requireNonNull(dependencyInfo);
this.tmpDirectories = Objects.requireNonNull(tmpDirectories);
this.systemEnv = Objects.requireNonNull(systemEnv);
diff --git a/flink-table/flink-table-planner/pom.xml
b/flink-table/flink-table-planner/pom.xml
index f57850d..58d95ae 100644
--- a/flink-table/flink-table-planner/pom.xml
+++ b/flink-table/flink-table-planner/pom.xml
@@ -102,15 +102,6 @@ under the License.
<version>${project.version}</version>
</dependency>
- <!-- Flink dependencies (not included in the uber) -->
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-cep</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- Other 3rd party dependencies (included in the uber) -->
<dependency>
@@ -341,6 +332,7 @@ under the License.
<configuration>
<!-- Base config -->
<createDependencyReducedPom>true</createDependencyReducedPom>
+
<keepDependenciesWithProvidedScope>false</keepDependenciesWithProvidedScope>
<dependencyReducedPomLocation>${project.basedir}/target/dependency-reduced-pom.xml</dependencyReducedPomLocation>
<filters combine.children="append">
<filter>
@@ -398,14 +390,6 @@ under the License.
<shadedPattern>org.apache.flink.calcite.shaded.com.google</shadedPattern>
</relocation>
<relocation>
-
<pattern>com.jayway</pattern>
-
<shadedPattern>org.apache.flink.calcite.shaded.com.jayway</shadedPattern>
- </relocation>
- <relocation>
-
<pattern>com.fasterxml</pattern>
-
<shadedPattern>org.apache.flink.shaded.jackson2.com.fasterxml</shadedPattern>
- </relocation>
- <relocation>
<pattern>org.apache.commons.codec</pattern>
<shadedPattern>org.apache.flink.calcite.shaded.org.apache.commons.codec</shadedPattern>
</relocation>
@@ -414,11 +398,23 @@ under the License.
<shadedPattern>org.apache.flink.calcite.shaded.org.apache.commons.io</shadedPattern>
</relocation>
+ <!-- These are relocated to
match package names, but not included in this jar -->
+ <relocation>
+
<pattern>com.fasterxml</pattern>
+ <!-- From
flink-shaded-jackson -->
+
<shadedPattern>org.apache.flink.shaded.jackson2.com.fasterxml</shadedPattern>
+ </relocation>
+ <relocation>
+
<pattern>com.jayway</pattern>
+ <!-- From
flink-table-runtime -->
+
<shadedPattern>org.apache.flink.table.shaded.com.jayway</shadedPattern>
+ </relocation>
+
+ <!-- Other table dependencies
-->
<relocation>
<pattern>org.reflections</pattern>
<shadedPattern>org.apache.flink.table.shaded.org.reflections</shadedPattern>
</relocation>
-
<relocation>
<!-- icu4j's
dependencies -->
<pattern>com.ibm.icu</pattern>
diff --git a/flink-table/flink-table-runtime/pom.xml
b/flink-table/flink-table-runtime/pom.xml
index 3a116fd..a846bf9 100644
--- a/flink-table/flink-table-runtime/pom.xml
+++ b/flink-table/flink-table-runtime/pom.xml
@@ -146,6 +146,7 @@ under the License.
<goal>shade</goal>
</goals>
<configuration>
+
<keepDependenciesWithProvidedScope>false</keepDependenciesWithProvidedScope>
<artifactSet>
<includes
combine.children="append">
<include>com.jayway.jsonpath:json-path</include>
@@ -157,7 +158,7 @@ under the License.
<!-- Make sure
com.jayway and com.fasterxml relocations match the relocations in planner pom
-->
<relocation>
<pattern>com.jayway</pattern>
-
<shadedPattern>org.apache.flink.calcite.shaded.com.jayway</shadedPattern>
+
<shadedPattern>org.apache.flink.table.shaded.com.jayway</shadedPattern>
</relocation>
<relocation>
<pattern>com.fasterxml</pattern>
