From 66e2dce3b366bf96c6ecfe85d23857dea507c365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Fri, 22 May 2020 13:41:49 +0200 Subject: [PATCH] add Java named modules --- elx-api/src/main/java/module-info.java | 5 +++++ elx-common/src/main/java/module-info.java | 19 +++++++++++++++++++ elx-node/src/main/java/module-info.java | 13 +++++++++++++ elx-transport/src/main/java/module-info.java | 14 ++++++++++++++ gradle.properties | 4 ++-- 5 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 elx-api/src/main/java/module-info.java create mode 100644 elx-common/src/main/java/module-info.java create mode 100644 elx-node/src/main/java/module-info.java create mode 100644 elx-transport/src/main/java/module-info.java diff --git a/elx-api/src/main/java/module-info.java b/elx-api/src/main/java/module-info.java new file mode 100644 index 0000000..6c556c8 --- /dev/null +++ b/elx-api/src/main/java/module-info.java @@ -0,0 +1,5 @@ +module org.xbib.elx.api { + exports org.xbib.elx.api; + requires org.xbib.metrics.api; + requires org.xbib.elasticsearch.server; +} \ No newline at end of file diff --git a/elx-common/src/main/java/module-info.java b/elx-common/src/main/java/module-info.java new file mode 100644 index 0000000..7f090fa --- /dev/null +++ b/elx-common/src/main/java/module-info.java @@ -0,0 +1,19 @@ +module org.xbib.elx.common { + exports org.xbib.elx.common; + exports org.xbib.elx.common.io; + exports org.xbib.elx.common.util; + requires org.xbib.elx.api; + requires org.xbib.metrics.api; + requires org.xbib.metrics.common; + requires org.xbib.elasticsearch.hppc; + requires org.xbib.elasticsearch.log4j; + requires org.xbib.elasticsearch.server; + provides java.net.URLStreamHandlerFactory with + org.xbib.elx.common.io.ClasspathURLStreamHandlerFactory; + provides org.xbib.elx.api.AdminClientProvider with + org.xbib.elx.common.MockAdminClientProvider; + provides org.xbib.elx.api.BulkClientProvider with + org.xbib.elx.common.MockBulkClientProvider; + provides org.xbib.elx.api.SearchClientProvider with + org.xbib.elx.common.MockSearchClientProvider; +} diff --git a/elx-node/src/main/java/module-info.java b/elx-node/src/main/java/module-info.java new file mode 100644 index 0000000..d612112 --- /dev/null +++ b/elx-node/src/main/java/module-info.java @@ -0,0 +1,13 @@ +module org.xbib.elx.node { + exports org.xbib.elx.node; + requires org.xbib.elx.api; + requires org.xbib.elx.common; + requires org.xbib.elasticsearch.log4j; + requires org.xbib.elasticsearch.server; + provides org.xbib.elx.api.AdminClientProvider with + org.xbib.elx.node.NodeAdminClientProvider; + provides org.xbib.elx.api.BulkClientProvider with + org.xbib.elx.node.NodeBulkClientProvider; + provides org.xbib.elx.api.SearchClientProvider with + org.xbib.elx.node.NodeSearchClientProvider; +} diff --git a/elx-transport/src/main/java/module-info.java b/elx-transport/src/main/java/module-info.java new file mode 100644 index 0000000..a6c2c1a --- /dev/null +++ b/elx-transport/src/main/java/module-info.java @@ -0,0 +1,14 @@ +module org.xbib.elx.transport { + exports org.xbib.elx.transport; + requires org.xbib.elx.api; + requires org.xbib.elx.common; + requires org.xbib.elasticsearch.log4j; + requires org.xbib.elasticsearch.server; + requires org.xbib.elasticsearch.transport.nettyfour; + provides org.xbib.elx.api.AdminClientProvider with + org.xbib.elx.transport.TransportAdminClientProvider; + provides org.xbib.elx.api.BulkClientProvider with + org.xbib.elx.transport.TransportBulkClientProvider; + provides org.xbib.elx.api.SearchClientProvider with + org.xbib.elx.transport.TransportSearchClientProvider; +} diff --git a/gradle.properties b/gradle.properties index e3f9a52..a16a603 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ version = 6.3.2.7 gradle.wrapper.version = 6.4.1 elasticsearch-server.version = 6.3.2.4 -log4j.version = 2.13.1 tcnative.version = 2.0.29.Final tcnative-legacy-macosx.version = 2.0.26.Final bouncycastle.version = 1.64 xbib-metrics.version = 2.1.0 -xbib-netty-http.version = 4.1.49.0 +xbib-netty-http.version = 4.1.49.1 +log4j.version = 2.13.1 asciidoclet.version = 1.6.0.0