From f1e49fb7fbeadcb54fa02907ee29d71e7fcff2ad Mon Sep 17 00:00:00 2001
From: Martijn Visser <martijnvisser@apache.org>
Date: Mon, 24 Apr 2023 14:52:01 +0200
Subject: [PATCH 1/3] [FLINK-26910][Benchmarks] Update Protobuf version.

This sync the version back to the currently used version in Flink and resolves compilation issues on Mac M1s.
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3bcc4f3..a55c8c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@ under the License.
 		<maven.compiler.version>3.1</maven.compiler.version>
 		<chill.version>0.7.6</chill.version>
 		<thrift.version>0.13.0</thrift.version>
-		<protobuf.version>3.11.4</protobuf.version>
+		<protobuf.version>3.21.7</protobuf.version>
 		<netty-tcnative.flavor>dynamic</netty-tcnative.flavor>
 		<benchmarkExcludes>org.apache.flink.benchmark.full.*,org.apache.flink.state.benchmark.*,org.apache.flink.scheduler.benchmark.*</benchmarkExcludes>
 		<benchmarks>.*</benchmarks>

From 913970bec6d42fe23d98d03a59aa89aaea123373 Mon Sep 17 00:00:00 2001
From: Martijn Visser <martijnvisser@apache.org>
Date: Mon, 24 Apr 2023 16:16:58 +0200
Subject: [PATCH 2/3] [FLINK-31925][Benchmarks] Update and sync dependency
 versions

This commit either syncs versions to the version used in Flink itself, or to the latest available version
---
 pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index a55c8c9..9084a51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,14 +52,14 @@ under the License.
 		<scala.binary.version>2.12</scala.binary.version>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
-		<slf4j.version>1.7.7</slf4j.version>
+		<slf4j.version>1.7.36</slf4j.version>
 		<log4j.version>1.2.17</log4j.version>
-		<jmh.version>1.19</jmh.version>
-		<junit.version>4.12</junit.version>
-		<avro.version>1.8.2</avro.version>
-		<mockito.version>2.21.0</mockito.version>
+		<jmh.version>1.36</jmh.version>
+		<junit.version>4.13.2</junit.version>
+		<avro.version>1.11.1</avro.version>
+		<mockito.version>3.4.6</mockito.version>
 		<maven.exec.version>1.6.0</maven.exec.version>
-		<maven.compiler.version>3.1</maven.compiler.version>
+		<maven.compiler.version>3.8.0</maven.compiler.version>
 		<chill.version>0.7.6</chill.version>
 		<thrift.version>0.13.0</thrift.version>
 		<protobuf.version>3.21.7</protobuf.version>

From a2e465a794e1a8424d7a3ef18545e760e3896ab7 Mon Sep 17 00:00:00 2001
From: Martijn Visser <mvisser@confluent.io>
Date: Tue, 25 Apr 2023 09:57:55 +0200
Subject: [PATCH 3/3] [hotfix] Update `setup-maven` Github Actions workflow to
 latest version

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a0e27f9..4586aa6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
           cache: 'maven'
 
       - name: Set Maven 3.8.6
-        uses: stCarolas/setup-maven@v4.2
+        uses: stCarolas/setup-maven@v4.5
         with:
           maven-version: 3.8.6