Merge pull request #39 from zenoss/feature/ZEN-34577

ZEN-34577: update build-tool version
zenoss · Jan 4, 2024 · 4bd3e0d · 4bd3e0d
2 parents 1691858 + ee53a45
commit 4bd3e0d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/java/GNUmakefile b/java/GNUmakefile
@@ -14,16 +14,16 @@ build:
 		-v ${PWD}/..:/mnt/build \
 		-v ${HOME}/.m2:/home/build/.m2 \
 		-w /mnt/build \
-		zenoss/maven:java21-1 \
-		-f java/pom.xml -Dprotoc.path=/usr/local/bin/protoc clean install
+		zenoss/maven:java21-2 \
+		-f java/pom.xml -Dprotoc.path=/usr/bin/protoc clean install
 
 deploy:
 	@docker run --rm \
 			-v ${PWD}/..:/mnt/build \
 			-v ${HOME}/.m2:/home/build/.m2 \
 			-w /mnt/build \
-			zenoss/maven:java21-1 \
-			-f java/pom.xml -Dprotoc.path=/usr/local/bin/protoc -Drepo.login=${NEXUS_USER} -Drepo.pwd=${NEXUS_PASSWORD} clean deploy
+			zenoss/maven:java21-2 \
+			-f java/pom.xml -Dprotoc.path=/usr/bin/protoc -Drepo.login=${NEXUS_USER} -Drepo.pwd=${NEXUS_PASSWORD} clean deploy
 
 clean:
 	@rm -rf amqp-api/target \

diff --git a/java/pom.xml b/java/pom.xml
@@ -18,7 +18,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <protoc.path>protoc</protoc.path>
         <version.jackson>2.16.1</version.jackson>
-        <protobuf-java.version>3.24.4</protobuf-java.version>
+        <protobuf-java.version>2.5.0</protobuf-java.version>
         <junit.version>4.13.2</junit.version>
         <slf4j.version>2.0.10</slf4j.version>
         <easymock.version>5.2.0</easymock.version>