From 15f6fcde09095f649984048901da113b3a49704c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <soeren.henning@email.uni-kiel.de>
Date: Thu, 13 Jan 2022 19:00:22 +0100
Subject: [PATCH] Upgrade to Beam 2.35
---
theodolite-benchmarks/beam-commons/build.gradle | 4 ++--
.../buildSrc/src/main/groovy/theodolite.beam.flink.gradle | 4 ++--
.../buildSrc/src/main/groovy/theodolite.beam.gradle | 2 +-
.../buildSrc/src/main/groovy/theodolite.beam.samza.gradle | 2 +-
.../java/serialization/AggregatedActivePowerRecordCoder.java | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/theodolite-benchmarks/beam-commons/build.gradle b/theodolite-benchmarks/beam-commons/build.gradle
index 66ec44ad7..23ae16e7e 100644
--- a/theodolite-benchmarks/beam-commons/build.gradle
+++ b/theodolite-benchmarks/beam-commons/build.gradle
@@ -19,11 +19,11 @@ dependencies {
implementation 'com.google.code.gson:gson:2.8.2'
implementation 'com.google.guava:guava:24.1-jre'
- implementation('org.apache.beam:beam-sdks-java-io-kafka:2.22.0'){
+ implementation('org.apache.beam:beam-sdks-java-io-kafka:2.35.0'){
exclude group: 'org.apache.kafka', module: 'kafka-clients'
}
implementation group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.30'
- implementation group: 'org.apache.beam', name: 'beam-sdks-java-core', version: '2.22.0'
+ implementation group: 'org.apache.beam', name: 'beam-sdks-java-core', version: '2.35.0'
runtimeOnly 'org.slf4j:slf4j-api:1.7.32'
runtimeOnly 'org.slf4j:slf4j-jdk14:1.7.32'
diff --git a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.flink.gradle b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.flink.gradle
index eb9bda1f8..02bf925f8 100644
--- a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.flink.gradle
+++ b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.flink.gradle
@@ -3,6 +3,6 @@ plugins {
}
dependencies {
- implementation group: 'org.apache.beam', name: 'beam-runners-flink-1.12', version: '2.27.0'
- implementation group: 'org.apache.flink', name: 'flink-statebackend-rocksdb_2.11', version: '1.12.0'
+ implementation group: 'org.apache.beam', name: 'beam-runners-flink-1.13', version: '2.35.0'
+ implementation group: 'org.apache.flink', name: 'flink-statebackend-rocksdb_2.11', version: '1.13.0'
}
\ No newline at end of file
diff --git a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.gradle b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.gradle
index 09e36d521..df14f0b4a 100644
--- a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.gradle
+++ b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.gradle
@@ -18,7 +18,7 @@ repositories {
}
}
-def apacheBeamVersion = '2.22.0' //'2.27.0' // '2.34.0'
+def apacheBeamVersion = '2.35.0'
dependencies {
// These dependencies are used internally, and not exposed to consumers on their own compile classpath.
diff --git a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.samza.gradle b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.samza.gradle
index 73e916ccc..419d244dd 100644
--- a/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.samza.gradle
+++ b/theodolite-benchmarks/buildSrc/src/main/groovy/theodolite.beam.samza.gradle
@@ -3,7 +3,7 @@ plugins {
}
dependencies {
- implementation('org.apache.beam:beam-runners-samza:2.22.0') {
+ implementation('org.apache.beam:beam-runners-samza:2.35.0') {
exclude group: 'org.apache.samza', module: 'samza-yarn_2.11'
}
}
\ No newline at end of file
diff --git a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordCoder.java b/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordCoder.java
index d2b484f5a..1d539c0d0 100644
--- a/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordCoder.java
+++ b/theodolite-benchmarks/uc4-beam/src/main/java/serialization/AggregatedActivePowerRecordCoder.java
@@ -45,7 +45,7 @@ public class AggregatedActivePowerRecordCoder extends Coder<AggregatedActivePowe
@Override
public List<? extends Coder<?>> getCoderArguments() {
- return null;
+ return List.of();
}
@Override
--
GitLab