From 938e1afd37ecd7be0193437db72bb7c42b350e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=CC=88rg=20Prante?= Date: Fri, 5 Jun 2020 09:50:24 +0200 Subject: [PATCH] update named modules, Jackson 2.11 --- gradle.properties | 4 ++-- gradle/compile/java.gradle | 9 +++++++++ gradle/{codequality => quality}/sonarqube.gradle | 0 net-url/src/main/java/module-info.java | 6 ++++++ .../main/java/org/xbib/net/path/PathStringMatcher.java | 4 ++-- 5 files changed, 19 insertions(+), 4 deletions(-) rename gradle/{codequality => quality}/sonarqube.gradle (100%) diff --git a/gradle.properties b/gradle.properties index a3f7701..c73b6c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.xbib name = net -version = 2.0.4 +version = 2.1.0 gradle.wrapper.version = 6.4.1 -jackson.version = 2.9.10 +jackson.version = 2.11.0 asciidoclet.version = 1.5.6 diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index 7b1e601..ed78274 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -33,3 +33,12 @@ 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/sonarqube.gradle b/gradle/quality/sonarqube.gradle similarity index 100% rename from gradle/codequality/sonarqube.gradle rename to gradle/quality/sonarqube.gradle diff --git a/net-url/src/main/java/module-info.java b/net-url/src/main/java/module-info.java index 9e825ec..5685e04 100644 --- a/net-url/src/main/java/module-info.java +++ b/net-url/src/main/java/module-info.java @@ -4,4 +4,10 @@ module org.xbib.net.url { exports org.xbib.net.matcher; exports org.xbib.net.scheme; exports org.xbib.net.template; + exports org.xbib.net.template.expression; + exports org.xbib.net.template.parse; + exports org.xbib.net.template.render; + exports org.xbib.net.template.vars; + exports org.xbib.net.template.vars.specs; + exports org.xbib.net.template.vars.values; } diff --git a/net-url/src/main/java/org/xbib/net/path/PathStringMatcher.java b/net-url/src/main/java/org/xbib/net/path/PathStringMatcher.java index 3335e7b..f2bb58f 100644 --- a/net-url/src/main/java/org/xbib/net/path/PathStringMatcher.java +++ b/net-url/src/main/java/org/xbib/net/path/PathStringMatcher.java @@ -10,7 +10,7 @@ import java.util.regex.Pattern; /** * Path string matcher. */ -class PathStringMatcher { +public class PathStringMatcher { private static final Pattern GLOB_PATTERN = Pattern.compile("\\?|\\*|\\{((?:\\{[^/]+?\\}|[^/{}]|\\\\[{}])+?)\\}"); @@ -20,7 +20,7 @@ class PathStringMatcher { private final Pattern pattern; - PathStringMatcher(String pattern, boolean caseSensitive) { + public PathStringMatcher(String pattern, boolean caseSensitive) { StringBuilder patternBuilder = new StringBuilder(); Matcher matcher = GLOB_PATTERN.matcher(pattern); int end = 0;