diff --git a/build.gradle b/build.gradle
index 3811658..eae867a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,166 +1,34 @@
-
 plugins {
-    id "org.sonarqube" version "2.8"
+    id "de.marcphilipp.nexus-publish" version "0.4.0"
     id "io.codearte.nexus-staging" version "0.21.1"
-    id "com.github.spotbugs" version "2.0.1"
     id "org.xbib.gradle.plugin.asciidoctor" version "1.5.6.0.1"
 }
 
+wrapper {
+    gradleVersion = "${project.property('gradle.wrapper.version')}"
+    distributionType = Wrapper.DistributionType.ALL
+}
+
+ext {
+    user = 'xbib'
+    name = 'net'
+    description = 'Network classes for Java'
+    inceptionYear = '2016'
+    url = 'https://github.com/' + user + '/' + name
+    scmUrl = 'https://github.com/' + user + '/' + name
+    scmConnection = 'scm:git:git://github.com/' + user + '/' + name + '.git'
+    scmDeveloperConnection = 'scm:git:ssh://git@github.com:' + user + '/' + name + '.git'
+    issueManagementSystem = 'Github'
+    issueManagementUrl = ext.scmUrl + '/issues'
+    licenseName = 'The Apache License, Version 2.0'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+}
+
 subprojects {
-
-    apply plugin: 'java'
-    apply plugin: 'maven'
-    apply plugin: 'checkstyle'
-    apply plugin: 'com.github.spotbugs'
-    apply plugin: 'pmd'
-    apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
-
-    repositories {
-        mavenCentral()
-    }
-
-    configurations {
-        asciidoclet
-    }
-
-    dependencies {
-        testImplementation "org.junit.jupiter:junit-jupiter-api:${project.property('junit.version')}"
-        testImplementation "org.junit.jupiter:junit-jupiter-params:${project.property('junit.version')}"
-        testImplementation "org.hamcrest:hamcrest-library:${project.property('hamcrest.version')}"
-        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.property('junit.version')}"
-        testImplementation "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}"
-        asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}"
-    }
-
-    compileJava {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-    
-    compileTestJava {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-    
-    tasks.withType(JavaCompile) {
-        options.compilerArgs << "-Xlint:all"
-    }
-
-    jar {
-        manifest {
-            attributes('Implementation-Version': project.version)
-        }
-    }
-
-    clean {
-        delete 'out'
-    }
-
-    test {
-        useJUnitPlatform()
-        systemProperty 'java.net.preferIPv4Stack', 'false'
-        systemProperty 'java.net.preferIPv6Addresses', 'true'
-        failFast = false
-        testLogging {
-            events 'STARTED', 'PASSED', 'FAILED', 'SKIPPED'
-        }
-        afterSuite { desc, result ->
-            if (!desc.parent) {
-                println "\nTest result: ${result.resultType}"
-                println "Test summary: ${result.testCount} tests, " +
-                        "${result.successfulTestCount} succeeded, " +
-                        "${result.failedTestCount} failed, " +
-                        "${result.skippedTestCount} skipped"
-            }
-        }
-    }
-
-    asciidoctor {
-        attributes 'source-highlighter': 'coderay',
-                toc: 'left',
-                doctype: 'book',
-                icons: 'font',
-                encoding: 'utf-8',
-                sectlink: true,
-                sectanchors: true,
-                linkattrs: true,
-                imagesdir: 'img'
-    }
-
-    /*javadoc {
-        options.docletpath = configurations.asciidoclet.files.asType(List)
-        options.doclet = 'org.asciidoctor.Asciidoclet'
-        //options.overview = "src/docs/asciidoclet/overview.adoc"
-        options.addStringOption "-base-dir", "${projectDir}"
-        options.addStringOption "-attribute",
-                "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}"
-        configure(options) {
-            noTimestamp = true
-        }
-    }*/
-
-    task sourcesJar(type: Jar, dependsOn: classes) {
-        classifier 'sources'
-        from sourceSets.main.allSource
-    }
-
-    task javadocJar(type: Jar, dependsOn: javadoc) {
-        classifier 'javadoc'
-    }
-
-    artifacts {
-        archives sourcesJar, javadocJar
-    }
-
-    apply from: "${rootProject.projectDir}/gradle/publish.gradle"
-
-    tasks.withType(Checkstyle) {
-        ignoreFailures = true
-        reports {
-            xml.enabled = true
-            html.enabled = true
-        }
-    }
-
-    tasks.withType(Pmd) {
-        ignoreFailures = true
-        reports {
-            xml.enabled = true
-            html.enabled = true
-        }
-    }
-
-    checkstyle {
-        //configFile = rootProject.file('config/checkstyle/checkstyle.xml')
-        ignoreFailures = true
-        showViolations = true
-    }
-
-    sonarqube {
-        properties {
-            property "sonar.projectName", "${project.group} ${project.name}"
-            property "sonar.sourceEncoding", "UTF-8"
-            property "sonar.tests", "src/test/java"
-            property "sonar.scm.provider", "git"
-            property "sonar.junit.reportsPath", "build/test-results/test/"
-        }
-    }
-
-    spotbugs {
-        effort = "max"
-        reportLevel = "low"
-        //includeFilter = file("findbugs-exclude.xml")
-    }
-
-    tasks.withType(com.github.spotbugs.SpotBugsTask) {
-        ignoreFailures = true
-        reports {
-            xml.enabled = false
-            html.enabled = true
-        }
-    }
-}
-
-nexusStaging {
-    packageGroup = "org.xbib"
+    apply from: rootProject.file('gradle/ide/idea.gradle')
+    apply from: rootProject.file('gradle/compile/java.gradle')
+    apply from: rootProject.file('gradle/test/junit5.gradle')
+    apply from: rootProject.file('gradle/documentation/asciidoc.gradle')
+    apply from: rootProject.file('gradle/publish/publication.gradle')
 }
+apply from: rootProject.file('gradle/publish/sonatype.gradle')
diff --git a/gradle.properties b/gradle.properties
index 84e0d6a..a3f7701 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,7 @@
 group = org.xbib
 name = net
-version = 2.0.3
+version = 2.0.4
 
-# test
-junit.version = 5.5.2
-hamcrest.version = 2.1
+gradle.wrapper.version = 6.4.1
 jackson.version = 2.9.10
-
-# doc
 asciidoclet.version = 1.5.6
diff --git a/gradle/codequality/sonarqube.gradle b/gradle/codequality/sonarqube.gradle
new file mode 100644
index 0000000..ec439b2
--- /dev/null
+++ b/gradle/codequality/sonarqube.gradle
@@ -0,0 +1,50 @@
+
+subprojects {
+
+    sonarqube {
+        properties {
+            property "sonar.projectName", "${project.group} ${project.name}"
+            property "sonar.sourceEncoding", "UTF-8"
+            property "sonar.tests", "src/test/java"
+            property "sonar.scm.provider", "git"
+            property "sonar.junit.reportsPath", "build/test-results/test/"
+        }
+    }
+
+
+    tasks.withType(Checkstyle) {
+        ignoreFailures = true
+        reports {
+            xml.enabled = true
+            html.enabled = true
+        }
+    }
+
+    tasks.withType(Pmd) {
+        ignoreFailures = true
+        reports {
+            xml.enabled = true
+            html.enabled = true
+        }
+    }
+
+    checkstyle {
+        //configFile = rootProject.file('config/checkstyle/checkstyle.xml')
+        ignoreFailures = true
+        showViolations = true
+    }
+
+    spotbugs {
+        effort = "max"
+        reportLevel = "low"
+        //includeFilter = file("findbugs-exclude.xml")
+    }
+
+    tasks.withType(com.github.spotbugs.SpotBugsTask) {
+        ignoreFailures = true
+        reports {
+            xml.enabled = false
+            html.enabled = true
+        }
+    }
+}
\ No newline at end of file
diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle
new file mode 100644
index 0000000..7b1e601
--- /dev/null
+++ b/gradle/compile/java.gradle
@@ -0,0 +1,35 @@
+
+apply plugin: 'java-library'
+
+java {
+    modularity.inferModulePath.set(true)
+}
+
+compileJava {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+compileTestJava {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+jar {
+    manifest {
+        attributes('Implementation-Version': project.version)
+    }
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier 'sources'
+    from sourceSets.main.allSource
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier 'javadoc'
+}
+
+artifacts {
+    archives sourcesJar, javadocJar
+}
diff --git a/gradle/documentation/asciidoc.gradle b/gradle/documentation/asciidoc.gradle
new file mode 100644
index 0000000..34ace12
--- /dev/null
+++ b/gradle/documentation/asciidoc.gradle
@@ -0,0 +1,36 @@
+apply plugin: 'org.xbib.gradle.plugin.asciidoctor'
+
+configurations {
+    asciidoclet
+}
+
+dependencies {
+    asciidoclet "org.asciidoctor:asciidoclet:${project.property('asciidoclet.version')}"
+}
+
+subprojects {
+
+    /*javadoc {
+    options.docletpath = configurations.asciidoclet.files.asType(List)
+    options.doclet = 'org.asciidoctor.Asciidoclet'
+    //options.overview = "src/docs/asciidoclet/overview.adoc"
+    options.addStringOption "-base-dir", "${projectDir}"
+    options.addStringOption "-attribute",
+            "name=${project.name},version=${project.version},title-link=https://github.com/xbib/${project.name}"
+    configure(options) {
+        noTimestamp = true
+    }
+}*/
+
+    asciidoctor {
+        attributes 'source-highlighter': 'coderay',
+                toc: 'left',
+                doctype: 'book',
+                icons: 'font',
+                encoding: 'utf-8',
+                sectlink: true,
+                sectanchors: true,
+                linkattrs: true,
+                imagesdir: 'img'
+    }
+}
\ No newline at end of file
diff --git a/gradle/ide/idea.gradle b/gradle/ide/idea.gradle
new file mode 100644
index 0000000..e396bb1
--- /dev/null
+++ b/gradle/ide/idea.gradle
@@ -0,0 +1,13 @@
+apply plugin: 'idea'
+
+idea {
+    module {
+        outputDir file('build/classes/java/main')
+        testOutputDir file('build/classes/java/test')
+    }
+}
+
+if (project.convention.findPlugin(JavaPluginConvention)) {
+    sourceSets.main.output.classesDir = new File(buildDir, "classes/java/main")
+    sourceSets.test.output.classesDir = new File(buildDir, "classes/java/test")
+}
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
deleted file mode 100644
index 4ad09ea..0000000
--- a/gradle/publish.gradle
+++ /dev/null
@@ -1,75 +0,0 @@
-
-ext {
-    projectDescription = 'Network classes for Java'
-    scmUrl = 'https://github.com/xbib/net'
-    scmConnection = 'scm:git:git://github.com/xbib/net.git'
-    scmDeveloperConnection = 'scm:git:git://github.com/xbib/net.git'
-}
-
-/*task xbibUpload(type: Upload) {
-    group = 'publish'
-    configuration = configurations.archives
-    uploadDescriptor = true
-    repositories {
-        if (project.hasProperty("xbibUsername")) {
-            mavenDeployer {
-                configuration = configurations.wagon
-                repository(url: 'sftp://xbib.org/repository') {
-                    authentication(userName: xbibUsername, privateKey: xbibPrivateKey)
-                }
-            }
-        }
-    }
-}*/
-
-task sonatypeUpload(type: Upload, dependsOn: build) {
-    group = 'publish'
-    configuration = configurations.archives
-    uploadDescriptor = true
-    repositories {
-        if (project.hasProperty('ossrhUsername')) {
-            mavenDeployer {
-                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-                repository(url: uri(ossrhReleaseUrl)) {
-                        authentication(userName: ossrhUsername, password: ossrhPassword)
-                }
-                snapshotRepository(url: uri(ossrhSnapshotUrl)) {
-                        authentication(userName: ossrhUsername, password: ossrhPassword)
-                }
-                pom.project {
-                    groupId project.group
-                    artifactId project.name
-                    version project.version
-                    name project.name
-                    description projectDescription
-                    packaging 'jar'
-                    inceptionYear '2017'
-                    url scmUrl
-                    organization {
-                        name 'xbib'
-                        url 'http://xbib.org'
-                    }
-                    developers {
-                        developer {
-                            id 'xbib'
-                            name 'Jörg Prante'
-                            email 'joergprante@gmail.com'
-                            url 'https://github.com/xbib'
-                        }
-                    }
-                    scm {
-                        url scmUrl
-                        connection scmConnection
-                        developerConnection scmDeveloperConnection
-                    }
-                    licenses {
-                        license {
-                            name 'The Apache License, Version 2.0'
-                            url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/gradle/publish/publication.gradle b/gradle/publish/publication.gradle
new file mode 100644
index 0000000..c35fcb9
--- /dev/null
+++ b/gradle/publish/publication.gradle
@@ -0,0 +1,64 @@
+
+apply plugin: "de.marcphilipp.nexus-publish"
+
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+            artifact sourcesJar
+            artifact javadocJar
+            pom {
+                name = project.name
+                description = rootProject.ext.description
+                url = rootProject.ext.url
+                inceptionYear = rootProject.ext.inceptionYear
+                packaging = 'jar'
+                organization {
+                    name = 'xbib'
+                    url = 'https://xbib.org'
+                }
+                developers {
+                    developer {
+                        id = 'jprante'
+                        name = 'Jörg Prante'
+                        email = 'joergprante@gmail.com'
+                        url = 'https://github.com/jprante'
+                    }
+                }
+                scm {
+                    url = rootProject.ext.scmUrl
+                    connection = rootProject.ext.scmConnection
+                    developerConnection = rootProject.ext.scmDeveloperConnection
+                }
+                issueManagement {
+                    system = rootProject.ext.issueManagementSystem
+                    url = rootProject.ext.issueManagementUrl
+                }
+                licenses {
+                    license {
+                        name = rootProject.ext.licenseName
+                        url = rootProject.ext.licenseUrl
+                        distribution = 'repo'
+                    }
+                }
+            }
+        }
+    }
+}
+
+if (project.hasProperty("signing.keyId")) {
+    apply plugin: 'signing'
+    signing {
+        sign publishing.publications.mavenJava
+    }
+}
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            username = project.property('ossrhUsername')
+            password = project.property('ossrhPassword')
+            packageGroup = "org.xbib"
+        }
+    }
+}
diff --git a/gradle/publish/sonatype.gradle b/gradle/publish/sonatype.gradle
new file mode 100644
index 0000000..e1813f3
--- /dev/null
+++ b/gradle/publish/sonatype.gradle
@@ -0,0 +1,11 @@
+
+if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
+
+    apply plugin: 'io.codearte.nexus-staging'
+
+    nexusStaging {
+        username = project.property('ossrhUsername')
+        password = project.property('ossrhPassword')
+        packageGroup = "org.xbib"
+    }
+}
diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle
new file mode 100644
index 0000000..8ca206c
--- /dev/null
+++ b/gradle/test/junit5.gradle
@@ -0,0 +1,28 @@
+
+
+def junitVersion = project.hasProperty('junit.version')?project.property('junit.version'):'5.6.2'
+def hamcrestVersion = project.hasProperty('hamcrest.version')?project.property('hamcrest.version'):'2.2'
+
+dependencies {
+    testImplementation "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
+    testImplementation "org.junit.jupiter:junit-jupiter-params:${junitVersion}"
+    testImplementation "org.hamcrest:hamcrest-library:${hamcrestVersion}"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
+}
+
+test {
+    useJUnitPlatform()
+    failFast = true
+    testLogging {
+        events 'STARTED', 'PASSED', 'FAILED', 'SKIPPED'
+    }
+    afterSuite { desc, result ->
+        if (!desc.parent) {
+            println "\nTest result: ${result.resultType}"
+            println "Test summary: ${result.testCount} tests, " +
+                    "${result.successfulTestCount} succeeded, " +
+                    "${result.failedTestCount} failed, " +
+                    "${result.skippedTestCount} skipped"
+        }
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf..62d4c05 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 414de9d..21e622d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue Mar 10 16:34:18 CET 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 83f2acf..fbd7c51 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 24467a1..a9f778a 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -81,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
diff --git a/net-http/build.gradle b/net-http/build.gradle
index 21aeee4..d2d693d 100644
--- a/net-http/build.gradle
+++ b/net-http/build.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    compile project(':net-url')
+    api project(':net-url')
 }
diff --git a/net-http/src/main/java/module-info.java b/net-http/src/main/java/module-info.java
new file mode 100644
index 0000000..edded88
--- /dev/null
+++ b/net-http/src/main/java/module-info.java
@@ -0,0 +1,5 @@
+module org.xbib.net.http {
+    exports org.xbib.net.http;
+    exports org.xbib.net.http.util;
+    requires org.xbib.net.url;
+}
diff --git a/net-oauth/build.gradle b/net-oauth/build.gradle
index 0cb40e7..5929d8a 100644
--- a/net-oauth/build.gradle
+++ b/net-oauth/build.gradle
@@ -1,3 +1,3 @@
 dependencies {
-    compile project(':net-http')
+    api project(':net-http')
 }
diff --git a/net-url/build.gradle b/net-url/build.gradle
new file mode 100644
index 0000000..11c67c4
--- /dev/null
+++ b/net-url/build.gradle
@@ -0,0 +1,4 @@
+
+dependencies {
+    testImplementation "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}"
+}
diff --git a/net-url/src/main/java/module-info.java b/net-url/src/main/java/module-info.java
new file mode 100644
index 0000000..9e825ec
--- /dev/null
+++ b/net-url/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+module org.xbib.net.url {
+    exports org.xbib.net;
+    exports org.xbib.net.path;
+    exports org.xbib.net.matcher;
+    exports org.xbib.net.scheme;
+    exports org.xbib.net.template;
+}
diff --git a/net-url/src/main/java/org/xbib/net/URL.java b/net-url/src/main/java/org/xbib/net/URL.java
index ff0e6ff..04ed2da 100755
--- a/net-url/src/main/java/org/xbib/net/URL.java
+++ b/net-url/src/main/java/org/xbib/net/URL.java
@@ -22,8 +22,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  *
@@ -49,8 +47,6 @@ import java.util.logging.Logger;
  */
 public class URL implements Comparable<URL> {
 
-    private static final Logger logger = Logger.getLogger(URL.class.getName());
-
     private static final char SEPARATOR_CHAR = '/';
 
     private static final char QUESTION_CHAR = '?';
@@ -286,7 +282,6 @@ public class URL implements Comparable<URL> {
             return parser(charset, codingErrorAction).parse(input, resolve);
         } catch (URLSyntaxException | MalformedInputException | UnmappableCharacterException e) {
             if (disableException) {
-                logger.log(Level.WARNING, e.getMessage(), e);
                 return null;
             } else {
                 throw new IllegalArgumentException(e);
@@ -307,7 +302,6 @@ public class URL implements Comparable<URL> {
             return new Resolver(base).resolve(spec);
         } catch (URLSyntaxException | MalformedInputException | UnmappableCharacterException e) {
             if (disableException) {
-                logger.log(Level.WARNING, e.getMessage(), e);
                 return null;
             } else {
                 throw new IllegalArgumentException(e);
@@ -328,7 +322,6 @@ public class URL implements Comparable<URL> {
             return new Resolver(base).resolve(spec);
         } catch (URLSyntaxException e) {
             if (disableException) {
-                logger.log(Level.WARNING, e.getMessage(), e);
                 return null;
             } else {
                 throw new IllegalArgumentException(e);
@@ -363,7 +356,6 @@ public class URL implements Comparable<URL> {
             return URL.parser().parse(query.charAt(0) == QUESTION_CHAR ? query : QUESTION_CHAR + query).getQueryParams();
         } catch (URLSyntaxException | MalformedInputException | UnmappableCharacterException e) {
             if (disableException) {
-                logger.log(Level.WARNING, e.getMessage(), e);
                 return null;
             } else {
                 throw new IllegalArgumentException(e);
@@ -945,7 +937,6 @@ public class URL implements Comparable<URL> {
                 if (fatalResolveErrorsEnabled) {
                     throw new IllegalStateException(e);
                 }
-                logger.log(Level.WARNING, e.getMessage(), e);
                 if (e.getMessage() != null && !e.getMessage().endsWith("invalid IPv6 address") &&
                         hostname.charAt(0) != LEFT_BRACKET_CHAR &&
                         hostname.charAt(hostname.length() - 1) != RIGHT_BRACKET_CHAR) {
diff --git a/settings.gradle b/settings.gradle
index 925906e..7e685f6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,2 @@
-rootProject.name = name
-
 include 'net-url'
 include 'net-http'