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/17 11:40:55 UTC
[flink-shaded] branch master updated: [hotfix][hadoop] Use
o.a.f.shaded as patternPrefix
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
The following commit(s) were added to refs/heads/master by this push:
new cf444af [hotfix][hadoop] Use o.a.f.shaded as patternPrefix
cf444af is described below
commit cf444af25ef6097391bbd27ca481e9a1ef29322a
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Fri May 17 13:40:39 2019 +0200
[hotfix][hadoop] Use o.a.f.shaded as patternPrefix
---
flink-shaded-hadoop-2-uber/pom.xml | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/flink-shaded-hadoop-2-uber/pom.xml b/flink-shaded-hadoop-2-uber/pom.xml
index 12e7d76..76ee5c0 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.hadoop2.shaded.com.google</shadedPattern>
+ <shadedPattern>org.apache.flink.shaded.hadoop2.com.google</shadedPattern>
<excludes>
<exclude>com.google.inject.**</exclude>
</excludes>
</relocation>
<relocation>
<pattern>org.objectweb.asm</pattern>
- <shadedPattern>org.apache.flink.hadoop2.shaded.org.objectweb.asm</shadedPattern>
+ <shadedPattern>org.apache.flink.shaded.hadoop2.org.objectweb.asm</shadedPattern>
</relocation>
<relocation>
<pattern>org.jboss.netty</pattern>
- <shadedPattern>org.apache.flink.hadoop2.shaded.org.jboss.netty</shadedPattern>
+ <shadedPattern>org.apache.flink.shaded.hadoop2.org.jboss.netty</shadedPattern>
</relocation>
<relocation>
<pattern>io.netty</pattern>
- <shadedPattern>org.apache.flink.hadoop2.shaded.io.netty</shadedPattern>
+ <shadedPattern>org.apache.flink.shaded.hadoop2.io.netty</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.curator</pattern>
- <shadedPattern>org.apache.flink.hadoop2.shaded.org.apache.curator</shadedPattern>
+ <shadedPattern>org.apache.flink.shaded.hadoop2.org.apache.curator</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.http</pattern>
- <shadedPattern>org.apache.flink.hadoop2.shaded.org.apache.http</shadedPattern>
+ <shadedPattern>org.apache.flink.shaded.hadoop2.org.apache.http</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons.httpclient</pattern>
- <shadedPattern>org.apache.flink.hadoop2.shaded.org.apache.commons.httpclient</shadedPattern>
+ <shadedPattern>org.apache.flink.shaded.hadoop2.org.apache.commons.httpclient</shadedPattern>
</relocation>
<relocation>
<pattern>org.htrace</pattern>
- <shadedPattern>org.apache.flink.hadoop2.shaded.org.htrace</shadedPattern>
+ <shadedPattern>org.apache.flink.shaded.hadoop2.org.htrace</shadedPattern>
</relocation>
<relocation>
<pattern>org.codehaus.jackson</pattern>
- <shadedPattern>org.apache.flink.hadoop2.shaded.org.codehaus.jackson</shadedPattern>
+ <shadedPattern>org.apache.flink.shaded.hadoop2.org.codehaus.jackson</shadedPattern>
</relocation>
</relocations>
</configuration>