diff --git a/pico/api/pom.xml b/pico/api/pom.xml
index 24c75e702fe..5a44d06b5f7 100644
--- a/pico/api/pom.xml
+++ b/pico/api/pom.xml
@@ -60,7 +60,6 @@
io.helidon.builder
helidon-builder
- provided
io.helidon.builder
diff --git a/pico/api/src/main/java/module-info.java b/pico/api/src/main/java/module-info.java
index 0e187653486..b84b56982f0 100644
--- a/pico/api/src/main/java/module-info.java
+++ b/pico/api/src/main/java/module-info.java
@@ -22,7 +22,7 @@
requires io.helidon.common.types;
requires io.helidon.common;
requires io.helidon.common.config;
- requires static io.helidon.builder;
+ requires transitive io.helidon.builder;
requires static io.helidon.config.metadata;
requires static jakarta.annotation;
diff --git a/pico/configdriven/runtime/pom.xml b/pico/configdriven/runtime/pom.xml
index 4a56b9b7ebb..10cc9272a11 100644
--- a/pico/configdriven/runtime/pom.xml
+++ b/pico/configdriven/runtime/pom.xml
@@ -84,6 +84,11 @@
helidon-common-testing-junit5
test
+
+ org.mockito
+ mockito-core
+ test
+
diff --git a/pico/configdriven/runtime/src/main/java/io/helidon/pico/configdriven/runtime/AbstractConfiguredServiceProvider.java b/pico/configdriven/runtime/src/main/java/io/helidon/pico/configdriven/runtime/AbstractConfiguredServiceProvider.java
index 67e89488df7..b244a83d958 100644
--- a/pico/configdriven/runtime/src/main/java/io/helidon/pico/configdriven/runtime/AbstractConfiguredServiceProvider.java
+++ b/pico/configdriven/runtime/src/main/java/io/helidon/pico/configdriven/runtime/AbstractConfiguredServiceProvider.java
@@ -116,13 +116,13 @@ static Comparator configBeanComparator() {
static BindableConfigBeanRegistry resolveConfigBeanRegistry() {
HelidonConfigBeanRegistry cbr = ConfigBeanRegistryHolder.configBeanRegistry().orElse(null);
if (cbr == null) {
- LOGGER.log(System.Logger.Level.INFO, "Config-Driven Services disabled (config bean registry not found)");
+ LOGGER.log(System.Logger.Level.INFO, "Config-Driven Services is disabled (config bean registry not found)");
return null;
}
if (!(cbr instanceof BindableConfigBeanRegistry)) {
Optional callingContext = CallingContextFactory.create(false);
- String desc = "Config-Driven Services disabled (unsupported implementation): " + cbr;
+ String desc = "Config-Driven Services is disabled (unsupported implementation): " + cbr;
String msg = (callingContext.isEmpty()) ? toErrorMessage(desc) : toErrorMessage(callingContext.get(), desc);
throw new PicoException(msg);
}
diff --git a/pico/configdriven/runtime/src/main/java/io/helidon/pico/configdriven/runtime/DefaultPicoConfigBeanRegistry.java b/pico/configdriven/runtime/src/main/java/io/helidon/pico/configdriven/runtime/DefaultPicoConfigBeanRegistry.java
index 69f60b66320..ea9c970b18a 100644
--- a/pico/configdriven/runtime/src/main/java/io/helidon/pico/configdriven/runtime/DefaultPicoConfigBeanRegistry.java
+++ b/pico/configdriven/runtime/src/main/java/io/helidon/pico/configdriven/runtime/DefaultPicoConfigBeanRegistry.java
@@ -123,7 +123,8 @@ static void validateUsingBeanAttributes(Supplier