diff --git a/net-http-j2html/src/main/java/module-info.java b/net-http-j2html/src/main/java/module-info.java
index 91fd3e2..d702a3b 100644
--- a/net-http-j2html/src/main/java/module-info.java
+++ b/net-http-j2html/src/main/java/module-info.java
@@ -3,7 +3,6 @@ module org.xbib.net.http.j2html {
requires org.xbib.net;
requires org.xbib.net.http;
requires org.xbib.net.http.server;
- requires org.xbib.config;
requires org.xbib.j2html;
requires java.logging;
}
diff --git a/net-http-server-application-config/src/main/java/module-info.java b/net-http-server-application-config/src/main/java/module-info.java
index 1edb78c..7c83b54 100644
--- a/net-http-server-application-config/src/main/java/module-info.java
+++ b/net-http-server-application-config/src/main/java/module-info.java
@@ -1,8 +1,8 @@
module org.xbib.net.http.server.application.config {
- uses org.xbib.config.ConfigLogger;
- exports org.xbib.net.http.server.application.config;
+ requires java.logging;
requires org.xbib.net;
requires org.xbib.net.http.server;
requires org.xbib.config;
- requires java.logging;
+ exports org.xbib.net.http.server.application.config;
+ uses org.xbib.config.ConfigLogger;
}
diff --git a/net-http-server-application-database/build.gradle b/net-http-server-application-database/build.gradle
index e454b87..f8cc991 100644
--- a/net-http-server-application-database/build.gradle
+++ b/net-http-server-application-database/build.gradle
@@ -2,4 +2,5 @@ dependencies {
api project(':net-http-server')
api libs.datastructures.json.tiny
api libs.jdbc.query
+ implementation libs.settings.api
}
diff --git a/net-http-server-application-database/src/main/java/module-info.java b/net-http-server-application-database/src/main/java/module-info.java
index 0ba609b..c181ab5 100644
--- a/net-http-server-application-database/src/main/java/module-info.java
+++ b/net-http-server-application-database/src/main/java/module-info.java
@@ -1,11 +1,11 @@
module org.xbib.net.http.server.application.database {
+ requires java.logging;
+ requires java.sql;
requires org.xbib.net;
requires org.xbib.net.http;
requires org.xbib.net.http.server;
- requires org.xbib.config;
+ requires org.xbib.datastructures.tiny;
+ requires org.xbib.settings.api;
requires org.xbib.jdbc.query;
requires org.xbib.jdbc.connection.pool;
- requires org.xbib.datastructures.tiny;
- requires java.logging;
- requires java.sql;
}
diff --git a/net-http-server-application-journal/build.gradle b/net-http-server-application-journal/build.gradle
index ce6e8b7..ff668a9 100644
--- a/net-http-server-application-journal/build.gradle
+++ b/net-http-server-application-journal/build.gradle
@@ -1,3 +1,4 @@
dependencies {
api project(':net-http-server')
+ implementation libs.settings.api
}
diff --git a/net-http-server/build.gradle b/net-http-server/build.gradle
index 2d7c0e4..5e1b096 100644
--- a/net-http-server/build.gradle
+++ b/net-http-server/build.gradle
@@ -1,8 +1,8 @@
dependencies {
api project(':net-http')
- api libs.config
implementation libs.datastructures.tiny
implementation libs.datastructures.json.tiny
+ implementation libs.settings.api
}
def moduleName = 'org.xbib.net.http.server.test'
diff --git a/net-http-template-groovy/build.gradle b/net-http-template-groovy/build.gradle
index 948b9ba..f7580a1 100644
--- a/net-http-template-groovy/build.gradle
+++ b/net-http-template-groovy/build.gradle
@@ -1,6 +1,7 @@
dependencies {
api project(':net-http-server')
api libs.groovy.templates
+ implementation libs.settings.api
}
def moduleName = 'org.xbib.net.http.template.groovy.test'
diff --git a/net-http-template-groovy/src/main/java/module-info.java b/net-http-template-groovy/src/main/java/module-info.java
index 5714436..492a11e 100644
--- a/net-http-template-groovy/src/main/java/module-info.java
+++ b/net-http-template-groovy/src/main/java/module-info.java
@@ -1,10 +1,10 @@
module org.xbib.net.http.template.groovy {
- exports org.xbib.net.http.template.groovy;
+ requires java.logging;
requires org.xbib.net;
requires org.xbib.net.http;
requires org.xbib.net.http.server;
- requires org.xbib.config;
+ requires org.xbib.settings.api;
requires org.apache.groovy;
requires org.apache.groovy.templates;
- requires java.logging;
+ exports org.xbib.net.http.template.groovy;
}
diff --git a/settings.gradle b/settings.gradle
index 2a8b8b0..a7ae6d4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -30,11 +30,12 @@ dependencyResolutionManagement {
library('datastructures-tiny', 'org.xbib', 'datastructures-tiny').versionRef('datastructures')
library('datastructures-json-tiny', 'org.xbib', 'datastructures-json-tiny').versionRef('datastructures')
library('datastructures-yaml-tiny', 'org.xbib', 'datastructures-yaml-tiny').versionRef('datastructures')
- library('config', 'org.xbib', 'config').versionRef('datastructures')
+ library('settings-api', 'org.xbib', 'settings-api').versionRef('datastructures')
library('settings-datastructures-json', 'org.xbib', 'settings-datastructures-json').versionRef('datastructures')
library('settings-datastructures-yaml', 'org.xbib', 'settings-datastructures-yaml').versionRef('datastructures')
- library('jdbc-query', 'org.xbib', 'jdbc-query').version('2.0.2')
- library('jdbc-connection-pool', 'org.xbib', 'jdbc-connection-pool').version('2.0.2')
+ library('config', 'org.xbib', 'config').versionRef('datastructures')
+ library('jdbc-query', 'org.xbib', 'jdbc-query').version('2.0.3')
+ library('jdbc-connection-pool', 'org.xbib', 'jdbc-connection-pool').version('2.0.3')
}
testLibs {
version('junit', '5.10.2')