Upgrade to protobuf 3.25.5

core/utils/metadata-utils/src/main/protobuf/compile_protos.sh

@@ -2,5 +2,20 @@
 
 # Other projects use protostuff but, meh
 #
-for PROTO in `ls -1 *proto`; do protoc --java_out ../java $PROTO; done
+# override the default protof compiler and include path by setting either the PROTOC or PROTOC_INCLUDE_PATH
+# environment variable.
+
+SCRIPT_DIR=$(dirname "$0")
+
+PROTOC=${PROTOC:=protoc}
+PROTOC_INCLUDE_PATH=${PROTOC_INCLUDE_PATH:=/usr/local/include}
+PROTOC_VERSION=$(${PROTOC} --version)
+INPUT_FILES=$(ls ${SCRIPT_DIR}/*.proto)
+
+for PROTO in ${INPUT_FILES}; do
+    echo "Compiling ${PROTO} to java; SCRIPT_DIR=${SCRIPT_DIR} PROTOC=${PROTOC} PROTOC_INCLUDE_PATH=${PROTOC} PROTOC_VERSION=${PROTOC_VERSION}" 1>&2
+    protoc --java_out ${SCRIPT_DIR}/../java $PROTO
+done
+
+
 

microservices/services/query-metric/api/pom.xml

@@ -29,7 +29,7 @@
         <version.guava>31.1-jre</version.guava>
         <version.jackson>2.12.5</version.jackson>
         <version.jaxb-api>2.3.1</version.jaxb-api>
-        <version.protobuf-java>3.16.3</version.protobuf-java>
+        <version.protobuf-java>3.25.5</version.protobuf-java>
         <version.protostuff>1.6.2</version.protostuff>
         <version.slf4j>2.0.12</version.slf4j>
     </properties>

microservices/services/query-metric/service/pom.xml

@@ -32,7 +32,7 @@
         <version.datawave.starter-metrics>3.0.3</version.datawave.starter-metrics>
         <version.hazelcast-kubernetes>2.2.3</version.hazelcast-kubernetes>
         <version.in-memory-accumulo>4.0.0</version.in-memory-accumulo>
-        <version.protobuf-java>3.16.3</version.protobuf-java>
+        <version.protobuf-java>3.25.5</version.protobuf-java>
         <version.slf4j>2.0.12</version.slf4j>
         <version.validation-api>2.0.2</version.validation-api>
         <version.webjars.bootstrap>4.3.1</version.webjars.bootstrap>

pom.xml

@@ -131,7 +131,7 @@
         <version.objenesis>2.1</version.objenesis>
         <version.picketbox>5.0.3.Final</version.picketbox>
         <version.powermock>2.0.9</version.powermock>
-        <version.protobuf>3.16.3</version.protobuf>
+        <version.protobuf>3.25.5</version.protobuf>
         <version.protostuff>1.6.2</version.protostuff>
         <version.slf4j>2.0.12</version.slf4j>
         <version.spotify-dns>3.1.5</version.spotify-dns>

warehouse/annotation-core/README.md

@@ -47,7 +47,7 @@ The source code for the generated source code in `src/main/java/datawave/annotat
 
 ### Prerequisites 
 
-* **Protoc**: We used `protoc` from `libprotoc 3.16.3` from [the GitHub protobuf releases page](https://github.com/protocolbuffers/protobuf/releases/tag/v3.16.3).
+* **Protoc**: We used `protoc` from `libprotoc 3.16.3` from [the GitHub protobuf releases page](s).
   * Follow the instructions to install this into `/usr/local/bin`.
 * **Google APIs**:`SegmentV1.proto` imports `field_mask` and `timestamp` from [fuchsia.googlesource.com](https://fuchsia.googlesource.com/third_party/googleapis).
   * These get installed into `/usr/local/include`

warehouse/annotation-core/pom.xml

@@ -10,7 +10,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <version.proto-google-common-protos>2.61.0</version.proto-google-common-protos>
-        <version.protobuf>3.16.3</version.protobuf>
+        <version.protobuf>3.25.5</version.protobuf>
     </properties>
     <dependencies>
         <dependency>