Repository: beam Updated Branches: refs/heads/master 75bab74eb -> f446853ee
Relocate sdks.common.v1 and portability.v1 in Java direct runner Currently these two namespaces are mistakenly left as-is, even though they link to other relocated proto libraries that make them incompatible when used outside the direct runner. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/1b59e4d4 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/1b59e4d4 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/1b59e4d4 Branch: refs/heads/master Commit: 1b59e4d443a346e10a6bbb03492f6b83d207cf85 Parents: eac561f Author: Kenneth Knowles <k...@google.com> Authored: Mon Oct 9 13:06:36 2017 -0700 Committer: Kenneth Knowles <k...@google.com> Committed: Mon Oct 9 13:06:36 2017 -0700 ---------------------------------------------------------------------- runners/direct-java/pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/1b59e4d4/runners/direct-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml index e14e813..4a094f8 100644 --- a/runners/direct-java/pom.xml +++ b/runners/direct-java/pom.xml @@ -88,6 +88,20 @@ </shadedPattern> </relocation> <relocation> + <!-- portability protos currently contain a typo, to be fixed later --> + <pattern>org.apache.beam.sdks.common</pattern> + <shadedPattern> + org.apache.beam.runners.direct.repackaged.sdks.common + </shadedPattern> + </relocation> + <relocation> + <!-- portability protos also invent this namespace --> + <pattern>org.apache.beam.portability</pattern> + <shadedPattern> + org.apache.beam.runners.direct.repackaged.portability + </shadedPattern> + </relocation> + <relocation> <pattern>com.google.common</pattern> <excludes> <!-- com.google.common is too generic, need to exclude guava-testlib -->
