File tree Expand file tree Collapse file tree 6 files changed +29
-4
lines changed
hiero-dependency-versions
com/hedera/pbj/grpc/helidon/config
pbj-grpc-helidon/src/main/java Expand file tree Collapse file tree 6 files changed +29
-4
lines changed Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ group = "com.hedera.hashgraph"
33
44val antlr = " 4.13.2"
55val grpc = " 1.79.0"
6- val helidon = " 4.3.4 "
6+ val helidon = " 4.4.0 "
77val protobuf = " 4.34.0"
88
99val junit5 = " 6.0.3"
@@ -38,8 +38,8 @@ dependencies.constraints {
3838 api(" io.helidon.config.metadata:helidon-config-metadata-codegen:$helidon " ) {
3939 because(" io.helidon.config.metadata.codegen" )
4040 }
41- api(" io.helidon.config:helidon-config-metadata-processor :$helidon " ) {
42- because(" io.helidon.config.metadata.processor " )
41+ api(" io.helidon.config:helidon-config-metadata:$helidon " ) {
42+ because(" io.helidon.config.metadata" )
4343 }
4444 api(" io.helidon.codegen:helidon-codegen-apt:$helidon " ) { because(" io.helidon.codegen.apt" ) }
4545 api(" io.helidon.builder:helidon-builder-codegen:$helidon " ) {
Original file line number Diff line number Diff line change @@ -8,7 +8,7 @@ tasks.compileJava { options.compilerArgs.remove("-Werror") }
88
99mainModuleInfo {
1010 annotationProcessor(" io.helidon.common.features.codegen" )
11- annotationProcessor(" io.helidon.config.metadata.processor " )
11+ annotationProcessor(" io.helidon.config.metadata.codegen " )
1212 annotationProcessor(" io.helidon.codegen.apt" )
1313 annotationProcessor(" io.helidon.builder.codegen" )
1414}
Original file line number Diff line number Diff line change 55import io .helidon .builder .api .Prototype ;
66import io .helidon .webserver .spi .ProtocolConfig ;
77
8+ /**
9+ * Blueprint for PbjConfig.
10+ */
811@ Prototype .Blueprint
912@ Prototype .Configured ("pbj" )
1013@ Prototype .Provides (ProtocolConfig .class )
Original file line number Diff line number Diff line change 1515 requires io .helidon .webserver ;
1616 requires static io .helidon .common .features .api ;
1717 requires static io .helidon .config .metadata .codegen ;
18+ requires static io .helidon .config .metadata ;
1819
1920 exports com .hedera .pbj .grpc .helidon .config ;
2021}
Original file line number Diff line number Diff line change 1515 requires transitive com .hedera .pbj .runtime ;
1616 requires transitive io .helidon .common .config ;
1717 requires transitive io .helidon .common ;
18+ requires transitive io .helidon .config ;
1819 requires transitive io .helidon .webserver .http2 ;
1920 requires transitive io .helidon .webserver ;
2021 requires io .helidon .common .buffers ;
Original file line number Diff line number Diff line change 11// SPDX-License-Identifier: Apache-2.0
2+ import org.gradlex.javamodule.moduleinfo.ExtraJavaModuleInfoPluginExtension
3+ import org.gradlex.jvm.dependency.conflict.resolution.JvmDependencyConflictsExtension
4+
25plugins { id(" org.hiero.gradle.build" ) version " 0.6.3" }
36
47javaModules {
@@ -7,3 +10,20 @@ javaModules {
710 module(" pbj-compiler" ) // no 'module-info.java'
811 }
912}
13+
14+ // The patch rules below can be removed once "org.hiero.gradle.build" contains the following update:
15+ // https://github.com/hiero-ledger/hiero-gradle-conventions/issues/444
16+ @Suppress(" UnstableApiUsage" )
17+ gradle.lifecycle.beforeProject {
18+ plugins.withId(" org.hiero.gradle.base.jpms-modules" ) {
19+ configure<JvmDependencyConflictsExtension > {
20+ patch.module(" io.prometheus:simpleclient" ) {
21+ addRuntimeOnlyDependency(" io.prometheus:simpleclient_tracer_common" )
22+ }
23+ }
24+ configure<ExtraJavaModuleInfoPluginExtension > {
25+ module(" io.micrometer:micrometer-registry-otlp" , " micrometer.registry.otlp" )
26+ module(" io.opentelemetry.proto:opentelemetry-proto" , " io.opentelemetry.proto" )
27+ }
28+ }
29+ }
You can’t perform that action at this time.
0 commit comments