You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by lo...@apache.org on 2020/11/18 18:20:00 UTC
[beam] branch release-2.26.0 updated: [BEAM-11229] Add guava
dependency management to release candidate (#13367)
This is an automated email from the ASF dual-hosted git repository.
lostluck pushed a commit to branch release-2.26.0
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/release-2.26.0 by this push:
new 91de54a [BEAM-11229] Add guava dependency management to release candidate (#13367)
91de54a is described below
commit 91de54a173fffefa32f50a7549a33436dad40d17
Author: kileys <ki...@google.com>
AuthorDate: Wed Nov 18 10:19:21 2020 -0800
[BEAM-11229] Add guava dependency management to release candidate (#13367)
* add guava dependency management to archetype
(cherry picked from commit 31bffe831a921651484d305db3790ccb85856fa8)
* add bom to changes
---
CHANGES.md | 1 +
sdks/java/maven-archetypes/examples/build.gradle | 1 +
.../examples/src/main/resources/archetype-resources/pom.xml | 8 +++++++-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index 4c194e0..f787ff9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -67,6 +67,7 @@
* Added support for avro payload format in Beam SQL Pubsub Table ([BEAM-5504](https://issues.apache.org/jira/browse/BEAM-5504))
* Added option to disable unnecessary copying between operators in Flink Runner (Java) ([BEAM-11146](https://issues.apache.org/jira/browse/BEAM-11146))
* Added CombineFn.setup and CombineFn.teardown to Python SDK. These methods let you initialize the CombineFn's state before any of the other methods of the CombineFn is executed and clean that state up later on. If you are using Dataflow, you need to enable Dataflow Runner V2 by passing `--experiments=use_runner_v2` before using this feature. ([BEAM-3736](https://issues.apache.org/jira/browse/BEAM-3736))
+* Added GPC libraries BOM to Java SDK ([BEAM-9444](https://issues.apache.org/jira/browse/BEAM-9444))
* X feature added (Java/Python) ([BEAM-X](https://issues.apache.org/jira/browse/BEAM-X)).
## Breaking Changes
diff --git a/sdks/java/maven-archetypes/examples/build.gradle b/sdks/java/maven-archetypes/examples/build.gradle
index 6ba835d..43f3021 100644
--- a/sdks/java/maven-archetypes/examples/build.gradle
+++ b/sdks/java/maven-archetypes/examples/build.gradle
@@ -28,6 +28,7 @@ processResources {
'project.version': version,
'bigquery.version': dependencies.create(project.library.java.google_api_services_bigquery).getVersion(),
'google-api-client.version': dependencies.create(project.library.java.google_api_client).getVersion(),
+ 'guava.version': dependencies.create(project.library.java.guava).getVersion(),
'hamcrest.version': dependencies.create(project.library.java.hamcrest_library).getVersion(),
'jackson.version': dependencies.create(project.library.java.jackson_core).getVersion(),
'joda.version': dependencies.create(project.library.java.joda_time).getVersion(),
diff --git a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
index c7c2d40..95c906f 100644
--- a/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
+++ b/sdks/java/maven-archetypes/examples/src/main/resources/archetype-resources/pom.xml
@@ -31,6 +31,7 @@
<bigquery.version>@bigquery.version@</bigquery.version>
<google-api-client.version>@google-api-client.version@</google-api-client.version>
+ <guava.version>@guava.version@</guava.version>
<hamcrest.version>@hamcrest.version@</hamcrest.version>
<jackson.version>@jackson.version@</jackson.version>
<joda.version>@joda.version@</joda.version>
@@ -460,10 +461,15 @@
</dependency>
</dependencies>
- <!-- GCP libraries BOM sets the version for google http client -->
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${guava.version}</version> <!-- "-jre" for Java 8 or higher -->
+ </dependency>
+ <!-- GCP libraries BOM sets the version for google http client -->
+ <dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>${libraries-bom.version}</version>