From d11f292b1b6457b470cddb4de600d7437e0d7b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Mon, 17 May 2021 16:54:24 +0200 Subject: [PATCH] update module information --- content-config/src/main/java/module-info.java | 4 ++-- content-core/src/main/java/module-info.java | 5 +++-- content-json/src/main/java/module-info.java | 14 ++++++-------- content-rdf/build.gradle | 1 - content-rdf/src/main/java/module-info.java | 7 +++---- content-settings/src/main/java/module-info.java | 1 - content-smile/src/main/java/module-info.java | 1 + content-xml/src/main/java/module-info.java | 1 + content-yaml/src/main/java/module-info.java | 1 + gradle.properties | 2 +- 10 files changed, 18 insertions(+), 19 deletions(-) diff --git a/content-config/src/main/java/module-info.java b/content-config/src/main/java/module-info.java index fc855aa..670dfa8 100644 --- a/content-config/src/main/java/module-info.java +++ b/content-config/src/main/java/module-info.java @@ -1,5 +1,5 @@ module org.xbib.content.config { exports org.xbib.content.config; - requires transitive org.xbib.content.json; - requires transitive org.xbib.content.yaml; + requires org.xbib.content.json; + requires org.xbib.content.yaml; } diff --git a/content-core/src/main/java/module-info.java b/content-core/src/main/java/module-info.java index 481fc2d..ce44129 100644 --- a/content-core/src/main/java/module-info.java +++ b/content-core/src/main/java/module-info.java @@ -1,8 +1,9 @@ +import org.xbib.content.XContent; import org.xbib.content.SettingsLoader; import org.xbib.content.properties.PropertiesSettingsLoader; module org.xbib.content.core { - uses org.xbib.content.XContent; + uses XContent; uses SettingsLoader; exports org.xbib.content.io; exports org.xbib.content.properties; @@ -11,6 +12,6 @@ module org.xbib.content.core { exports org.xbib.content.core; requires transitive org.xbib.content; requires transitive org.xbib.datastructures.tiny; - requires transitive com.fasterxml.jackson.core; + requires com.fasterxml.jackson.core; provides SettingsLoader with PropertiesSettingsLoader; } diff --git a/content-json/src/main/java/module-info.java b/content-json/src/main/java/module-info.java index 1bc890d..e186c21 100644 --- a/content-json/src/main/java/module-info.java +++ b/content-json/src/main/java/module-info.java @@ -1,3 +1,4 @@ +import org.xbib.content.XContent; import org.xbib.content.SettingsLoader; module org.xbib.content.json { @@ -7,12 +8,9 @@ module org.xbib.content.json { exports org.xbib.content.json.mergepatch; exports org.xbib.content.json.patch; exports org.xbib.content.json.pointer; - requires transitive org.xbib.content.core; - requires transitive org.xbib.content.settings; - requires transitive com.fasterxml.jackson.core; - requires transitive com.fasterxml.jackson.databind; - provides org.xbib.content.XContent with - org.xbib.content.json.JsonXContent; - provides SettingsLoader with - org.xbib.content.json.JsonSettingsLoader; + requires org.xbib.content.core; + requires org.xbib.content.settings; + requires com.fasterxml.jackson.databind; + provides XContent with org.xbib.content.json.JsonXContent; + provides SettingsLoader with org.xbib.content.json.JsonSettingsLoader; } diff --git a/content-rdf/build.gradle b/content-rdf/build.gradle index 78b780b..cee2286 100644 --- a/content-rdf/build.gradle +++ b/content-rdf/build.gradle @@ -1,5 +1,4 @@ dependencies { - implementation project(':content-core') implementation project(':content-resource') implementation project(':content-xml') implementation project(':content-json') diff --git a/content-rdf/src/main/java/module-info.java b/content-rdf/src/main/java/module-info.java index 577b61e..49d4efc 100644 --- a/content-rdf/src/main/java/module-info.java +++ b/content-rdf/src/main/java/module-info.java @@ -10,8 +10,7 @@ module org.xbib.content.rdf { exports org.xbib.content.rdf.io.turtle; exports org.xbib.content.rdf.io.xml; exports org.xbib.content.rdf.util; - requires transitive org.xbib.content.core; - requires transitive org.xbib.content.resource; - requires transitive org.xbib.content.xml; - requires transitive org.xbib.content.json; + requires org.xbib.content.resource; + requires org.xbib.content.xml; + requires org.xbib.content.json; } diff --git a/content-settings/src/main/java/module-info.java b/content-settings/src/main/java/module-info.java index 0ca9204..87d9f38 100644 --- a/content-settings/src/main/java/module-info.java +++ b/content-settings/src/main/java/module-info.java @@ -1,5 +1,4 @@ module org.xbib.content.settings { exports org.xbib.content.settings; requires org.xbib.content.core; - } diff --git a/content-smile/src/main/java/module-info.java b/content-smile/src/main/java/module-info.java index f1d27bf..fb9e245 100644 --- a/content-smile/src/main/java/module-info.java +++ b/content-smile/src/main/java/module-info.java @@ -2,6 +2,7 @@ module org.xbib.content.smile { exports org.xbib.content.smile; requires transitive org.xbib.content.core; requires transitive com.fasterxml.jackson.dataformat.smile; + requires com.fasterxml.jackson.core; provides org.xbib.content.XContent with org.xbib.content.smile.SmileXContent; } diff --git a/content-xml/src/main/java/module-info.java b/content-xml/src/main/java/module-info.java index c261897..28c5b2a 100644 --- a/content-xml/src/main/java/module-info.java +++ b/content-xml/src/main/java/module-info.java @@ -10,5 +10,6 @@ module org.xbib.content.xml { requires transitive org.xbib.content.core; requires transitive org.xbib.content.resource; requires transitive com.fasterxml.jackson.dataformat.xml; + requires com.fasterxml.jackson.core; provides XContent with org.xbib.content.xml.XmlXContent; } diff --git a/content-yaml/src/main/java/module-info.java b/content-yaml/src/main/java/module-info.java index ba56bc7..3146424 100644 --- a/content-yaml/src/main/java/module-info.java +++ b/content-yaml/src/main/java/module-info.java @@ -6,6 +6,7 @@ module org.xbib.content.yaml { requires transitive org.xbib.content.core; requires transitive org.xbib.content.settings; requires transitive com.fasterxml.jackson.dataformat.yaml; + requires com.fasterxml.jackson.core; provides XContent with org.xbib.content.yaml.YamlXContent; provides SettingsLoader with org.xbib.content.yaml.YamlSettingsLoader; } diff --git a/gradle.properties b/gradle.properties index b2fa058..53c77e9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ version = 3.0.0 gradle.wrapper.version = 6.6.1 xbib.net.version = 2.1.1 xbib-datastructures-tiny.version = 0.1.0 -jackson.version = 2.11.4 +jackson.version = 2.12.3 woodstox.version = 6.2.6 snakeyaml.version = 1.28 mockito.version = 3.10.0