fix: keep protobuf-bom to avoid protoc version conflicts

Author: trask

.github/unsafe/build-custom-protobuf.sh

@@ -43,9 +43,7 @@ mvn install:install-file -q \
 
 # Update dependencies
 DEPS="${SCRIPT_DIR}/../../dependencyManagement/build.gradle.kts"
-sed -i '/com\.google\.protobuf:protobuf-bom:/d' "${DEPS}"
-sed -i '/com\.google\.protobuf:protobuf-java/d' "${DEPS}"
+sed -i '/com\.google\.protobuf:protobuf-java:/d' "${DEPS}"
 sed -i '/^val DEPENDENCIES = listOf(/a\  "com.google.protobuf:protobuf-java:'"${CUSTOM_VERSION}"'",' "${DEPS}"
-sed -i '/^val DEPENDENCIES = listOf(/a\  "com.google.protobuf:protobuf-java-util:'"${ORIGINAL_VERSION}"'",' "${DEPS}"
 
 echo "protobuf-java ${CUSTOM_VERSION} built and installed (UNSAFE disabled)."

dependencyManagement/build.gradle.kts

@@ -41,9 +41,10 @@ val DEPENDENCY_BOMS = listOf(
 )
 
 val DEPENDENCIES = listOf(
+  "com.linecorp.armeria:armeria:1.33.4-SNAPSHOT",
+  "com.google.protobuf:protobuf-java:4.32.2-SNAPSHOT",
   "org.junit.jupiter:junit-jupiter-api:${junitVersion}",
   "org.junit.jupiter:junit-jupiter-params:${junitVersion}",
-  "com.linecorp.armeria:armeria:${armeriaVersion}",
   "com.linecorp.armeria:armeria-grpc:${armeriaVersion}",
   "com.linecorp.armeria:armeria-grpc-protocol:${armeriaVersion}",
   "com.linecorp.armeria:armeria-junit5:${armeriaVersion}",