Skip to content
Permalink
Browse files
[FLINK-12634][build] Store shading prefix in property
  • Loading branch information
zentol committed May 27, 2019
1 parent 396d7b8 commit ba13de59f5254719eaec7d34a746c17f271d1073
Showing 11 changed files with 30 additions and 26 deletions.
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>

0 comments on commit ba13de5

Please sign in to comment.