diff --git a/gradle.properties b/gradle.properties index 3e1d21f..c117d98 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ group = org.xbib name = marc -version = 2.3.0 +version = 2.3.1 gradle.wrapper.version = 6.4.1 -xbib-content.version = 2.2.0 -xbib-bibliographic-character-sets.version = 1.0.0 +xbib-content.version = 2.3.1 +xbib-bibliographic-character-sets.version = 2.0.0 xalan.version = 2.7.2 xmlunit-matchers.version = 2.6.3 system-rules.version = 1.19.0 -mockito.version = 3.1.0 +mockito.version = 3.3.3 marc4j.version = 2.9.1 diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index 7b1e601..9c8798d 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -33,3 +33,11 @@ task javadocJar(type: Jar, dependsOn: javadoc) { artifacts { archives sourcesJar, javadocJar } + +tasks.withType(JavaCompile) { + options.compilerArgs << '-Xlint:all' +} + +javadoc { + options.addStringOption('Xdoclint:none', '-quiet') +} diff --git a/gradle/codequality/todo.gradle b/gradle/quality/todo.gradle similarity index 100% rename from gradle/codequality/todo.gradle rename to gradle/quality/todo.gradle diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index 1469045..74c4b8b 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -15,6 +15,6 @@ module org.xbib.marc { exports org.xbib.marc.transformer.field; exports org.xbib.marc.transformer.value; exports org.xbib.marc.xml; + requires transitive java.xml; requires java.logging; - requires java.xml; } diff --git a/src/main/java/org/xbib/marc/io/StreamTokenHandler.java b/src/main/java/org/xbib/marc/io/StreamTokenHandler.java index ae841c0..a6d7184 100644 --- a/src/main/java/org/xbib/marc/io/StreamTokenHandler.java +++ b/src/main/java/org/xbib/marc/io/StreamTokenHandler.java @@ -23,7 +23,7 @@ import java.io.InputStream; * Interface for stream token handlers. */ @FunctionalInterface -interface StreamTokenHandler { +public interface StreamTokenHandler { /** * Process token. * @param token the token diff --git a/src/main/java/org/xbib/marc/json/JsonObject.java b/src/main/java/org/xbib/marc/json/JsonObject.java index ca3d6b9..2efc7c2 100755 --- a/src/main/java/org/xbib/marc/json/JsonObject.java +++ b/src/main/java/org/xbib/marc/json/JsonObject.java @@ -57,7 +57,7 @@ import java.util.Objects; * may lead to an inconsistent state. *
*/ -class JsonObject extends JsonValue implements Iterable