From ba13de59f5254719eaec7d34a746c17f271d1073 Mon Sep 17 00:00:00 2001 From: Chesnay Schepler Date: Mon, 27 May 2019 13:21:21 +0200 Subject: [PATCH] [FLINK-12634][build] Store shading prefix in property --- flink-shaded-asm-6/pom.xml | 2 +- flink-shaded-guava-18/pom.xml | 2 +- flink-shaded-hadoop-2-uber/pom.xml | 18 +++++++++--------- flink-shaded-hadoop-2/pom.xml | 18 +++++++++--------- .../flink-shaded-jackson-2/pom.xml | 2 +- .../pom.xml | 2 +- flink-shaded-jackson-parent/pom.xml | 2 +- flink-shaded-netty-4/pom.xml | 2 +- flink-shaded-netty-tcnative-dynamic/pom.xml | 2 +- flink-shaded-netty-tcnative-static/pom.xml | 2 +- pom.xml | 4 ++++ 11 files changed, 30 insertions(+), 26 deletions(-) diff --git a/flink-shaded-asm-6/pom.xml b/flink-shaded-asm-6/pom.xml index 34aff63..df46fa3 100644 --- a/flink-shaded-asm-6/pom.xml +++ b/flink-shaded-asm-6/pom.xml @@ -84,7 +84,7 @@ under the License. org.objectweb - org.apache.flink.shaded.asm6.org.objectweb + ${shading.prefix}.asm6.org.objectweb diff --git a/flink-shaded-guava-18/pom.xml b/flink-shaded-guava-18/pom.xml index 09c1708..98de8b2 100644 --- a/flink-shaded-guava-18/pom.xml +++ b/flink-shaded-guava-18/pom.xml @@ -70,7 +70,7 @@ under the License. com.google - org.apache.flink.shaded.guava18.com.google + ${shading.prefix}.guava18.com.google diff --git a/flink-shaded-hadoop-2-uber/pom.xml b/flink-shaded-hadoop-2-uber/pom.xml index 76ee5c0..44bf03c 100644 --- a/flink-shaded-hadoop-2-uber/pom.xml +++ b/flink-shaded-hadoop-2-uber/pom.xml @@ -151,42 +151,42 @@ under the License. com.google - org.apache.flink.shaded.hadoop2.com.google + ${shading.prefix}.hadoop2.com.google com.google.inject.** org.objectweb.asm - org.apache.flink.shaded.hadoop2.org.objectweb.asm + ${shading.prefix}.hadoop2.org.objectweb.asm org.jboss.netty - org.apache.flink.shaded.hadoop2.org.jboss.netty + ${shading.prefix}.hadoop2.org.jboss.netty io.netty - org.apache.flink.shaded.hadoop2.io.netty + ${shading.prefix}.hadoop2.io.netty org.apache.curator - org.apache.flink.shaded.hadoop2.org.apache.curator + ${shading.prefix}.hadoop2.org.apache.curator org.apache.http - org.apache.flink.shaded.hadoop2.org.apache.http + ${shading.prefix}.hadoop2.org.apache.http org.apache.commons.httpclient - org.apache.flink.shaded.hadoop2.org.apache.commons.httpclient + ${shading.prefix}.hadoop2.org.apache.commons.httpclient org.htrace - org.apache.flink.shaded.hadoop2.org.htrace + ${shading.prefix}.hadoop2.org.htrace org.codehaus.jackson - org.apache.flink.shaded.hadoop2.org.codehaus.jackson + ${shading.prefix}.hadoop2.org.codehaus.jackson diff --git a/flink-shaded-hadoop-2/pom.xml b/flink-shaded-hadoop-2/pom.xml index 656e697..3cbf744 100644 --- a/flink-shaded-hadoop-2/pom.xml +++ b/flink-shaded-hadoop-2/pom.xml @@ -1044,42 +1044,42 @@ under the License. com.google - org.apache.flink.shaded.hadoop2.com.google + ${shading.prefix}.hadoop2.com.google com.google.inject.** org.objectweb.asm - org.apache.flink.shaded.hadoop2.org.objectweb.asm + ${shading.prefix}.hadoop2.org.objectweb.asm org.jboss.netty - org.apache.flink.shaded.hadoop2.org.jboss.netty + ${shading.prefix}.hadoop2.org.jboss.netty io.netty - org.apache.flink.shaded.hadoop2.io.netty + ${shading.prefix}.hadoop2.io.netty org.apache.curator - org.apache.flink.shaded.hadoop2.org.apache.curator + ${shading.prefix}.hadoop2.org.apache.curator org.apache.http - org.apache.flink.shaded.hadoop2.org.apache.http + ${shading.prefix}.hadoop2.org.apache.http org.apache.commons.httpclient - org.apache.flink.shaded.hadoop2.org.apache.commons.httpclient + ${shading.prefix}.hadoop2.org.apache.commons.httpclient org.htrace - org.apache.flink.shaded.hadoop2.org.htrace + ${shading.prefix}.hadoop2.org.htrace org.codehaus.jackson - org.apache.flink.shaded.hadoop2.org.codehaus.jackson + ${shading.prefix}.hadoop2.org.codehaus.jackson diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml index a7997e4..5d167a8 100644 --- a/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml +++ b/flink-shaded-jackson-parent/flink-shaded-jackson-2/pom.xml @@ -74,7 +74,7 @@ under the License. org.yaml - org.apache.flink.shaded.jackson2.org.yaml + ${shading.prefix}.jackson2.org.yaml diff --git a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml index bc47b25..4cc53e4 100644 --- a/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml +++ b/flink-shaded-jackson-parent/flink-shaded-jackson-module-jsonSchema-2/pom.xml @@ -69,7 +69,7 @@ under the License. javax.validation - org.apache.flink.shaded.jackson2.javax.validation + ${shading.prefix}.jackson2.javax.validation diff --git a/flink-shaded-jackson-parent/pom.xml b/flink-shaded-jackson-parent/pom.xml index 05db147..0b266f9 100644 --- a/flink-shaded-jackson-parent/pom.xml +++ b/flink-shaded-jackson-parent/pom.xml @@ -86,7 +86,7 @@ under the License. com.fasterxml.jackson - org.apache.flink.shaded.jackson2.com.fasterxml.jackson + ${shading.prefix}.jackson2.com.fasterxml.jackson diff --git a/flink-shaded-netty-4/pom.xml b/flink-shaded-netty-4/pom.xml index b596bdf..12831a8 100644 --- a/flink-shaded-netty-4/pom.xml +++ b/flink-shaded-netty-4/pom.xml @@ -68,7 +68,7 @@ under the License. io.netty - org.apache.flink.shaded.netty4.io.netty + ${shading.prefix}.netty4.io.netty diff --git a/flink-shaded-netty-tcnative-dynamic/pom.xml b/flink-shaded-netty-tcnative-dynamic/pom.xml index c9450f5..8eb631b 100644 --- a/flink-shaded-netty-tcnative-dynamic/pom.xml +++ b/flink-shaded-netty-tcnative-dynamic/pom.xml @@ -69,7 +69,7 @@ under the License. io.netty - org.apache.flink.shaded.netty4.io.netty + ${shading.prefix}.netty4.io.netty diff --git a/flink-shaded-netty-tcnative-static/pom.xml b/flink-shaded-netty-tcnative-static/pom.xml index 7c8fc97..79299c7 100644 --- a/flink-shaded-netty-tcnative-static/pom.xml +++ b/flink-shaded-netty-tcnative-static/pom.xml @@ -69,7 +69,7 @@ under the License. io.netty - org.apache.flink.shaded.netty4.io.netty + ${shading.prefix}.netty4.io.netty diff --git a/pom.xml b/pom.xml index 7ceeb18..49b48f0 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,10 @@ under the License. scm:git:https://github.com/apache/flink-shaded.git + + org.apache.flink.shaded + + flink-shaded-force-shading flink-shaded-asm-6