From 178e3cd9ad0b1e0a019cd9aedb40fab5fd8b80f8 Mon Sep 17 00:00:00 2001
From: David Mihalcik <dmihalcik@virtru.com>
Date: Fri, 11 Oct 2024 09:27:02 -0400
Subject: [PATCH] chore(sdk): Updates build config and deps

---
 sdk/buf.gen.yaml | 22 +++++++++++++---------
 sdk/buf.lock     | 20 +++++++-------------
 sdk/buf.yaml     | 21 +++++++++++++--------
 sdk/pom.xml      |  5 +++++
 4 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/sdk/buf.gen.yaml b/sdk/buf.gen.yaml
index 6bb9c4e3..9c892f10 100644
--- a/sdk/buf.gen.yaml
+++ b/sdk/buf.gen.yaml
@@ -1,14 +1,18 @@
-version: v1
+version: v2
 managed:
   enabled: true
-  java_package_prefix:
-    default: io.opentdf.platform
-    except:
-      - buf.build/bufbuild/protovalidate
-      - buf.build/googleapis/googleapis
-      - buf.build/grpc-ecosystem/grpc-gateway
+  disable:
+    - file_option: java_package
+      module: buf.build/bufbuild/protovalidate
+    - file_option: java_package
+      module: buf.build/googleapis/googleapis
+    - file_option: java_package
+      module: buf.build/grpc-ecosystem/grpc-gateway
+  override:
+    - file_option: java_package_prefix
+      value: io.opentdf.platform
 plugins:
-  - plugin: buf.build/protocolbuffers/java:v25.3
+  - remote: buf.build/protocolbuffers/java:v28.2
     out: ./
-  - plugin: buf.build/grpc/java:v1.61.1
+  - remote: buf.build/grpc/java:v1.61.1
     out: ./
diff --git a/sdk/buf.lock b/sdk/buf.lock
index deef61e8..6cc49ead 100644
--- a/sdk/buf.lock
+++ b/sdk/buf.lock
@@ -1,18 +1,12 @@
 # Generated by buf. DO NOT EDIT.
-version: v1
+version: v2
 deps:
-  - remote: buf.build
-    owner: bufbuild
-    repository: protovalidate
+  - name: buf.build/bufbuild/protovalidate
     commit: f05a6f4403ce4327bae4f50f281c3ed0
-    digest: shake256:668a0661b8df44d41839194896329330965fc215f3d2f88057fd60eeb759c2daf6cc6edfdd13b2a653d49fe2896ebedcb1a33c4c5b2dd10919f03ffb7fc52ae6
-  - remote: buf.build
-    owner: googleapis
-    repository: googleapis
+    digest: b5:f1d76430ee97c89cd2044e9ae1c510887b701ee7bca60564ebf82e3919e53cacefc830a0eb803277c2d98c5f313b4167e8914afc9f214332717a50b5e170e6f4
+  - name: buf.build/googleapis/googleapis
     commit: 7e6f6e774e29406da95bd61cdcdbc8bc
-    digest: shake256:fe43dd2265ea0c07d76bd925eeba612667cf4c948d2ce53d6e367e1b4b3cb5fa69a51e6acb1a6a50d32f894f054a35e6c0406f6808a483f2752e10c866ffbf73
-  - remote: buf.build
-    owner: grpc-ecosystem
-    repository: grpc-gateway
+    digest: b5:654225f30f2351e6515417825836cb4bd5df3d952f6086e406957f80e03c8ee00c67739b836b87e06f2ff90a6f44675ad175e47ea5aef29ee909b91a29bdd334
+  - name: buf.build/grpc-ecosystem/grpc-gateway
     commit: 3f42134f4c564983838425bc43c7a65f
-    digest: shake256:3d11d4c0fe5e05fda0131afefbce233940e27f0c31c5d4e385686aea58ccd30f72053f61af432fa83f1fc11cda57f5f18ca3da26a29064f73c5a0d076bba8d92
\ No newline at end of file
+    digest: b5:291b947d8ac09492517557e4e72e294788cb8201afc7d0df7bda80fa10931adb60d4d669208a7696bf24f1ecb2a33a16d4c1e766e6f31809248b00343119569b
diff --git a/sdk/buf.yaml b/sdk/buf.yaml
index 2dc8eb0e..0c330db3 100644
--- a/sdk/buf.yaml
+++ b/sdk/buf.yaml
@@ -1,22 +1,27 @@
-version: v1
+version: v2
 deps:
   - buf.build/bufbuild/protovalidate
   - buf.build/googleapis/googleapis
   - buf.build/grpc-ecosystem/grpc-gateway
-breaking:
-  use:
-    - FILE
-    - PACKAGE
-    - WIRE_JSON
-    - WIRE
 lint:
-  allow_comment_ignores: true
   use:
     - DEFAULT
   except:
+    - FIELD_NOT_REQUIRED
+    - PACKAGE_NO_IMPORT_CYCLE
     - PACKAGE_VERSION_SUFFIX
   ignore_only:
     PACKAGE_VERSION_SUFFIX:
       - google/api/annotations.proto
       - google/api/http.proto
       - google/protobuf/wrappers.proto
+breaking:
+  use:
+    - FILE
+    - PACKAGE
+    - WIRE
+    - WIRE_JSON
+  except:
+    - EXTENSION_NO_DELETE
+    - FIELD_SAME_DEFAULT
+    - PACKAGE_EXTENSION_NO_DELETE
diff --git a/sdk/pom.xml b/sdk/pom.xml
index 890ba1e3..978d64d0 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -40,6 +40,11 @@
             <artifactId>gson</artifactId>
             <version>2.11.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>4.28.2</version>
+        </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>