Repository: beam Updated Branches: refs/heads/master 0d2a39bd8 -> 0f9f47de0
Relocate everything shaded by Java SDK harness Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/00890939 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/00890939 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/00890939 Branch: refs/heads/master Commit: 008909392b5b4e7227e07f4a11e13d799100fd46 Parents: 52863ef Author: Kenneth Knowles <k...@apache.org> Authored: Mon Oct 16 19:51:50 2017 -0700 Committer: Kenneth Knowles <k...@apache.org> Committed: Mon Oct 16 19:51:50 2017 -0700 ---------------------------------------------------------------------- sdks/java/harness/pom.xml | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/00890939/sdks/java/harness/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/harness/pom.xml b/sdks/java/harness/pom.xml index de24f7f..fefb5a3 100644 --- a/sdks/java/harness/pom.xml +++ b/sdks/java/harness/pom.xml @@ -71,20 +71,37 @@ <relocations> <relocation> <pattern>com.google.common</pattern> - <excludes> - <!-- com.google.common is too generic, need to exclude guava-testlib --> - <exclude>com.google.common.**.testing.*</exclude> - </excludes> <!--suppress MavenModelInspection --> <shadedPattern> - org.apache.beam.sdks.harness.repackaged.com.google.common + org.apache.beam.fn.harness.private.com.google.common </shadedPattern> </relocation> <relocation> <pattern>com.google.thirdparty</pattern> <!--suppress MavenModelInspection --> <shadedPattern> - org.apache.beam.sdks.harness.repackaged.com.google.thirdparty + org.apache.beam.fn.harness.private.com.google.thirdparty + </shadedPattern> + </relocation> + <relocation> + <pattern>io.netty.channel</pattern> + <!--suppress MavenModelInspection --> + <shadedPattern> + org.apache.beam.fn.harness.private.io.netty.channel + </shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.beam.model</pattern> + <!--suppress MavenModelInspection --> + <shadedPattern> + org.apache.beam.fn.harness.private.org.apache.beam.model + </shadedPattern> + </relocation> + <relocation> + <pattern>org.apache.beam.runners</pattern> + <!--suppress MavenModelInspection --> + <shadedPattern> + org.apache.beam.fn.harness.private.org.apache.beam.runners </shadedPattern> </relocation> </relocations>
