You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by tg...@apache.org on 2017/05/09 23:11:11 UTC

[1/2] beam git commit: This closes #3006

Repository: beam
Updated Branches:
  refs/heads/master 2e2984083 -> 5b2d494e8


This closes #3006


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

Branch: refs/heads/master
Commit: 5b2d494e8d265305b8f783c02c666560d5b1e445
Parents: 2e29840 ded60a7
Author: Thomas Groh <tg...@google.com>
Authored: Tue May 9 16:11:01 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Tue May 9 16:11:01 2017 -0700

----------------------------------------------------------------------
 runners/direct-java/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------



[2/2] beam git commit: Shade JSR305 in the DirectRunner

Posted by tg...@apache.org.
Shade JSR305 in the DirectRunner

None of the APIs exposed by the DirectRunner are nullable.


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

Branch: refs/heads/master
Commit: ded60a724cbceadb873b0edcd82ae6a3a7835803
Parents: 2e29840
Author: Thomas Groh <tg...@google.com>
Authored: Tue May 9 14:11:47 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Tue May 9 16:11:01 2017 -0700

----------------------------------------------------------------------
 runners/direct-java/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/ded60a72/runners/direct-java/pom.xml
----------------------------------------------------------------------
diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml
index 19ee81a..c115906 100644
--- a/runners/direct-java/pom.xml
+++ b/runners/direct-java/pom.xml
@@ -95,6 +95,7 @@
                   <include>org.apache.beam:beam-runners-core-construction-java</include>
                   <include>org.apache.beam:beam-runners-core-java</include>
                   <include>org.apache.beam:beam-sdks-common-runner-api</include>
+                  <include>com.google.code.findbugs:jsr305</include>
                 </includes>
               </artifactSet>
               <filters>
@@ -138,6 +139,12 @@
                     org.apache.beam.runners.direct.repackaged.com.google.thirdparty
                   </shadedPattern>
                 </relocation>
+                <relocation>
+                  <pattern>javax.annotation</pattern>
+                  <shadedPattern>
+                    org.apache.beam.runners.direct.repackaged.javax.annotation
+                  </shadedPattern>
+                </relocation>
               </relocations>
               <transformers>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>