Fix Repackaging Configuration in the the DirectRunner

Repackage the actually generated model classes rather than the previous
namespace.


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/bd1586fa
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/bd1586fa
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/bd1586fa

Branch: refs/heads/mr-runner
Commit: bd1586fa83608590502b251814e523b054bdd378
Parents: 7550a58
Author: Thomas Groh <[email protected]>
Authored: Tue Oct 31 14:23:58 2017 -0700
Committer: Thomas Groh <[email protected]>
Committed: Mon Nov 6 16:48:08 2017 -0800

----------------------------------------------------------------------
 runners/direct-java/pom.xml | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/bd1586fa/runners/direct-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml
index 6e356fc..752af44 100644
--- a/runners/direct-java/pom.xml
+++ b/runners/direct-java/pom.xml
@@ -82,23 +82,9 @@
                     </shadedPattern>
                   </relocation>
                   <relocation>
-                    <pattern>org.apache.beam.sdk.common</pattern>
+                    <pattern>org.apache.beam.model</pattern>
                     <shadedPattern>
-                      org.apache.beam.runners.direct.repackaged.sdk.common
-                    </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
+                      org.apache.beam.runners.direct.repackaged.model
                     </shadedPattern>
                   </relocation>
                   <relocation>

Reply via email to