[hotfix] reallocate commons-codec in flink planner & blink planner

static-max · Jul 11, 2019 · 64d5d69 · 64d5d69
1 parent b0bf838
commit 64d5d69
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/flink-table/flink-table-planner-blink/pom.xml b/flink-table/flink-table-planner-blink/pom.xml
@@ -328,6 +328,12 @@ under the License.
  </includes>
  </artifactSet>
  <relocations>
+ <!-- Calcite is not relocated for now, because we expose it at some locations such as CalciteConfig -->
+ <!--<relocation>
+ <pattern>org.apache.calcite</pattern>
+ <shadedPattern>org.apache.flink.calcite.shaded.org.apache.calcite</shadedPattern>
+ </relocation>-->
+
  <!-- Calcite's dependencies -->
  <relocation>
  <pattern>com.google</pattern>
@@ -341,6 +347,18 @@ under the License.
  <pattern>com.fasterxml</pattern>
  <shadedPattern>org.apache.flink.calcite.shaded.com.fasterxml</shadedPattern>
  </relocation>
+ <relocation>
+ <pattern>org.apache.commons.codec</pattern>
+ <shadedPattern>org.apache.flink.calcite.shaded.org.apache.commons.codec</shadedPattern>
+ </relocation>
+
+ <!-- flink-table-planner dependencies -->
+ <!-- not relocated for now, because we need to change the contents of the properties field otherwise -->
+ <!--<relocation>
+ <pattern>org.codehaus</pattern>
+ <shadedPattern>org.apache.flink.table.shaded.org.codehaus</shadedPattern>
+ </relocation>-->
+
  </relocations>
  </configuration>
  </execution>

diff --git a/flink-table/flink-table-planner/pom.xml b/flink-table/flink-table-planner/pom.xml
@@ -364,6 +364,10 @@ under the License.
  <pattern>com.fasterxml</pattern>
  <shadedPattern>org.apache.flink.calcite.shaded.com.fasterxml</shadedPattern>
  </relocation>
+ <relocation>
+ <pattern>org.apache.commons.codec</pattern>
+ <shadedPattern>org.apache.flink.calcite.shaded.org.apache.commons.codec</shadedPattern>
+ </relocation>
 
  <!-- flink-table-planner dependencies -->
  <relocation>