From 8d319567492f9c42fce32c0e2ffd7bf3bd7de615 Mon Sep 17 00:00:00 2001 From: Joe DiPol Date: Tue, 17 May 2022 11:34:18 -0700 Subject: [PATCH 1/2] 2.x: Remove dependency on helidon-common-reactive from config (#4225) * Remove dependency on helidon-common-reactive from config --- config/config/pom.xml | 4 ---- config/config/src/main/java/module-info.java | 3 +-- dbclient/dbclient/pom.xml | 4 ++++ dbclient/dbclient/src/main/java/module-info.java | 3 ++- fault-tolerance/pom.xml | 4 ++++ fault-tolerance/src/main/java/module-info.java | 5 +++-- integrations/vault/secrets/database/pom.xml | 4 ++++ .../vault/secrets/database/src/main/java/module-info.java | 5 +++-- integrations/vault/sys/sys/pom.xml | 4 ++++ integrations/vault/sys/sys/src/main/java/module-info.java | 5 +++-- messaging/messaging/pom.xml | 4 ++++ messaging/messaging/src/main/java/module-info.java | 3 ++- webclient/webclient/pom.xml | 4 ++++ webclient/webclient/src/main/java/module-info.java | 5 +++-- 14 files changed, 41 insertions(+), 16 deletions(-) diff --git a/config/config/pom.xml b/config/config/pom.xml index 04248a1395b..b094cc56c0c 100644 --- a/config/config/pom.xml +++ b/config/config/pom.xml @@ -46,10 +46,6 @@ io.helidon.common helidon-common - - io.helidon.common - helidon-common-reactive - io.helidon.common helidon-common-media-type diff --git a/config/config/src/main/java/module-info.java b/config/config/src/main/java/module-info.java index 4d7df2cf542..a3c4c14e0eb 100644 --- a/config/config/src/main/java/module-info.java +++ b/config/config/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2021 Oracle and/or its affiliates. + * Copyright (c) 2017, 2022 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,6 @@ requires transitive jakarta.annotation; requires transitive io.helidon.common; - requires transitive io.helidon.common.reactive; requires transitive io.helidon.common.media.type; requires io.helidon.common.serviceloader; diff --git a/dbclient/dbclient/pom.xml b/dbclient/dbclient/pom.xml index 09be1b8f28f..57034c6ef9e 100644 --- a/dbclient/dbclient/pom.xml +++ b/dbclient/dbclient/pom.xml @@ -46,6 +46,10 @@ io.helidon.common helidon-common-mapper + + io.helidon.common + helidon-common-reactive + org.junit.jupiter junit-jupiter-api diff --git a/dbclient/dbclient/src/main/java/module-info.java b/dbclient/dbclient/src/main/java/module-info.java index 38a3a649381..c4763cb8339 100644 --- a/dbclient/dbclient/src/main/java/module-info.java +++ b/dbclient/dbclient/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, 2021 Oracle and/or its affiliates. + * Copyright (c) 2019, 2022 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ requires transitive io.helidon.common; requires transitive io.helidon.common.context; requires transitive io.helidon.common.mapper; + requires transitive io.helidon.common.reactive; requires transitive io.helidon.common.serviceloader; exports io.helidon.dbclient; diff --git a/fault-tolerance/pom.xml b/fault-tolerance/pom.xml index aca255f1853..4215fa7e4ed 100644 --- a/fault-tolerance/pom.xml +++ b/fault-tolerance/pom.xml @@ -42,6 +42,10 @@ io.helidon.common helidon-common-configurable + + io.helidon.common + helidon-common-reactive + org.hamcrest diff --git a/fault-tolerance/src/main/java/module-info.java b/fault-tolerance/src/main/java/module-info.java index 32add2bed58..bd602c974f8 100644 --- a/fault-tolerance/src/main/java/module-info.java +++ b/fault-tolerance/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Oracle and/or its affiliates. + * Copyright (c) 2020, 2022 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,8 @@ module io.helidon.faulttolerance { requires io.helidon.config; requires io.helidon.common.configurable; + requires io.helidon.common.reactive; requires java.logging; exports io.helidon.faulttolerance; -} \ No newline at end of file +} diff --git a/integrations/vault/secrets/database/pom.xml b/integrations/vault/secrets/database/pom.xml index a8901da97ac..fc0413a3074 100644 --- a/integrations/vault/secrets/database/pom.xml +++ b/integrations/vault/secrets/database/pom.xml @@ -35,5 +35,9 @@ io.helidon.integrations.vault helidon-integrations-vault + + io.helidon.common + helidon-common-reactive + diff --git a/integrations/vault/secrets/database/src/main/java/module-info.java b/integrations/vault/secrets/database/src/main/java/module-info.java index ec6e89a57d4..09195f9b994 100644 --- a/integrations/vault/secrets/database/src/main/java/module-info.java +++ b/integrations/vault/secrets/database/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. + * Copyright (c) 2021, 2022 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ module io.helidon.integrations.vault.secrets.database { requires java.logging; + requires transitive io.helidon.common.reactive; requires io.helidon.integrations.vault; requires io.helidon.integrations.common.rest; @@ -30,4 +31,4 @@ provides io.helidon.integrations.vault.spi.InjectionProvider with io.helidon.integrations.vault.secrets.database.DbEngineProvider; -} \ No newline at end of file +} diff --git a/integrations/vault/sys/sys/pom.xml b/integrations/vault/sys/sys/pom.xml index fa9ece501c4..79904f78bb2 100644 --- a/integrations/vault/sys/sys/pom.xml +++ b/integrations/vault/sys/sys/pom.xml @@ -38,5 +38,9 @@ io.helidon.integrations.vault.auths helidon-integrations-vault-auths-common + + io.helidon.common + helidon-common-reactive + \ No newline at end of file diff --git a/integrations/vault/sys/sys/src/main/java/module-info.java b/integrations/vault/sys/sys/src/main/java/module-info.java index a814903f0e2..a2e3e23e71c 100644 --- a/integrations/vault/sys/sys/src/main/java/module-info.java +++ b/integrations/vault/sys/sys/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Oracle and/or its affiliates. + * Copyright (c) 2021, 2022 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ module io.helidon.integrations.vault.sys { requires java.logging; + requires transitive io.helidon.common.reactive; requires io.helidon.integrations.vault; requires io.helidon.integrations.common.rest; requires io.helidon.integrations.vault.auths.common; @@ -34,4 +35,4 @@ provides io.helidon.integrations.vault.spi.InjectionProvider with io.helidon.integrations.vault.sys.HcpSysProvider; -} \ No newline at end of file +} diff --git a/messaging/messaging/pom.xml b/messaging/messaging/pom.xml index 3901d9f6835..4c73db0839c 100644 --- a/messaging/messaging/pom.xml +++ b/messaging/messaging/pom.xml @@ -42,6 +42,10 @@ io.helidon.common helidon-common-configurable + + io.helidon.common + helidon-common-reactive + io.helidon.microprofile.reactive-streams helidon-microprofile-reactive-streams diff --git a/messaging/messaging/src/main/java/module-info.java b/messaging/messaging/src/main/java/module-info.java index a3b870f208a..45af45a206b 100644 --- a/messaging/messaging/src/main/java/module-info.java +++ b/messaging/messaging/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, 2021 Oracle and/or its affiliates. + * Copyright (c) 2020, 2022 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ requires io.helidon.common.context; requires io.helidon.common.configurable; requires io.helidon.config.mp; + requires transitive io.helidon.common.reactive; requires transitive io.helidon.config; requires transitive org.reactivestreams; requires transitive microprofile.config.api; diff --git a/webclient/webclient/pom.xml b/webclient/webclient/pom.xml index e0bef09e189..c0267fa1cf1 100644 --- a/webclient/webclient/pom.xml +++ b/webclient/webclient/pom.xml @@ -47,6 +47,10 @@ io.helidon.common helidon-common-key-util + + io.helidon.common + helidon-common-reactive + io.helidon.config helidon-config diff --git a/webclient/webclient/src/main/java/module-info.java b/webclient/webclient/src/main/java/module-info.java index 699b431f256..10c1ec409e5 100644 --- a/webclient/webclient/src/main/java/module-info.java +++ b/webclient/webclient/src/main/java/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Oracle and/or its affiliates. + * Copyright (c) 2020, 2022 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ requires transitive io.helidon.common; requires transitive io.helidon.common.context; requires transitive io.helidon.common.http; + requires transitive io.helidon.common.reactive; requires transitive io.helidon.config; requires transitive io.helidon.media.common; requires io.helidon.common.pki; @@ -42,4 +43,4 @@ uses io.helidon.webclient.spi.WebClientServiceProvider; -} \ No newline at end of file +} From 3719c936dbb9d644fe757eac921fa23df4792d77 Mon Sep 17 00:00:00 2001 From: Joe Di Pol Date: Tue, 17 May 2022 14:48:45 -0700 Subject: [PATCH 2/2] Change common.reactive to transitive --- fault-tolerance/src/main/java/module-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fault-tolerance/src/main/java/module-info.java b/fault-tolerance/src/main/java/module-info.java index bd602c974f8..d89a42ebcb6 100644 --- a/fault-tolerance/src/main/java/module-info.java +++ b/fault-tolerance/src/main/java/module-info.java @@ -20,7 +20,7 @@ module io.helidon.faulttolerance { requires io.helidon.config; requires io.helidon.common.configurable; - requires io.helidon.common.reactive; + requires transitive io.helidon.common.reactive; requires java.logging; exports io.helidon.faulttolerance;