Repository: incubator-beam Updated Branches: refs/heads/master 84573e0b4 -> 779fb1a6c
Add os-maven-plugin to examples module for GCP IO Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/f0941d5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/f0941d5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/f0941d5e Branch: refs/heads/master Commit: f0941d5e05e40d8fb6e347f1af3790f75a14b0a7 Parents: 84573e0 Author: Scott Wegner <sweg...@google.com> Authored: Wed Jul 13 14:59:01 2016 -0700 Committer: Scott Wegner <sweg...@google.com> Committed: Thu Jul 14 15:09:26 2016 -0700 ---------------------------------------------------------------------- examples/java/pom.xml | 11 +++++++++++ pom.xml | 1 + sdks/java/io/google-cloud-platform/pom.xml | 5 +++-- 3 files changed, 15 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f0941d5e/examples/java/pom.xml ---------------------------------------------------------------------- diff --git a/examples/java/pom.xml b/examples/java/pom.xml index ca16f51..ba45c48 100644 --- a/examples/java/pom.xml +++ b/examples/java/pom.xml @@ -195,6 +195,17 @@ </executions> </plugin> </plugins> + + <extensions> + <!-- Use os-maven-plugin to initialize the "os.detected" properties for Bigtable + in beam-sdks-java-io-google-cloud-platform. + See: https://cloud.google.com/bigtable/docs/using-maven#encryption --> + <extension> + <groupId>kr.motd.maven</groupId> + <artifactId>os-maven-plugin</artifactId> + <version>${os-maven-plugin.version}</version> + </extension> + </extensions> </build> <dependencies> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f0941d5e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7089c2c..d38768e 100644 --- a/pom.xml +++ b/pom.xml @@ -126,6 +126,7 @@ <joda.version>2.4</joda.version> <junit.version>4.11</junit.version> <mockito.version>1.9.5</mockito.version> + <os-maven-plugin.version>1.4.0.Final</os-maven-plugin.version> <protobuf.version>3.0.0-beta-1</protobuf.version> <pubsub.version>v1-rev10-1.22.0</pubsub.version> <slf4j.version>1.7.14</slf4j.version> http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/f0941d5e/sdks/java/io/google-cloud-platform/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/io/google-cloud-platform/pom.xml b/sdks/java/io/google-cloud-platform/pom.xml index 93165ff..b86f3b9 100644 --- a/sdks/java/io/google-cloud-platform/pom.xml +++ b/sdks/java/io/google-cloud-platform/pom.xml @@ -88,11 +88,12 @@ </plugins> <extensions> - <!-- Use os-maven-plugin to initialize the "os.detected" properties --> + <!-- Use os-maven-plugin to initialize the "os.detected" properties for Bigtable. + See: https://cloud.google.com/bigtable/docs/using-maven#encryption --> <extension> <groupId>kr.motd.maven</groupId> <artifactId>os-maven-plugin</artifactId> - <version>1.4.0.Final</version> + <version>${os-maven-plugin.version}</version> </extension> </extensions> </build>