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/06/01 19:23:37 UTC
[hop] branch master updated: Apache Beam upgraded to 2.48.0. fixes #2981
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 49d2f0d191 Apache Beam upgraded to 2.48.0. fixes #2981
new d2756fbcd0 Merge pull request #2984 from bamaer/2981
49d2f0d191 is described below
commit 49d2f0d191f7984413985acdddc24684c0dc8df7
Author: Bart Maertens <ba...@know.bi>
AuthorDate: Thu Jun 1 20:42:37 2023 +0200
Apache Beam upgraded to 2.48.0. fixes #2981
---
assemblies/plugins/engines/beam/pom.xml | 2 +-
assemblies/plugins/engines/beam/src/assembly/assembly.xml | 2 +-
docker/integration-tests/integration-tests-flink.yaml | 6 +++---
plugins/engines/beam/pom.xml | 2 +-
.../java/org/apache/hop/beam/pipeline/fatjar/FatJarBuilder.java | 1 +
pom.xml | 6 +++---
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/assemblies/plugins/engines/beam/pom.xml b/assemblies/plugins/engines/beam/pom.xml
index f2da2def69..aaed77963b 100644
--- a/assemblies/plugins/engines/beam/pom.xml
+++ b/assemblies/plugins/engines/beam/pom.xml
@@ -338,7 +338,7 @@
</dependency>
<dependency>
<groupId>org.apache.beam</groupId>
- <artifactId>beam-runners-flink-1.15</artifactId>
+ <artifactId>beam-runners-flink-1.16</artifactId>
<version>${apache-beam.version}</version>
<exclusions>
<exclusion>
diff --git a/assemblies/plugins/engines/beam/src/assembly/assembly.xml b/assemblies/plugins/engines/beam/src/assembly/assembly.xml
index 9d149d2380..334acb6df4 100644
--- a/assemblies/plugins/engines/beam/src/assembly/assembly.xml
+++ b/assemblies/plugins/engines/beam/src/assembly/assembly.xml
@@ -152,7 +152,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-runners-direct-java</include>
- <include>org.apache.beam:beam-runners-flink-1.15</include>
+ <include>org.apache.beam:beam-runners-flink-1.16</include>
<include>org.apache.beam:beam-runners-google-cloud-dataflow-java</include>
<include>org.apache.beam:beam-runners-java-fn-execution</include>
<include>org.apache.beam:beam-runners-spark-3</include>
diff --git a/docker/integration-tests/integration-tests-flink.yaml b/docker/integration-tests/integration-tests-flink.yaml
index 41173416b7..ae6eddb5ee 100644
--- a/docker/integration-tests/integration-tests-flink.yaml
+++ b/docker/integration-tests/integration-tests-flink.yaml
@@ -28,7 +28,7 @@ services:
- taskmanager
jobmanager:
- image: flink:1.15.2-java11
+ image: flink:1.16.2-java11
ports:
- "8081"
command: jobmanager
@@ -38,7 +38,7 @@ services:
jobmanager.rpc.address: jobmanager
taskmanager:
- image: flink:1.15.2-java11
+ image: flink:1.16.2-java11
depends_on:
- jobmanager
command: taskmanager
@@ -47,4 +47,4 @@ services:
- |
FLINK_PROPERTIES=
jobmanager.rpc.address: jobmanager
- taskmanager.numberOfTaskSlots: 2
\ No newline at end of file
+ taskmanager.numberOfTaskSlots: 2
diff --git a/plugins/engines/beam/pom.xml b/plugins/engines/beam/pom.xml
index 6229b0f179..1d276f76b5 100644
--- a/plugins/engines/beam/pom.xml
+++ b/plugins/engines/beam/pom.xml
@@ -285,7 +285,7 @@
</dependency>
<dependency>
<groupId>org.apache.beam</groupId>
- <artifactId>beam-runners-flink-1.15</artifactId>
+ <artifactId>beam-runners-flink-1.16</artifactId>
<version>${apache-beam.version}</version>
<exclusions>
<exclusion>
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 5caa1d99f8..0200dd7f5c 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
@@ -191,6 +191,7 @@ public class FatJarBuilder {
|| jarFileBaseName.startsWith("beam-sdks-java-io")
|| jarFileBaseName.startsWith("beam-runners-spark")
|| jarFileBaseName.startsWith("beam-runners-direct")
+ || jarFileBaseName.startsWith("beam-runners-flink")
|| jarFileBaseName.startsWith("beam-sdks-java-core")
|| jarFileBaseName.startsWith("beam-runners-core")) {
index = false;
diff --git a/pom.xml b/pom.xml
index 1c705b9c3a..6eacc12a6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,9 +112,9 @@
<akka.version>2.5.32</akka.version>
<accessors-smart.version>2.4.9</accessors-smart.version>
<avro.version>1.11.1</avro.version>
- <apache-beam.version>2.46.0</apache-beam.version>
- <apache-spark.version>3.3.0</apache-spark.version>
- <apache-flink.version>1.15.4</apache-flink.version>
+ <apache-beam.version>2.48.0</apache-beam.version>
+ <apache-spark.version>3.4.0</apache-spark.version>
+ <apache-flink.version>1.16.2</apache-flink.version>
<asm.version>9.3</asm.version>
<aws-java-sdk.version>1.12.347</aws-java-sdk.version>
<batik.version>1.16</batik.version>