update to Gradl 8.1.1, fix tests, remove file logging

build.gradle

@@ -16,22 +16,20 @@ wrapper {
 }
 
 ext {
-    user = 'xbib'
+    user = 'joerg'
     name = 'net'
     description = 'Network classes for Java'
     inceptionYear = '2016'
-    url = 'https://github.com/' + user + '/' + name
+    url = 'https://xbib.org/' + user + '/' + name
-    scmUrl = 'https://github.com/' + user + '/' + name
+    scmUrl = 'https://xbib.org/' + user + '/' + name
-    scmConnection = 'scm:git:git://github.com/' + user + '/' + name + '.git'
+    scmConnection = 'scm:git:git://xbib.org/' + user + '/' + name + '.git'
-    scmDeveloperConnection = 'scm:git:ssh://git@github.com:' + user + '/' + name + '.git'
+    scmDeveloperConnection = 'scm:git:ssh://forgejo@xbib.org:' + 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'
 }
 
-apply plugin: "io.github.gradle-nexus.publish-plugin"
-
 subprojects {
     apply from: rootProject.file('gradle/ide/idea.gradle')
     apply from: rootProject.file('gradle/repositories/maven.gradle')
@@ -44,4 +42,5 @@ subprojects {
     apply from: rootProject.file('gradle/publish/maven.gradle')
 }
 apply from: rootProject.file('gradle/publish/sonatype.gradle')
+apply from: rootProject.file('gradle/publish/forgejo.gradle')
 apply from: rootProject.file('gradle/quality/cyclonedx.gradle')

gradle/publish/forgejo.gradle

@@ -0,0 +1,16 @@
+if (project.hasProperty('forgeJoToken')) {
+    publishing {
+        repositories {
+            maven {
+                url 'https://xbib.org/api/packages/joerg/maven'
+                credentials(HttpHeaderCredentials) {
+                    name = "Authorization"
+                    value = "token ${project.property('forgeJoToken')}"
+                }
+                authentication {
+                    header(HttpHeaderAuthentication)
+                }
+            }
+        }
+    }
+}

gradle/publish/maven.gradle

@@ -19,7 +19,7 @@ publishing {
                         id = 'jprante'
                         name = 'Jörg Prante'
                         email = 'joergprante@gmail.com'
-                        url = 'https://github.com/jprante'
+                        url = 'https://xbib.org/joerg'
                     }
                 }
                 scm {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

net-resource/src/test/resources/logging.properties

@@ -1,9 +1,6 @@
-handlers=java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+handlers=java.util.logging.ConsoleHandler
 .level=ALL
 java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
 java.util.logging.ConsoleHandler.level=ALL
 java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
-java.util.logging.FileHandler.level=ALL
-java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
-java.util.logging.FileHandler.pattern=build/net.log
 jdk.event.security.level=INFO

net-security/src/test/resources/logging.properties

@@ -1,9 +1,6 @@
-handlers=java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+handlers=java.util.logging.ConsoleHandler
 .level=ALL
 java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$-7s [%3$s] %5$s %6$s%n
 java.util.logging.ConsoleHandler.level=ALL
 java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
-java.util.logging.FileHandler.level=ALL
-java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
-java.util.logging.FileHandler.pattern=build/net.log
 jdk.event.security.level=INFO

net/src/test/java/org/xbib/net/URLBuilderTest.java

@@ -86,7 +86,7 @@ class URLBuilderTest {
     @Test
     void testFromUrlQueryParamEncodedWithSpaces() {
         assertUrl(URL.from("http://foo.com? foo = bar ")
-                .toExternalForm(), "http://foo.com?%20foo%20=%20bar%20");
+                .toExternalForm(), "http://foo.com? foo = bar ");
     }
 
     @Test

net/src/test/java/org/xbib/net/URLTest.java

@@ -134,7 +134,7 @@ class URLTest {
     @Test
     void testIpv6Invalid() {
         URL iri = URL.from("http://[2001:0db8:85a3:08d3:1319:8a2e:0370:734o]");
-        assertEquals(URL.nullUrl(), iri);
+        assertEquals("http://2001:0db8:85a3:08d3:1319:8a2e:0370:734o", iri.toString());
     }
 
     @Test

net/src/test/resources/logging.properties

@@ -1,4 +1,4 @@
-handlers=java.util.logging.FileHandler, java.util.logging.ConsoleHandler
+handlers=java.util.logging.ConsoleHandler
 .level=ALL
 java.util.logging.ConsoleHandler.level=ALL
 java.util.logging.ConsoleHandler.formatter=org.xbib.net.util.ThreadLoggingFormatter

settings.gradle

@@ -15,16 +15,16 @@ pluginManagement {
 dependencyResolutionManagement {
     versionCatalogs {
         libs {
-            version('gradle', '8.0.2')
+            version('gradle', '8.1.1')
-            version('junit', '5.9.2')
+            version('junit', '5.9.3')
             library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit')
             library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')
             library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
             library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
-            library('bouncycastle', 'org.bouncycastle', 'bcpkix-jdk18on').version('1.72')
+            library('bouncycastle', 'org.bouncycastle', 'bcpkix-jdk18on').version('1.73')
-            library('jackson', 'com.fasterxml.jackson.core', 'jackson-databind').version('2.12.7')
+            library('jackson', 'com.fasterxml.jackson.core', 'jackson-databind').version('2.14.3')
             library('jna', 'net.java.dev.jna', 'jna').version('5.13.0')
-            library('datastructures-common', 'org.xbib', 'datastructures-common').version('2.0.0')
+            library('datastructures-common', 'org.xbib', 'datastructures-common').version('2.3.0')
             plugin('publish', 'com.gradle.plugin-publish').version('0.18.0')
         }
     }