Skip to content

Commit 533be7d

Browse files
dependabot[bot]anthony-swirldslabsjjohannes
authored
chore(deps): Bump helidon from 4.3.4 to 4.4.0 in /pbj-core/hiero-dependency-versions (#751)
Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Anthony Petrov <anthony@swirldslabs.com> Signed-off-by: Jendrik Johannes <jendrik@onepiece.software> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Anthony Petrov <anthony@swirldslabs.com> Co-authored-by: Jendrik Johannes <jendrik@onepiece.software>
1 parent 348053f commit 533be7d

File tree

6 files changed

+29
-4
lines changed

6 files changed

+29
-4
lines changed

pbj-core/hiero-dependency-versions/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ group = "com.hedera.hashgraph"
33

44
val antlr = "4.13.2"
55
val grpc = "1.79.0"
6-
val helidon = "4.3.4"
6+
val helidon = "4.4.0"
77
val protobuf = "4.34.0"
88

99
val 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") {

pbj-core/pbj-grpc-helidon-config/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tasks.compileJava { options.compilerArgs.remove("-Werror") }
88

99
mainModuleInfo {
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
}

pbj-core/pbj-grpc-helidon-config/src/main/java/com/hedera/pbj/grpc/helidon/config/PbjConfigBlueprint.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
import io.helidon.builder.api.Prototype;
66
import io.helidon.webserver.spi.ProtocolConfig;
77

8+
/**
9+
* Blueprint for PbjConfig.
10+
*/
811
@Prototype.Blueprint
912
@Prototype.Configured("pbj")
1013
@Prototype.Provides(ProtocolConfig.class)

pbj-core/pbj-grpc-helidon-config/src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
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
}

pbj-core/pbj-grpc-helidon/src/main/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
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;

pbj-core/settings.gradle.kts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
// SPDX-License-Identifier: Apache-2.0
2+
import org.gradlex.javamodule.moduleinfo.ExtraJavaModuleInfoPluginExtension
3+
import org.gradlex.jvm.dependency.conflict.resolution.JvmDependencyConflictsExtension
4+
25
plugins { id("org.hiero.gradle.build") version "0.6.3" }
36

47
javaModules {
@@ -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+
}

0 commit comments

Comments
 (0)