From f427d7458eab9fd245d06beca817bae943b7add3 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried <mail@leonard.io>
Date: Thu, 7 Nov 2024 22:06:32 +0100
Subject: [PATCH 1/2] Update to latest version of protobuf compiler and Java
 runtime

---
 pom.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index e33021e..1ee173a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,9 +31,20 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <protoc.version>4.28.3</protoc.version>
   </properties>
 
   <build>
+    <extensions>
+      <!-- makes build variables like os.detected.classifier available.
+           use to select the correct protoc instance for the OS.
+           see protobuf-maven-plugin below -->
+      <extension>
+        <groupId>kr.motd.maven</groupId>
+        <artifactId>os-maven-plugin</artifactId>
+        <version>1.7.1</version>
+      </extension>
+    </extensions>
     <sourceDirectory>${basedir}/src.java</sourceDirectory>
     <testSourceDirectory>${basedir}/test.java</testSourceDirectory>
 
@@ -59,7 +70,7 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <version>0.6.1</version>
         <configuration>
-          <protocExecutable>protoc</protocExecutable>
+          <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
         </configuration>
         <executions>
           <execution>
@@ -143,7 +154,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>3.16.3</version>
+      <version>4.28.3</version>
     </dependency>
   </dependencies>
 

From 505052800ec72de4a4f3e5904b5b46e47e6612a8 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried <mail@leonard.io>
Date: Thu, 7 Nov 2024 22:09:23 +0100
Subject: [PATCH 2/2] Use single variable for compiler and runtime

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1ee173a..f62df19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <protoc.version>4.28.3</protoc.version>
+    <protobuf.version>4.28.3</protobuf.version>
   </properties>
 
   <build>
@@ -70,7 +70,7 @@
         <artifactId>protobuf-maven-plugin</artifactId>
         <version>0.6.1</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
         </configuration>
         <executions>
           <execution>
@@ -154,7 +154,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>4.28.3</version>
+      <version>${protobuf.version}</version>
     </dependency>
   </dependencies>