Add constraint to protocol buffer lib (#1090)

DataBiosphere · Dec 5, 2024 · a392b40 · a392b40
1 parent 964b377
commit a392b40
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 29 deletions.
diff --git a/annotationProcessor/build.gradle b/annotationProcessor/build.gradle
@@ -3,7 +3,6 @@ plugins {
 
     // These plugins are needed to resolve versions of spring dependencies
     // transitively added by terra-common-lib
-    id 'io.spring.dependency-management' version "${vSpringDepMgt}"
     id 'org.springframework.boot' version "${vSpringBoot}"
 }
 

diff --git a/annotationProcessor/gradle.lockfile b/annotationProcessor/gradle.lockfile
@@ -136,8 +136,8 @@ com.google.http-client:google-http-client-protobuf:1.45.0=productionRuntimeClass
 com.google.http-client:google-http-client:1.45.0=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.google.oauth-client:google-oauth-client:1.36.0=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java-util:4.28.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:4.28.3=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java-util:3.25.5=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.5=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.google.re2j:re2j:1.7=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.ibm.icu:icu4j:73.2=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.lmax:disruptor:3.4.2=productionRuntimeClasspath,runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath

diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,6 @@ buildscript {
     ext {
         // plugin versions
         vSpringBoot = '3.3.6'
-        vSpringDepMgt = '1.1.6'
         vHidetakeSwagger = '2.19.2'
         vGoogleProtobuf = '0.9.4'
 
@@ -13,13 +12,13 @@ buildscript {
 
         // library versions
         vPmd = '7.1.0'
-        vGoogleProtobufProtoc = '4.28.3'
+        vGoogleProtobufProtoc = '3.25.5'
         vTerraCommonLib = '1.1.22-SNAPSHOT'
         vApacheCommonsText = '1.12.0'
         vSlf4jApi = '2.0.16'
         vSpotBugs = '4.8.6'
-        vJackson = '2.17.3'
-        vJersey = '3.1.9' // Java 17 compatible
+        vJackson = '2.18.0'
+        vJersey = '3.1.9'
         vSwaggerAnnotations = '2.2.25'
         vSwaggerCodegen = '3.0.63'
         vPicocliVersion = '4.7.6'

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -18,4 +18,5 @@ dependencies {
     // Specify the version of each plugin used in buildSrc/src/*.gradle.
     implementation 'com.diffplug.spotless:spotless-plugin-gradle:6.25.0'
     implementation 'ru.vyarus:gradle-quality-plugin:5.0.0'
+    implementation 'io.spring.dependency-management:io.spring.dependency-management.gradle.plugin:1.1.6'
 }
diff --git a/buildSrc/src/main/groovy/tanagra.java-conventions.gradle b/buildSrc/src/main/groovy/tanagra.java-conventions.gradle
@@ -14,6 +14,7 @@ plugins {
     id 'jacoco'
     id 'maven-publish'
     id 'java-test-fixtures'
+    id 'io.spring.dependency-management'
 
     // Other tanagra plugin conventions.
     id 'tanagra.spotless-conventions'
@@ -50,6 +51,14 @@ dependencyLocking {
     lockAllConfigurations()
 }
 
+dependencyManagement {
+    dependencies {
+        // GCP BOM includes 4.x protobuf versions which are not compatible with current beam libs
+        dependency "com.google.protobuf:protobuf-java:${vGoogleProtobufProtoc}"
+        dependency "com.google.protobuf:protobuf-java-util:${vGoogleProtobufProtoc}"
+    }
+}
+
 dependencies {
     // GCP BOM - See https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM
     implementation platform('com.google.cloud:libraries-bom:26.50.0')

diff --git a/cli/gradle.lockfile b/cli/gradle.lockfile
@@ -3,11 +3,11 @@
 # This file is expected to be part of source control.
 ch.qos.logback:logback-classic:1.5.8=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 ch.qos.logback:logback-core:1.5.8=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-annotations:2.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-core:2.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-databind:2.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.fasterxml.jackson:jackson-bom:2.17.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-annotations:2.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-core:2.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-databind:2.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson:jackson-bom:2.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
 com.github.spotbugs:spotbugs-annotations:4.8.6=compileClasspath,spotbugs,testCompileClasspath
 com.github.spotbugs:spotbugs:4.8.6=spotbugs

diff --git a/client/build.gradle b/client/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id 'maven-publish'
 
     id 'com.jfrog.artifactory' version '5.2.2'
-    id 'io.spring.dependency-management' version "${vSpringDepMgt}"
+    id 'io.spring.dependency-management'
     id 'org.springframework.boot' version "${vSpringBoot}"
     id 'org.hidetake.swagger.generator' version "${vHidetakeSwagger}"
 }

diff --git a/indexer/gradle.lockfile b/indexer/gradle.lockfile
@@ -113,8 +113,8 @@ com.google.http-client:google-http-client-protobuf:1.45.0=compileClasspath,runti
 com.google.http-client:google-http-client:1.45.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.google.oauth-client:google-oauth-client:1.36.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java-util:4.28.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:4.28.3=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java-util:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.5=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.google.re2j:re2j:1.7=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.ibm.icu:icu4j:73.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.lmax:disruptor:3.4.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
@@ -226,8 +226,7 @@ jakarta.xml.bind:jakarta.xml.bind-api:4.0.0=runtimeClasspath,testFixturesRuntime
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.0=spotbugs
 joda-time:joda-time:2.12.7=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
-junit:junit:4.13.1=testCompileClasspath
-junit:junit:4.13.2=testRuntimeClasspath
+junit:junit:4.13.1=testCompileClasspath,testRuntimeClasspath
 net.bytebuddy:byte-buddy:1.14.12=compileClasspath,testCompileClasspath
 net.bytebuddy:byte-buddy:1.14.15=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
 net.sf.saxon:Saxon-HE:12.4=checkstyle,pmd,spotbugs

diff --git a/service/build.gradle b/service/build.gradle
@@ -4,7 +4,6 @@ plugins {
     id 'tanagra.java-conventions'
 
     id 'com.google.cloud.tools.jib' version '3.4.4'
-    id 'io.spring.dependency-management' version "${vSpringDepMgt}"
     id 'org.springframework.boot' version "${vSpringBoot}"
     id 'org.hidetake.swagger.generator' version "${vHidetakeSwagger}"
     id 'org.barfuin.gradle.taskinfo' version '2.2.0'

diff --git a/service/gradle.lockfile b/service/gradle.lockfile
@@ -11,16 +11,21 @@ ch.qos.logback:logback-core:1.5.12=compileClasspath,compileProtoPath,productionR
 com.charleskorn.kaml:kaml-jvm:0.60.0=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.charleskorn.kaml:kaml:0.60.0=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-annotations:2.17.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.fasterxml.jackson.core:jackson-core:2.17.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson.core:jackson-core:2.17.3=testFixturesCompileProtoPath,testFixturesRuntimeClasspath
+com.fasterxml.jackson.core:jackson-core:2.18.0=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
 com.fasterxml.jackson.core:jackson-databind:2.17.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.3=testFixturesCompileProtoPath,testFixturesRuntimeClasspath
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.0=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
 com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.17.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.3=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.3=testFixturesCompileProtoPath,testFixturesRuntimeClasspath
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.0=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
 com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.17.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.17.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.17.3=testFixturesCompileProtoPath,testFixturesRuntimeClasspath
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.18.0=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
 com.fasterxml.jackson.module:jackson-module-parameter-names:2.17.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.fasterxml.jackson:jackson-bom:2.17.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.fasterxml.jackson:jackson-bom:2.17.3=testFixturesCompileProtoPath,testFixturesRuntimeClasspath
+com.fasterxml.jackson:jackson-bom:2.18.0=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
 com.fasterxml:classmate:1.7.0=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.github.ben-manes.caffeine:caffeine:3.1.8=testFixturesCompileProtoPath,testFixturesRuntimeClasspath
 com.github.jnr:jffi:1.3.13=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
@@ -135,9 +140,9 @@ com.google.http-client:google-http-client-protobuf:1.45.0=compileProtoPath,produ
 com.google.http-client:google-http-client:1.45.0=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.google.oauth-client:google-oauth-client:1.36.0=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java-util:4.28.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:4.28.3=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.google.protobuf:protoc:4.28.3=protobufToolsLocator_protoc
+com.google.protobuf:protobuf-java-util:3.25.5=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.5=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.google.protobuf:protoc:3.25.5=protobufToolsLocator_protoc
 com.google.re2j:re2j:1.7=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.ibm.icu:icu4j:73.2=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.jayway.jsonpath:json-path:2.9.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
@@ -267,7 +272,9 @@ jakarta.validation:jakarta.validation-api:3.0.2=compileClasspath,compileProtoPat
 jakarta.ws.rs:jakarta.ws.rs-api:3.1.0=testFixturesCompileProtoPath,testFixturesRuntimeClasspath
 jakarta.ws.rs:jakarta.ws.rs-api:4.0.0=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath
 jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
+javax.activation:javax.activation-api:1.2.0=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath
 javax.annotation:javax.annotation-api:1.3.2=compileClasspath,compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
+javax.xml.bind:jaxb-api:2.2.12=compileClasspath,testCompileClasspath
 javax.xml.bind:jaxb-api:2.3.1=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 jaxen:jaxen:2.0.0=spotbugs
 joda-time:joda-time:2.10.14=compileProtoPath,productionRuntimeClasspath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath

diff --git a/underlay/gradle.lockfile b/underlay/gradle.lockfile
@@ -69,9 +69,9 @@ com.google.http-client:google-http-client-jackson2:1.45.0=compileClasspath,compi
 com.google.http-client:google-http-client:1.45.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.google.j2objc:j2objc-annotations:3.0.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.google.oauth-client:google-oauth-client:1.36.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java-util:4.28.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.google.protobuf:protobuf-java:4.28.3=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
-com.google.protobuf:protoc:4.28.3=protobufToolsLocator_protoc
+com.google.protobuf:protobuf-java-util:3.25.5=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.google.protobuf:protobuf-java:3.25.5=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
+com.google.protobuf:protoc:3.25.5=protobufToolsLocator_protoc
 com.google.re2j:re2j:1.7=compileProtoPath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath
 com.puppycrawl.tools:checkstyle:10.12.7=checkstyle
 com.sun.istack:istack-commons-runtime:4.1.1=compileProtoPath,runtimeClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath