From 2169c00b604797eb104deecf8926eff7ae483a69 Mon Sep 17 00:00:00 2001
From: Jan Lukavsky <je.ik@seznam.cz>
Date: Thu, 13 Jul 2023 10:09:58 +0200
Subject: [PATCH] [proxima-beam] validate beam 2.54.0

---
 .../beam/core/direct/io/BatchLogReadTest.java     | 15 ++++++++++++++-
 build.gradle                                      |  3 +++
 .../groovy/cz.o2.proxima.java-conventions.gradle  |  4 ++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/beam/core/src/test/java/cz/o2/proxima/beam/core/direct/io/BatchLogReadTest.java b/beam/core/src/test/java/cz/o2/proxima/beam/core/direct/io/BatchLogReadTest.java
index 6aa25ff5e..634f0b137 100644
--- a/beam/core/src/test/java/cz/o2/proxima/beam/core/direct/io/BatchLogReadTest.java
+++ b/beam/core/src/test/java/cz/o2/proxima/beam/core/direct/io/BatchLogReadTest.java
@@ -37,6 +37,7 @@
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
@@ -56,7 +57,9 @@
 import org.apache.beam.sdk.transforms.PTransform;
 import org.apache.beam.sdk.transforms.Sum;
 import org.apache.beam.sdk.transforms.windowing.AfterWatermark;
+import org.apache.beam.sdk.transforms.windowing.BoundedWindow;
 import org.apache.beam.sdk.transforms.windowing.GlobalWindows;
+import org.apache.beam.sdk.transforms.windowing.PaneInfo;
 import org.apache.beam.sdk.transforms.windowing.Repeatedly;
 import org.apache.beam.sdk.transforms.windowing.Window;
 import org.apache.beam.sdk.values.PBegin;
@@ -231,7 +234,7 @@ public void testInitialSplitting() {
     List<PartitionList> output = new ArrayList<>();
     readFn.splitRestriction(
         list,
-        new OutputReceiver<PartitionList>() {
+        new OutputReceiver<>() {
           @Override
           public void output(PartitionList part) {
             output.add(part);
@@ -241,6 +244,16 @@ public void output(PartitionList part) {
           public void outputWithTimestamp(PartitionList part, org.joda.time.Instant timestamp) {
             output(part);
           }
+
+          @Override
+          public void outputWindowedValue(
+              PartitionList output,
+              org.joda.time.Instant timestamp,
+              Collection<? extends BoundedWindow> windows,
+              PaneInfo paneInfo) {
+
+            outputWithTimestamp(output, timestamp);
+          }
         });
     assertEquals(100, output.size());
     for (PartitionList partitionList : output) {
diff --git a/build.gradle b/build.gradle
index cdf37dc3f..5bafcc172 100644
--- a/build.gradle
+++ b/build.gradle
@@ -229,6 +229,9 @@ def configureRepositores(project) {
       maven {
         url = uri('https://packages.confluent.io/maven/')
       }
+      maven {
+        url = uri('https://repository.apache.org/content/repositories/orgapachebeam-1367/')
+      }
       if (project.version.endsWith("-SNAPSHOT")) {
         maven {
           url = uri("https://oss.sonatype.org/content/repositories/snapshots")
diff --git a/buildSrc/src/main/groovy/cz.o2.proxima.java-conventions.gradle b/buildSrc/src/main/groovy/cz.o2.proxima.java-conventions.gradle
index 1f5a492c0..7af934855 100644
--- a/buildSrc/src/main/groovy/cz.o2.proxima.java-conventions.gradle
+++ b/buildSrc/src/main/groovy/cz.o2.proxima.java-conventions.gradle
@@ -24,10 +24,10 @@ plugins {
 java.sourceCompatibility = JavaVersion.VERSION_11
 
 def auto_service_version = "1.1.1"
-def beam_version = "2.53.0"
+def beam_version = "2.54.0"
 def errorprone_version = "2.18.0"
 def flink_version = "1.16.2"
-def grpc_version = "1.59.1"
+def grpc_version = "1.60.1"
 def groovy_version = "4.0.17"
 def guava_version = "32.1.2-jre"
 def hadoop_version = "3.2.4"