upgrade: upgraded Helidon and its deps to 4.1.0

Signed-off-by: Matt Peterson <[email protected]>
hashgraph · Aug 26, 2024 · 860d73c · 860d73c
1 parent 587fac2
commit 860d73c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 22 deletions.
diff --git a/gradle/modules.properties b/gradle/modules.properties
@@ -12,16 +12,15 @@ com.lmax.disruptor=com.lmax:disruptor
 io.helidon.webserver=io.helidon.webserver:helidon-webserver
 io.helidon.webserver.grpc=io.helidon.webserver:helidon-webserver-grpc
 io.helidon.webserver.testing.junit5=io.helidon.webserver.testing.junit5:helidon-webserver-testing-junit5
-google.proto=com.google.protobuf:protoc
-
 org.antlr.antlr4.runtime=org.antlr:antlr4-runtime
-
 com.google.common=com.google.guava:guava
+
+google.proto=com.google.protobuf:protoc
+io.grpc=io.grpc:grpc-api
 io.grpc.protobuf=io.grpc:grpc-protobuf
 io.grpc.stub=io.grpc:grpc-stub
-io.grpc=io.grpc:grpc-api
-com.hedera.pbj.runtime=com.hedera.pbj:pbj-runtime
 
+com.hedera.pbj.runtime=com.hedera.pbj:pbj-runtime
 com.google.protobuf=com.google.protobuf:protobuf-java
 com.google.protobuf.util=com.google.protobuf:protobuf-java-util
 com.apache.commons.codec=commons-codec:commons-codec
@@ -33,7 +32,6 @@ org.apache.commons.compress=org.apache.commons:commons-compress
 java.annotation=javax.annotation:javax.annotation-api
 org.apache.logging.log4j.slf4j2.impl=org.apache.logging.log4j:log4j-slf4j2-impl
 
-grpc.protobuf=io.grpc:grpc-protobuf
 dagger=com.google.dagger:dagger
 dagger.compiler=com.google.dagger:dagger-compiler
 com.squareup.javapoet=com.squareup:javapoet

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -31,9 +31,6 @@ gradleEnterprise {
     }
 }
 
-// The HAPI API version to use for Protobuf sources.
-val hapiProtoVersion = "0.53.0"
-
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
@@ -45,9 +42,8 @@ dependencyResolutionManagement {
             val daggerVersion = "2.42"
 
             // Compile time dependencies
-            version("com.google.protobuf", "3.24.0")
-            version("io.helidon.webserver.http2", "4.0.11")
-            version("io.helidon.webserver.grpc", "4.0.11")
+            version("io.helidon.webserver.http2", "4.1.0")
+            version("io.helidon.webserver.grpc", "4.1.0")
             version("com.lmax.disruptor", "4.0.0")
             version("com.github.spotbugs.annotations", "4.7.3")
             version("com.swirlds.metrics.api", swirldsVersion)
@@ -60,21 +56,26 @@ dependencyResolutionManagement {
             version("com.google.auto.service", "1.1.1")
             version("org.hyperledger.besu.nativelib.secp256k1", "0.8.2")
 
-            // PBJ dependencies
-            version("io.grpc", "1.64.0")
-            version("io.grpc.protobuf", "1.64.0")
-            version("io.grpc.stub", "1.64.0")
+            // gRPC dependencies
+            version("io.grpc", "1.65.1")
+            version("io.grpc.protobuf", "1.65.1")
+            version("io.grpc.stub", "1.65.1")
+
+            // Reference from the protobuf plugin
+            version("google.proto", "4.27.3")
+            version("grpc.protobuf.grpc", "1.65.1")
 
+            // Google protobuf dependencies
+            version("com.google.protobuf", "4.27.3")
+            version("com.google.protobuf.util", "4.27.3")
+
+            // PBJ dependencies
             plugin("pbj", "com.hedera.pbj.pbj-compiler").version("0.9.2")
             version("com.hedera.pbj.runtime", "0.9.2")
             version("org.antlr.antlr4.runtime", "4.13.1")
 
             version("java.annotation", "1.3.2")
             version("javax.inject", "1")
-            version("com.google.protobuf", "3.21.7")
-            version("com.google.protobuf.util", "3.21.7")
-
-            version("hapi-proto", hapiProtoVersion)
             version("com.google.common", "33.0.0-jre")
 
             version("org.apache.commons.codec", "1.15")
@@ -94,8 +95,6 @@ dependencyResolutionManagement {
             version("org.junit.jupiter.api", "5.10.2")
             version("org.mockito", "5.8.0")
             version("org.mockito.junit.jupiter", "5.8.0")
-            version("google.proto", "3.21.10")
-            version("grpc.protobuf.grpc", "1.45.1")
 
         }
     }