You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/05/27 11:21:52 UTC
[flink-shaded] branch master updated (7d91dad -> ba13de5)
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git.
from 7d91dad [FLINK-12598][build] Use shade-plugin 3.1.1 for shading sources
new 396d7b8 [hotfix][hadoop] Use o.a.f.shaded as patternPrefix
new ba13de5 [FLINK-12634][build] Store shading prefix in property
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 +-
.../flink-shaded-jackson-module-jsonSchema-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(-)
[flink-shaded] 01/02: [hotfix][hadoop] Use o.a.f.shaded as
patternPrefix
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
commit 396d7b8319eff46ccd769b13a342af4ee439c591
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Mon May 27 13:12:49 2019 +0200
[hotfix][hadoop] Use o.a.f.shaded as patternPrefix
---
flink-shaded-hadoop-2/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flink-shaded-hadoop-2/pom.xml b/flink-shaded-hadoop-2/pom.xml
index dbe96b9..656e697 100644
--- a/flink-shaded-hadoop-2/pom.xml
+++ b/flink-shaded-hadoop-2/pom.xml
@@ -1044,7 +1044,7 @@ under the License.
<relocations>
<relocation>
<pattern>com.google</pattern>
- <shadedPattern>org.apache.flink.hadoop2.shaded.com.google</shadedPattern>
+ <shadedPattern>org.apache.flink.shaded.hadoop2.com.google</shadedPattern>
<excludes>
<exclude>com.google.inject.**</exclude>
</excludes>
[flink-shaded] 02/02: [FLINK-12634][build] Store shading prefix in
property
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
commit ba13de59f5254719eaec7d34a746c17f271d1073
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Mon May 27 13:21:21 2019 +0200
[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 +-
.../flink-shaded-jackson-module-jsonSchema-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.
<relocations>
<relocation>
<pattern>org.objectweb</pattern>
- <shadedPattern>org.apache.flink.shaded.asm6.org.objectweb</shadedPattern>
+ <shadedPattern>${shading.prefix}.asm6.org.objectweb</shadedPattern>
</relocation>
</relocations>
</configuration>
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.
<relocations>
<relocation>
<pattern>com.google</pattern>
- <shadedPattern>org.apache.flink.shaded.guava18.com.google</shadedPattern>
+ <shadedPattern>${shading.prefix}.guava18.com.google</shadedPattern>
</relocation>
</relocations>
</configuration>
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.
<relocations>
<relocation>
<pattern>com.google</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.com.google</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.com.google</shadedPattern>
<excludes>
<exclude>com.google.inject.**</exclude>
</excludes>
</relocation>
<relocation>
<pattern>org.objectweb.asm</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.org.objectweb.asm</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.org.objectweb.asm</shadedPattern>
</relocation>
<relocation>
<pattern>org.jboss.netty</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.org.jboss.netty</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.org.jboss.netty</shadedPattern>
</relocation>
<relocation>
<pattern>io.netty</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.io.netty</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.io.netty</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.curator</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.org.apache.curator</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.org.apache.curator</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.http</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.org.apache.http</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.org.apache.http</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons.httpclient</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.org.apache.commons.httpclient</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.org.apache.commons.httpclient</shadedPattern>
</relocation>
<relocation>
<pattern>org.htrace</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.org.htrace</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.org.htrace</shadedPattern>
</relocation>
<relocation>
<pattern>org.codehaus.jackson</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.org.codehaus.jackson</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.org.codehaus.jackson</shadedPattern>
</relocation>
</relocations>
</configuration>
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.
<relocations>
<relocation>
<pattern>com.google</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.com.google</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.com.google</shadedPattern>
<excludes>
<exclude>com.google.inject.**</exclude>
</excludes>
</relocation>
<relocation>
<pattern>org.objectweb.asm</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.org.objectweb.asm</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.org.objectweb.asm</shadedPattern>
</relocation>
<relocation>
<pattern>org.jboss.netty</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.org.jboss.netty</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.org.jboss.netty</shadedPattern>
</relocation>
<relocation>
<pattern>io.netty</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.io.netty</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.io.netty</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.curator</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.org.apache.curator</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.org.apache.curator</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.http</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.org.apache.http</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.org.apache.http</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons.httpclient</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.org.apache.commons.httpclient</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.org.apache.commons.httpclient</shadedPattern>
</relocation>
<relocation>
<pattern>org.htrace</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.org.htrace</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.org.htrace</shadedPattern>
</relocation>
<relocation>
<pattern>org.codehaus.jackson</pattern>
- <shadedPattern>org.apache.flink.shaded.hadoop2.org.codehaus.jackson</shadedPattern>
+ <shadedPattern>${shading.prefix}.hadoop2.org.codehaus.jackson</shadedPattern>
</relocation>
</relocations>
</configuration>
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.
<relocations combine.children="append">
<relocation>
<pattern>org.yaml</pattern>
- <shadedPattern>org.apache.flink.shaded.jackson2.org.yaml
+ <shadedPattern>${shading.prefix}.jackson2.org.yaml
</shadedPattern>
</relocation>
</relocations>
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.
<relocations combine.children="append">
<relocation>
<pattern>javax.validation</pattern>
- <shadedPattern>org.apache.flink.shaded.jackson2.javax.validation
+ <shadedPattern>${shading.prefix}.jackson2.javax.validation
</shadedPattern>
</relocation>
</relocations>
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.
<relocations>
<relocation>
<pattern>com.fasterxml.jackson</pattern>
- <shadedPattern>org.apache.flink.shaded.jackson2.com.fasterxml.jackson</shadedPattern>
+ <shadedPattern>${shading.prefix}.jackson2.com.fasterxml.jackson</shadedPattern>
</relocation>
</relocations>
</configuration>
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.
<relocations>
<relocation>
<pattern>io.netty</pattern>
- <shadedPattern>org.apache.flink.shaded.netty4.io.netty</shadedPattern>
+ <shadedPattern>${shading.prefix}.netty4.io.netty</shadedPattern>
</relocation>
</relocations>
</configuration>
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.
<relocations>
<relocation>
<pattern>io.netty</pattern>
- <shadedPattern>org.apache.flink.shaded.netty4.io.netty</shadedPattern>
+ <shadedPattern>${shading.prefix}.netty4.io.netty</shadedPattern>
</relocation>
</relocations>
</configuration>
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.
<relocations>
<relocation>
<pattern>io.netty</pattern>
- <shadedPattern>org.apache.flink.shaded.netty4.io.netty</shadedPattern>
+ <shadedPattern>${shading.prefix}.netty4.io.netty</shadedPattern>
</relocation>
</relocations>
</configuration>
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.
<developerConnection>scm:git:https://github.com/apache/flink-shaded.git</developerConnection>
</scm>
+ <properties>
+ <shading.prefix>org.apache.flink.shaded</shading.prefix>
+ </properties>
+
<modules>
<module>flink-shaded-force-shading</module>
<module>flink-shaded-asm-6</module>