diff --git a/builder/README.md b/builder/README.md index f0689b1a634..06adecfbbe6 100644 --- a/builder/README.md +++ b/builder/README.md @@ -60,6 +60,18 @@ interface MyConfigBeanBlueprint { + + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + diff --git a/builder/tests/builder/pom.xml b/builder/tests/builder/pom.xml index c00753cb7f2..0cc055da127 100644 --- a/builder/tests/builder/pom.xml +++ b/builder/tests/builder/pom.xml @@ -32,11 +32,6 @@ Helidon Builder Tests - - io.helidon.builder - helidon-builder-processor - provided - io.helidon.builder helidon-builder-api @@ -104,6 +99,13 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + diff --git a/builder/tests/common-types/pom.xml b/builder/tests/common-types/pom.xml index b161dcffea4..efd09e4b5e5 100644 --- a/builder/tests/common-types/pom.xml +++ b/builder/tests/common-types/pom.xml @@ -87,6 +87,18 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.common.processor + helidon-common-processor-helidon-copyright + ${helidon.version} + + org.apache.maven.plugins diff --git a/common/configurable/pom.xml b/common/configurable/pom.xml index ccbb037405a..1c71bda4ee9 100644 --- a/common/configurable/pom.xml +++ b/common/configurable/pom.xml @@ -55,12 +55,6 @@ io.helidon.builder helidon-builder-api - - - io.helidon.builder - helidon-builder-processor - true - io.helidon.config helidon-config-yaml @@ -112,6 +106,18 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.config + helidon-config-metadata-processor + ${helidon.version} + + diff --git a/common/key-util/pom.xml b/common/key-util/pom.xml index f26d9683c19..2a2a15f4622 100644 --- a/common/key-util/pom.xml +++ b/common/key-util/pom.xml @@ -89,6 +89,18 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.config + helidon-config-metadata-processor + ${helidon.version} + + diff --git a/common/socket/pom.xml b/common/socket/pom.xml index 7358ea52c77..e9b0b00728f 100644 --- a/common/socket/pom.xml +++ b/common/socket/pom.xml @@ -78,6 +78,18 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.config + helidon-config-metadata-processor + ${helidon.version} + + diff --git a/examples/pico/configdriven/pom.xml b/examples/pico/configdriven/pom.xml index 96d23c64254..dfd4d2214ba 100644 --- a/examples/pico/configdriven/pom.xml +++ b/examples/pico/configdriven/pom.xml @@ -86,6 +86,18 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.pico.configdriven + helidon-pico-configdriven-processor + ${helidon.version} + + org.apache.maven.plugins diff --git a/integrations/common/rest/src/test/java/io/helidon/integrations/common/rest/RestApiTest.java b/integrations/common/rest/src/test/java/io/helidon/integrations/common/rest/RestApiTest.java index baa157e798d..948385b8630 100644 --- a/integrations/common/rest/src/test/java/io/helidon/integrations/common/rest/RestApiTest.java +++ b/integrations/common/rest/src/test/java/io/helidon/integrations/common/rest/RestApiTest.java @@ -27,8 +27,8 @@ import io.helidon.nima.http.media.jsonp.JsonpSupport; import io.helidon.nima.testing.junit5.webserver.ServerTest; import io.helidon.nima.testing.junit5.webserver.SetUpServer; -import io.helidon.nima.webserver.ServerConfig; import io.helidon.nima.webserver.WebServer; +import io.helidon.nima.webserver.WebServerConfig; import io.helidon.nima.webserver.http.HttpRules; import io.helidon.nima.webserver.http.HttpService; import io.helidon.nima.webserver.http.ServerRequest; @@ -55,7 +55,7 @@ class RestApiTest { private static RestApi restApi; @SetUpServer - static void setupServer(ServerConfig.Builder serverBuilder) { + static void setupServer(WebServerConfig.Builder serverBuilder) { serverBuilder.routing(routing -> routing.register("/api", TestApiService::new)) .mediaContext(MediaContext.builder().addMediaSupport(JsonpSupport.create()).build()); } diff --git a/integrations/oci/sdk/README.md b/integrations/oci/sdk/README.md index 9973e512caf..d1dc81b493e 100644 --- a/integrations/oci/sdk/README.md +++ b/integrations/oci/sdk/README.md @@ -5,7 +5,7 @@ There are two different approaches for [OCI SDK](https://docs.oracle.com/en-us/i * **Helidon SE** (not using _CDI_). For this refer to the information below. ## Helidon Injection Framework and OCI SDK Integration -This section only applies for **Helidon SE** type applications. If you are using **Helidon MP** then this section does not apply to you, and you should instead refer to the [cdi](./cdi) module. If you are using **Heldion SE** then continue reading below. Please familiarize yourself with the basics of the [Helidon Injection Framework](../../../pico) and terminology before continuing further. +This section only applies for **Helidon SE** type applications. If you are using **Helidon MP** then this section does not apply to you, and you should instead refer to the [cdi](./cdi) module. If you are using **Helidon SE** then continue reading below. Please familiarize yourself with the basics of the [Helidon Injection Framework](../../../pico) and terminology before continuing further. The **Helidon Injection Framework** offers two modules for integrating with the **OCI SDK API** - the _processor_ module and the _runtime_ module. diff --git a/integrations/oci/sdk/runtime/pom.xml b/integrations/oci/sdk/runtime/pom.xml index a9131b16765..5492a2148e1 100644 --- a/integrations/oci/sdk/runtime/pom.xml +++ b/integrations/oci/sdk/runtime/pom.xml @@ -106,6 +106,18 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.pico.configdriven + helidon-pico-configdriven-processor + ${helidon.version} + + diff --git a/microprofile/cdi/pom.xml b/microprofile/cdi/pom.xml index 5c0175c94a7..1431ec0d145 100644 --- a/microprofile/cdi/pom.xml +++ b/microprofile/cdi/pom.xml @@ -38,6 +38,10 @@ weld-se-core ${project.version} + + jakarta.inject + jakarta.inject-api + org.jboss.logging jboss-logging diff --git a/nima/common/tls/pom.xml b/nima/common/tls/pom.xml index 727d4fcd556..1cb7f9b3c03 100644 --- a/nima/common/tls/pom.xml +++ b/nima/common/tls/pom.xml @@ -79,6 +79,13 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + diff --git a/nima/fault-tolerance/fault-tolerance/pom.xml b/nima/fault-tolerance/fault-tolerance/pom.xml index a028ef1b991..155b8a8b468 100644 --- a/nima/fault-tolerance/fault-tolerance/pom.xml +++ b/nima/fault-tolerance/fault-tolerance/pom.xml @@ -154,6 +154,28 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.config + helidon-config-metadata-processor + ${helidon.version} + + + io.helidon.pico.configdriven + helidon-pico-configdriven-processor + ${helidon.version} + + + io.helidon.common.features + helidon-common-features-processor + ${helidon.version} + + org.apache.maven.plugins diff --git a/nima/grpc/webserver/pom.xml b/nima/grpc/webserver/pom.xml index 5fd768dc3ec..44f85e8771c 100644 --- a/nima/grpc/webserver/pom.xml +++ b/nima/grpc/webserver/pom.xml @@ -105,6 +105,23 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.config + helidon-config-metadata-processor + ${helidon.version} + + + io.helidon.common.features + helidon-common-features-processor + ${helidon.version} + + diff --git a/nima/http/encoding/encoding/pom.xml b/nima/http/encoding/encoding/pom.xml index ce351f5810e..1f4f427c093 100644 --- a/nima/http/encoding/encoding/pom.xml +++ b/nima/http/encoding/encoding/pom.xml @@ -96,6 +96,23 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.config + helidon-config-metadata-processor + ${helidon.version} + + + io.helidon.common.features + helidon-common-features-processor + ${helidon.version} + + diff --git a/nima/http/media/media/pom.xml b/nima/http/media/media/pom.xml index 2956011d753..50e351eb8ca 100644 --- a/nima/http/media/media/pom.xml +++ b/nima/http/media/media/pom.xml @@ -90,6 +90,18 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.common.features + helidon-common-features-processor + ${helidon.version} + + diff --git a/nima/http2/webserver/pom.xml b/nima/http2/webserver/pom.xml index a5c4cfee4e8..8c53ffd9fa9 100644 --- a/nima/http2/webserver/pom.xml +++ b/nima/http2/webserver/pom.xml @@ -96,6 +96,23 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.config + helidon-config-metadata-processor + ${helidon.version} + + + io.helidon.common.features + helidon-common-features-processor + ${helidon.version} + + diff --git a/nima/sse/webserver/pom.xml b/nima/sse/webserver/pom.xml index b2f6a9294c3..78200455382 100644 --- a/nima/sse/webserver/pom.xml +++ b/nima/sse/webserver/pom.xml @@ -82,6 +82,23 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.config + helidon-config-metadata-processor + ${helidon.version} + + + io.helidon.common.features + helidon-common-features-processor + ${helidon.version} + + diff --git a/nima/webclient/webclient/pom.xml b/nima/webclient/webclient/pom.xml index d96d7796598..2a495cc911f 100644 --- a/nima/webclient/webclient/pom.xml +++ b/nima/webclient/webclient/pom.xml @@ -120,6 +120,18 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.common.features + helidon-common-features-processor + ${helidon.version} + + diff --git a/nima/webserver/webserver/pom.xml b/nima/webserver/webserver/pom.xml index 25b6518212c..2d06c5cefda 100644 --- a/nima/webserver/webserver/pom.xml +++ b/nima/webserver/webserver/pom.xml @@ -191,6 +191,23 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.config + helidon-config-metadata-processor + ${helidon.version} + + + io.helidon.pico.configdriven + helidon-pico-configdriven-processor + ${helidon.version} + + diff --git a/nima/websocket/webserver/pom.xml b/nima/websocket/webserver/pom.xml index cdbf3c165f4..9c067377d31 100644 --- a/nima/websocket/webserver/pom.xml +++ b/nima/websocket/webserver/pom.xml @@ -100,6 +100,23 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.config + helidon-config-metadata-processor + ${helidon.version} + + + io.helidon.common.features + helidon-common-features-processor + ${helidon.version} + + diff --git a/pico/api/pom.xml b/pico/api/pom.xml index 44397ce0fd8..a8ebcffe021 100644 --- a/pico/api/pom.xml +++ b/pico/api/pom.xml @@ -61,11 +61,6 @@ io.helidon.builder helidon-builder-api - - io.helidon.builder - helidon-builder-processor - provided - jakarta.annotation jakarta.annotation-api @@ -102,6 +97,13 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + diff --git a/pico/configdriven/api/pom.xml b/pico/configdriven/api/pom.xml index f2f3637f2f9..76d75592659 100644 --- a/pico/configdriven/api/pom.xml +++ b/pico/configdriven/api/pom.xml @@ -62,6 +62,13 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + diff --git a/pico/configdriven/runtime/pom.xml b/pico/configdriven/runtime/pom.xml index 53471ee2e6d..1051d1e198a 100644 --- a/pico/configdriven/runtime/pom.xml +++ b/pico/configdriven/runtime/pom.xml @@ -100,6 +100,13 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + diff --git a/pico/configdriven/tests/config/pom.xml b/pico/configdriven/tests/config/pom.xml index 060f5c5997a..efd3ff92305 100644 --- a/pico/configdriven/tests/config/pom.xml +++ b/pico/configdriven/tests/config/pom.xml @@ -116,6 +116,18 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.pico.configdriven + helidon-pico-configdriven-processor + ${helidon.version} + + diff --git a/pico/configdriven/tests/configuredby-application/pom.xml b/pico/configdriven/tests/configuredby-application/pom.xml index 30f159de424..010771fd744 100644 --- a/pico/configdriven/tests/configuredby-application/pom.xml +++ b/pico/configdriven/tests/configuredby-application/pom.xml @@ -115,6 +115,18 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.pico.configdriven + helidon-pico-configdriven-processor + ${helidon.version} + + io.helidon.pico diff --git a/pico/configdriven/tests/configuredby/pom.xml b/pico/configdriven/tests/configuredby/pom.xml index 0847628bed8..4d5e1be1f32 100644 --- a/pico/configdriven/tests/configuredby/pom.xml +++ b/pico/configdriven/tests/configuredby/pom.xml @@ -130,6 +130,18 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + + io.helidon.pico.configdriven + helidon-pico-configdriven-processor + ${helidon.version} + + diff --git a/pico/processor/pom.xml b/pico/processor/pom.xml index e7455746409..b169e273579 100644 --- a/pico/processor/pom.xml +++ b/pico/processor/pom.xml @@ -71,6 +71,13 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + diff --git a/pico/runtime/pom.xml b/pico/runtime/pom.xml index 3f6e58238fd..db4cb6415d0 100644 --- a/pico/runtime/pom.xml +++ b/pico/runtime/pom.xml @@ -45,11 +45,6 @@ jakarta.annotation-api provided - - io.helidon.builder - helidon-builder-processor - true - io.helidon.config helidon-config-metadata @@ -91,6 +86,13 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + + diff --git a/pico/tools/pom.xml b/pico/tools/pom.xml index 89a883dbf4a..ff9e96ea3f4 100644 --- a/pico/tools/pom.xml +++ b/pico/tools/pom.xml @@ -128,6 +128,13 @@ + + + io.helidon.builder + helidon-builder-processor + ${helidon.version} + +