Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.x: Remove dependency on helidon-common-reactive from config (#4225) #4229

Merged
merged 2 commits into from
May 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions config/config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@
<groupId>io.helidon.common</groupId>
<artifactId>helidon-common</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.common</groupId>
<artifactId>helidon-common-reactive</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.common</groupId>
<artifactId>helidon-common-media-type</artifactId>
Expand Down
3 changes: 1 addition & 2 deletions config/config/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions dbclient/dbclient/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
<groupId>io.helidon.common</groupId>
<artifactId>helidon-common-mapper</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.common</groupId>
<artifactId>helidon-common-reactive</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion dbclient/dbclient/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions fault-tolerance/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
<groupId>io.helidon.common</groupId>
<artifactId>helidon-common-configurable</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.common</groupId>
<artifactId>helidon-common-reactive</artifactId>
</dependency>

<dependency>
<groupId>org.hamcrest</groupId>
Expand Down
5 changes: 3 additions & 2 deletions fault-tolerance/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -20,7 +20,8 @@
module io.helidon.faulttolerance {
requires io.helidon.config;
requires io.helidon.common.configurable;
requires transitive io.helidon.common.reactive;
requires java.logging;

exports io.helidon.faulttolerance;
}
}
4 changes: 4 additions & 0 deletions integrations/vault/secrets/database/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,9 @@
<groupId>io.helidon.integrations.vault</groupId>
<artifactId>helidon-integrations-vault</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.common</groupId>
<artifactId>helidon-common-reactive</artifactId>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;

Expand All @@ -30,4 +31,4 @@

provides io.helidon.integrations.vault.spi.InjectionProvider
with io.helidon.integrations.vault.secrets.database.DbEngineProvider;
}
}
4 changes: 4 additions & 0 deletions integrations/vault/sys/sys/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,9 @@
<groupId>io.helidon.integrations.vault.auths</groupId>
<artifactId>helidon-integrations-vault-auths-common</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.common</groupId>
<artifactId>helidon-common-reactive</artifactId>
</dependency>
</dependencies>
</project>
5 changes: 3 additions & 2 deletions integrations/vault/sys/sys/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;
Expand All @@ -34,4 +35,4 @@

provides io.helidon.integrations.vault.spi.InjectionProvider
with io.helidon.integrations.vault.sys.HcpSysProvider;
}
}
4 changes: 4 additions & 0 deletions messaging/messaging/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
<groupId>io.helidon.common</groupId>
<artifactId>helidon-common-configurable</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.common</groupId>
<artifactId>helidon-common-reactive</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.microprofile.reactive-streams</groupId>
<artifactId>helidon-microprofile-reactive-streams</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion messaging/messaging/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions webclient/webclient/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@
<groupId>io.helidon.common</groupId>
<artifactId>helidon-common-key-util</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.common</groupId>
<artifactId>helidon-common-reactive</artifactId>
</dependency>
<dependency>
<groupId>io.helidon.config</groupId>
<artifactId>helidon-config</artifactId>
Expand Down
5 changes: 3 additions & 2 deletions webclient/webclient/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;
Expand All @@ -42,4 +43,4 @@

uses io.helidon.webclient.spi.WebClientServiceProvider;

}
}