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/23 08:56:50 UTC

[flink-shaded] branch master updated: [hotfix][hadoop] Us e 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 3746069  [hotfix][hadoop] Us e o.a.f.shaded as patternPrefix
3746069 is described below

commit 37460692afceacce6a6df9fe056428f873c109d9
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Thu May 23 10:56:40 2019 +0200

    [hotfix][hadoop] Us
    e o.a.f.shaded as patternPrefix
---
 flink-shaded-hadoop-2/pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/flink-shaded-hadoop-2/pom.xml b/flink-shaded-hadoop-2/pom.xml
index 3cbf606..91451be 100644
--- a/flink-shaded-hadoop-2/pom.xml
+++ b/flink-shaded-hadoop-2/pom.xml
@@ -1026,35 +1026,35 @@ under the License.
 								</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>