From cc0f354b591859917acb63af1e357836cd3aac75 Mon Sep 17 00:00:00 2001 From: Jake Van Vorhis <83739412+jakedoublev@users.noreply.github.com> Date: Mon, 14 Apr 2025 13:32:35 -0700 Subject: [PATCH 01/12] chore(deps): bump protovalidate to latest 0.6.0 --- sdk/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/pom.xml b/sdk/pom.xml index 76349a8a..76cf5be9 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -62,7 +62,7 @@ build.buf protovalidate - 0.1.9 + 0.6.0 compile From 0f1acc7e6e8ef6c3c4e8d159de819ea5f48752f4 Mon Sep 17 00:00:00 2001 From: Jake Van Vorhis <83739412+jakedoublev@users.noreply.github.com> Date: Mon, 14 Apr 2025 13:35:31 -0700 Subject: [PATCH 02/12] compatible com.google.protobuf compile dependency 4.30.2 bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c8ce0f5c..1902dd94 100644 --- a/pom.xml +++ b/pom.xml @@ -123,7 +123,7 @@ com.google.protobuf protobuf-java - 3.25.5 + 4.30.2 org.slf4j From 7af0e817269ed3587207a812e5ddf6776213e2bd Mon Sep 17 00:00:00 2001 From: Jake Van Vorhis <83739412+jakedoublev@users.noreply.github.com> Date: Mon, 14 Apr 2025 13:38:38 -0700 Subject: [PATCH 03/12] bump runtime guava dependency --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1902dd94..46ca8691 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ com.google.guava guava - 33.2.1-android + 33.4.7-android com.google.protobuf From e2653f968026b1c7b4bf854e2f93a4385594ea89 Mon Sep 17 00:00:00 2001 From: Jake Van Vorhis <83739412+jakedoublev@users.noreply.github.com> Date: Mon, 14 Apr 2025 13:42:49 -0700 Subject: [PATCH 04/12] test bump gson to 2.13 --- sdk/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/pom.xml b/sdk/pom.xml index 76cf5be9..3de4713a 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -42,7 +42,7 @@ com.google.code.gson gson - 2.11.0 + 2.13.0 com.vdurmont From 9b7eebd8621dcfd3649962b6362905e67179c8ea Mon Sep 17 00:00:00 2001 From: Jake Van Vorhis <83739412+jakedoublev@users.noreply.github.com> Date: Mon, 14 Apr 2025 13:46:53 -0700 Subject: [PATCH 05/12] bump com.google.errorprone to 2.37.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 46ca8691..47d0fbcc 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,7 @@ com.google.errorprone error_prone_annotations - 2.28.0 + 2.37.0 com.google.guava From 0f7ef2b1184e4806d4cc2e806b093647b6e59f34 Mon Sep 17 00:00:00 2001 From: Jake Van Vorhis <83739412+jakedoublev@users.noreply.github.com> Date: Mon, 14 Apr 2025 13:50:25 -0700 Subject: [PATCH 06/12] bump grpc version to 1.71.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 47d0fbcc..7dd426aa 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 11 11 2.20.0 - 1.68.0 + 1.71.0 3.25.3 8.3.5 From 7f510788d289d806ad86fd0f1ba90992574fce80 Mon Sep 17 00:00:00 2001 From: Jake Van Vorhis <83739412+jakedoublev@users.noreply.github.com> Date: Mon, 14 Apr 2025 13:52:14 -0700 Subject: [PATCH 07/12] test gson bump at the root (2.13.0) --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 7dd426aa..b58ee0ec 100644 --- a/pom.xml +++ b/pom.xml @@ -125,6 +125,11 @@ protobuf-java 4.30.2 + + com.google.code.gson + gson + 2.13.0 + org.slf4j slf4j-api From 60fe31c243a1496649cdd51ff05c31f3821354f6 Mon Sep 17 00:00:00 2001 From: Jake Van Vorhis <83739412+jakedoublev@users.noreply.github.com> Date: Mon, 14 Apr 2025 13:59:09 -0700 Subject: [PATCH 08/12] test jspecify version 1.0.0 override --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index b58ee0ec..9f8062ac 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,7 @@ 1.71.0 3.25.3 8.3.5 + 1.0.0 From 19cd40b1092767366a44d03c92314972c193f95f Mon Sep 17 00:00:00 2001 From: Jake Van Vorhis <83739412+jakedoublev@users.noreply.github.com> Date: Mon, 14 Apr 2025 14:05:13 -0700 Subject: [PATCH 09/12] try pinning jspecify to 1.0.0 --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f8062ac..29a0c24e 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,6 @@ 1.71.0 3.25.3 8.3.5 - 1.0.0 @@ -131,6 +130,11 @@ gson 2.13.0 + + org.jspecify + jspecify + 1.0.0 + org.slf4j slf4j-api From 5816390422c08eacbc9fce3dbe7a797a97e0e8e5 Mon Sep 17 00:00:00 2001 From: Jake Van Vorhis <83739412+jakedoublev@users.noreply.github.com> Date: Mon, 14 Apr 2025 14:17:37 -0700 Subject: [PATCH 10/12] bump examples gson --- examples/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pom.xml b/examples/pom.xml index 86163783..d59dee89 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -51,7 +51,7 @@ com.google.code.gson gson - 2.11.0 + 2.13.0 org.apache.logging.log4j From 43cdbc5ff77cf45b5d5dc60f092deb1cab3e63e0 Mon Sep 17 00:00:00 2001 From: jakedoublev Date: Mon, 14 Apr 2025 14:50:24 -0700 Subject: [PATCH 11/12] test copy/pasting lockfile from opentdf/platform --- sdk/buf.lock | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/sdk/buf.lock b/sdk/buf.lock index deef61e8..10d51eb7 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 - commit: f05a6f4403ce4327bae4f50f281c3ed0 - digest: shake256:668a0661b8df44d41839194896329330965fc215f3d2f88057fd60eeb759c2daf6cc6edfdd13b2a653d49fe2896ebedcb1a33c4c5b2dd10919f03ffb7fc52ae6 - - remote: buf.build - owner: googleapis - repository: googleapis - commit: 7e6f6e774e29406da95bd61cdcdbc8bc - digest: shake256:fe43dd2265ea0c07d76bd925eeba612667cf4c948d2ce53d6e367e1b4b3cb5fa69a51e6acb1a6a50d32f894f054a35e6c0406f6808a483f2752e10c866ffbf73 - - remote: buf.build - owner: grpc-ecosystem - repository: grpc-gateway - commit: 3f42134f4c564983838425bc43c7a65f - digest: shake256:3d11d4c0fe5e05fda0131afefbce233940e27f0c31c5d4e385686aea58ccd30f72053f61af432fa83f1fc11cda57f5f18ca3da26a29064f73c5a0d076bba8d92 \ No newline at end of file + - name: buf.build/bufbuild/protovalidate + commit: 63bb56e204954558946a641ef0d68910 + digest: b5:ec5661b2855484eca2043fe61d27eb22673ab926ccd0e849531752eb17b08402fae1382705cee7f7b42d4d9ec56aff72bba7ec6835902cf6f86323c9ac682d16 + - name: buf.build/googleapis/googleapis + commit: 83c0f6c19b2f4ea0b0fd84a80e753659 + digest: b5:e9d077ad9d2eaa08a056108a15292a69548880d3a935781c498f2e591e60e531e49e1f5fc1d7356e5f989d3a8540e9885a02df18cb0cecc4ffa439fa4438a09e + - name: buf.build/grpc-ecosystem/grpc-gateway + commit: 4c5ba75caaf84e928b7137ae5c18c26a + digest: b5:c113e62fb3b29289af785866cae062b55ec8ae19ab3f08f3004098928fbca657730a06810b2012951294326b95669547194fa84476b9e9b688d4f8bf77a0691d From 970eca28d0dd35e94848b5ef1e80cee80eb13e17 Mon Sep 17 00:00:00 2001 From: Jake Van Vorhis <83739412+jakedoublev@users.noreply.github.com> Date: Mon, 14 Apr 2025 16:05:16 -0700 Subject: [PATCH 12/12] try v1 lockfile --- sdk/buf.lock | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/sdk/buf.lock b/sdk/buf.lock index 10d51eb7..a99974f7 100644 --- a/sdk/buf.lock +++ b/sdk/buf.lock @@ -1,12 +1,18 @@ # Generated by buf. DO NOT EDIT. -version: v2 +version: v1 deps: - - name: buf.build/bufbuild/protovalidate + - remote: buf.build + owner: bufbuild + repository: protovalidate commit: 63bb56e204954558946a641ef0d68910 - digest: b5:ec5661b2855484eca2043fe61d27eb22673ab926ccd0e849531752eb17b08402fae1382705cee7f7b42d4d9ec56aff72bba7ec6835902cf6f86323c9ac682d16 - - name: buf.build/googleapis/googleapis - commit: 83c0f6c19b2f4ea0b0fd84a80e753659 - digest: b5:e9d077ad9d2eaa08a056108a15292a69548880d3a935781c498f2e591e60e531e49e1f5fc1d7356e5f989d3a8540e9885a02df18cb0cecc4ffa439fa4438a09e - - name: buf.build/grpc-ecosystem/grpc-gateway + digest: shake256:1ccb2153a5ff5906729567f09f3e5bb6b6de356dc875eb4d12572097b9d6f9ab773b44d88e0a4c2052abca9ca60f3edfea71b1f51bfe5ea25b32a083e8e083b6 + - remote: buf.build + owner: googleapis + repository: googleapis + commit: 61b203b9a9164be9a834f58c37be6f62 + digest: shake256:e619113001d6e284ee8a92b1561e5d4ea89a47b28bf0410815cb2fa23914df8be9f1a6a98dcf069f5bc2d829a2cfb1ac614863be45cd4f8a5ad8606c5f200224 + - remote: buf.build + owner: grpc-ecosystem + repository: grpc-gateway commit: 4c5ba75caaf84e928b7137ae5c18c26a - digest: b5:c113e62fb3b29289af785866cae062b55ec8ae19ab3f08f3004098928fbca657730a06810b2012951294326b95669547194fa84476b9e9b688d4f8bf77a0691d + digest: shake256:e174ad9408f3e608f6157907153ffec8d310783ee354f821f57178ffbeeb8faa6bb70b41b61099c1783c82fe16210ebd1279bc9c9ee6da5cffba9f0e675b8b99 \ No newline at end of file