diff --git a/config/config/pom.xml b/config/config/pom.xml
index 9f6977c1b70..0b30bc8efe4 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 5d5d73c1645..88a64ee883f 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 java.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 2a93da7d84d..436788213af 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 fd45e7cd053..4896c89956d 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 75c8ab0a915..adc29b2e036 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 08299b66dbf..9f399f5df78 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 f2d5d6b701c..3a1368ef2a4 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 a39218539e9..26a4a798567 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
+}