You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2023/03/03 14:34:56 UTC
[hop] branch master updated: Update Beam to 2.45.0, fixes #2500
This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git
The following commit(s) were added to refs/heads/master by this push:
new 2642008bf8 Update Beam to 2.45.0, fixes #2500
new a2b20c6e57 Merge pull request #2505 from hansva/master
2642008bf8 is described below
commit 2642008bf805e9f683453a6d3a3aaa79d7adb270
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Fri Mar 3 12:49:02 2023 +0100
Update Beam to 2.45.0, fixes #2500
---
assemblies/lib-beam/pom.xml | 2 +-
assemblies/plugins/tech/google/pom.xml | 2 +-
.../ROOT/pages/pipeline/beam/getting-started-with-beam.adoc | 5 +++++
engine-beam/pom.xml | 2 +-
.../java/org/apache/hop/beam/pipeline/fatjar/FatJarBuilder.java | 7 ++++++-
pom.xml | 8 ++++----
6 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/assemblies/lib-beam/pom.xml b/assemblies/lib-beam/pom.xml
index 72e42464e9..fcbd7048a8 100644
--- a/assemblies/lib-beam/pom.xml
+++ b/assemblies/lib-beam/pom.xml
@@ -476,7 +476,7 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
- <version>2.8.3</version>
+ <version>2.14.0</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
diff --git a/assemblies/plugins/tech/google/pom.xml b/assemblies/plugins/tech/google/pom.xml
index 12fb4a6670..5badb5714c 100644
--- a/assemblies/plugins/tech/google/pom.xml
+++ b/assemblies/plugins/tech/google/pom.xml
@@ -86,7 +86,7 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
- <version>2.8.3</version>
+ <version>2.14.0</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
diff --git a/docs/hop-user-manual/modules/ROOT/pages/pipeline/beam/getting-started-with-beam.adoc b/docs/hop-user-manual/modules/ROOT/pages/pipeline/beam/getting-started-with-beam.adoc
index 875db7ae3e..cf80ab0be4 100644
--- a/docs/hop-user-manual/modules/ROOT/pages/pipeline/beam/getting-started-with-beam.adoc
+++ b/docs/hop-user-manual/modules/ROOT/pages/pipeline/beam/getting-started-with-beam.adoc
@@ -87,6 +87,11 @@ Here is the documentation for the relevant plugins:
|3.3.X (scala 2.12)
|1.15.x
+|2.4.0
+|2.45.0
+|3.3.X (scala 2.12)
+|1.15.x
+
|===
== How are my pipelines executed?
diff --git a/engine-beam/pom.xml b/engine-beam/pom.xml
index 80dd4bbb86..faa6691a05 100644
--- a/engine-beam/pom.xml
+++ b/engine-beam/pom.xml
@@ -226,7 +226,7 @@
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
- <version>2.8.3</version>
+ <version>2.14.0</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
diff --git a/plugins/engines/beam/src/main/java/org/apache/hop/beam/pipeline/fatjar/FatJarBuilder.java b/plugins/engines/beam/src/main/java/org/apache/hop/beam/pipeline/fatjar/FatJarBuilder.java
index 05cbb72241..5caa1d99f8 100644
--- a/plugins/engines/beam/src/main/java/org/apache/hop/beam/pipeline/fatjar/FatJarBuilder.java
+++ b/plugins/engines/beam/src/main/java/org/apache/hop/beam/pipeline/fatjar/FatJarBuilder.java
@@ -187,7 +187,12 @@ public class FatJarBuilder {
|| jarFileBaseName.startsWith("guava")
|| jarFileBaseName.startsWith("akka-")
|| jarFileBaseName.startsWith("scala-")
- || jarFileBaseName.startsWith("flink-runtime")) {
+ || jarFileBaseName.startsWith("flink-runtime")
+ || jarFileBaseName.startsWith("beam-sdks-java-io")
+ || jarFileBaseName.startsWith("beam-runners-spark")
+ || jarFileBaseName.startsWith("beam-runners-direct")
+ || jarFileBaseName.startsWith("beam-sdks-java-core")
+ || jarFileBaseName.startsWith("beam-runners-core")) {
index = false;
}
diff --git a/pom.xml b/pom.xml
index c9abcded95..ab222ee00e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
<!-- Third-party dependencies -->
<akka.version>2.5.32</akka.version>
<avro.version>1.11.1</avro.version>
- <apache-beam.version>2.43.0</apache-beam.version>
+ <apache-beam.version>2.45.0</apache-beam.version>
<apache-spark.version>3.3.0</apache-spark.version>
<apache-flink.version>1.15.2</apache-flink.version>
<asm.version>9.3</asm.version>
@@ -129,7 +129,7 @@
<google-api-common.version>2.2.2</google-api-common.version>
<google-api-client.version>2.0.1</google-api-client.version>
<google-api-services-storage.version>v1-rev20220705-2.0.0</google-api-services-storage.version>
- <google-api-services-bigquery.version>v2-rev20221028-2.0.0</google-api-services-bigquery.version>
+ <google-api-services-bigquery.version>v2-rev20220924-2.0.0</google-api-services-bigquery.version>
<google-auth-library-credentials.version>1.12.1</google-auth-library-credentials.version>
<google-auth-library-oauth2-http.version>1.12.1</google-auth-library-oauth2-http.version>
<google-cloud-storage.version>2.15.0</google-cloud-storage.version>
@@ -160,7 +160,7 @@
<lz4.version>1.8.0</lz4.version>
<metrics.version>4.2.12</metrics.version>
<minlog.version>1.3.1</minlog.version>
- <netty.version>4.1.85.Final</netty.version>
+ <netty.version>4.1.89.Final</netty.version>
<ognl.version>3.3.4</ognl.version>
<okio.version>3.2.0</okio.version>
<okhttp.version>4.10.0</okhttp.version>
@@ -172,7 +172,7 @@
<opencsv.version>5.7.1</opencsv.version>
<paranamer.version>2.8</paranamer.version>
<perfmark.version>0.26.0</perfmark.version>
- <protobuf.version>3.21.9</protobuf.version>
+ <protobuf.version>3.21.12</protobuf.version>
<rhino.version>1.7.12</rhino.version>
<scala.version>2.12.17</scala.version>
<slf4j.version>2.0.4</slf4j.version>