update to OpenJDK 21, Gradle 8.5, fix DOI

build.gradle

@@ -1,22 +1,23 @@
 plugins {
-    id "de.marcphilipp.nexus-publish" version "0.4.0"
+    id 'maven-publish'
-    id "io.codearte.nexus-staging" version "0.21.1"
+    id 'signing'
+    id "io.github.gradle-nexus.publish-plugin" version "2.0.0-rc-1"
 }
 
 wrapper {
     gradleVersion = libs.versions.gradle.get()
-    distributionType = Wrapper.DistributionType.ALL
+    distributionType = Wrapper.DistributionType.BIN
 }
 
 ext {
-    user = 'xbib'
+    user = 'joerg'
     name = 'standardnumber'
     description = 'Standardnumber processing 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'
@@ -25,9 +26,9 @@ ext {
 
 apply plugin: 'java-library'
 
-apply from: rootProject.file('gradle/ide/idea.gradle')
 apply from: rootProject.file('gradle/repositories/maven.gradle')
 apply from: rootProject.file('gradle/compile/java.gradle')
 apply from: rootProject.file('gradle/test/junit5.gradle')
-apply from: rootProject.file('gradle/publishing/publication.gradle')
+apply from: rootProject.file('gradle/publish/maven.gradle')
-apply from: rootProject.file('gradle/publishing/sonatype.gradle')
+apply from: rootProject.file('gradle/publish/forgejo.gradle')
+apply from: rootProject.file('gradle/publish/sonatype.gradle')

gradle.properties

@@ -1,5 +1,5 @@
 group = org.xbib
 name = standardnumber
-version = 2.0.0
+version = 3.0.0
 
 org.gradle.warning.mode = ALL

gradle/compile/java.gradle

@@ -2,17 +2,12 @@
 apply plugin: 'java-library'
 
 java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
     modularity.inferModulePath.set(true)
-}
+    withSourcesJar()
-
+    withJavadocJar()
-compileJava {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
-}
-
-compileTestJava {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
 }
 
 jar {
@@ -21,22 +16,12 @@ jar {
     }
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier 'sources'
-    from sourceSets.main.allSource
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier 'javadoc'
-}
-
-artifacts {
-    archives sourcesJar, javadocJar
-}
 
 tasks.withType(JavaCompile) {
-    options.compilerArgs.add('-Xlint:all,-exports')
+    options.fork = true
+    options.forkOptions.jvmArgs += ['-Duser.language=en','-Duser.country=US']
+    options.compilerArgs.add('-Xlint:-requires-transitive-automatic')
+    options.compilerArgs.add('-Xlint:deprecation')
     options.encoding = 'UTF-8'
 }
 

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/ivy.gradle

@@ -0,0 +1,27 @@
+apply plugin: 'ivy-publish'
+
+publishing {
+    repositories {
+        ivy {
+            url = "https://xbib.org/repo"
+        }
+    }
+    publications {
+        ivy(IvyPublication) {
+            from components.java
+            descriptor {
+                license {
+                    name = 'The Apache License, Version 2.0'
+                    url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                }
+                author {
+                    name = 'Jörg Prante'
+                    url = 'http://example.com/users/jane'
+                }
+                descriptor.description {
+                    text = rootProject.ext.description
+                }
+            }
+        }
+    }
+}

gradle/publish/maven.gradle

@@ -1,13 +1,10 @@
 
-apply plugin: "de.marcphilipp.nexus-publish"
-
 publishing {
     publications {
-        mavenJava(MavenPublication) {
+        "${project.name}"(MavenPublication) {
             from components.java
-            artifact sourcesJar
-            artifact javadocJar
             pom {
+                artifactId = project.name
                 name = project.name
                 description = rootProject.ext.description
                 url = rootProject.ext.url
@@ -22,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 {
@@ -49,18 +46,6 @@ publishing {
 if (project.hasProperty("signing.keyId")) {
     apply plugin: 'signing'
     signing {
-        sign publishing.publications.mavenJava
+        sign publishing.publications."${project.name}"
-    }
-}
-
-if (project.hasProperty("ossrhUsername")) {
-    nexusPublishing {
-        repositories {
-            sonatype {
-                username = project.property('ossrhUsername')
-                password = project.property('ossrhPassword')
-                packageGroup = "org.xbib"
-            }
-        }
     }
 }

gradle/publish/sonatype.gradle

@@ -0,0 +1,12 @@
+
+if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) {
+    nexusPublishing {
+        repositories {
+            sonatype {
+                username = project.property('ossrhUsername')
+                password = project.property('ossrhPassword')
+                packageGroup = "org.xbib"
+            }
+        }
+    }
+}

gradle/publishing/sonatype.gradle

@@ -1,11 +0,0 @@
-
-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"
-    }
-}

gradle/test/junit5.gradle

@@ -1,8 +1,9 @@
 dependencies {
-    testImplementation libs.junit.jupiter.api
+    testImplementation testLibs.junit.jupiter.api
-    testImplementation libs.junit.jupiter.params
+    testImplementation testLibs.junit.jupiter.params
-    testImplementation libs.hamcrest
+    testImplementation testLibs.hamcrest
-    testRuntimeOnly libs.junit.jupiter.engine
+    testRuntimeOnly testLibs.junit.jupiter.engine
+    testRuntimeOnly testLibs.junit.jupiter.platform.launcher
 }
 
 test {

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
-
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
+
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-#     shell script including quotes and variable substitutions, so put them in
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-#     double quotes to make sure that they get re-expanded; and
+
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

settings.gradle

@@ -15,12 +15,15 @@ pluginManagement {
 dependencyResolutionManagement {
     versionCatalogs {
         libs {
-            version('gradle', '7.5.1')
+            version('gradle', '8.5')
             version('groovy', '3.0.10')
-            version('junit', '5.9.2')
+        }
+        testLibs {
+            version('junit', '5.10.1')
             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('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.10.0')
             library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
             library('junit4', 'junit', 'junit').version('4.13.2')
         }

src/main/java/module-info.java

@@ -3,4 +3,5 @@ module org.xbib.standardnumber {
     exports org.xbib.standardnumber.checksum;
     exports org.xbib.standardnumber.checksum.iso7064;
     requires java.xml; // for reading ISBN range message file
+    requires java.logging;
 }

src/main/java/org/xbib/standardnumber/DOI.java

@@ -48,7 +48,7 @@ public class DOI extends StandardNumber implements Cloneable, Comparable<DOI> {
             Pattern.compile("\\b10\\.\\d{4}([.][0-9]+)*/[a-z0-9/\\-.()<>_:;\\\\]+\\b");
 
     private static final Pattern DOI_URI_PATTERN =
-            Pattern.compile("\\b(https?)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]\\b");
+            Pattern.compile("\\b(https?)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;\\(\\)]*[-a-zA-Z0-9+&@#/%=~_|]\\b");
 
     private URI infoURI;
 
@@ -116,22 +116,25 @@ public class DOI extends StandardNumber implements Cloneable, Comparable<DOI> {
     private void make(Object o) {
         // DOIs are case insensitive in ASCII
         // DOI service only use upper casing, we use lowercasing (better for search engines)
-        String content = o.toString().toLowerCase(Locale.US);
+        String content = o.toString().toLowerCase(Locale.ROOT);
         // is it an already a DOI URI?
         Matcher m = DOI_URI_PATTERN.matcher(content);
-        if (m.find()) {
+        boolean b = m.find();
+        if (b) {
             URI u = URI.create(content.substring(m.start(), m.end()));
-            if ("http".equals(u.getScheme()) && ("dx.doi.org".equals(u.getHost()) || "doi.org".equals(u.getHost()))) {
+            if (("http".equals(u.getScheme()) || "https".equals(u.getScheme())) &&
-                content = u.getRawPath();
+                    ("dx.doi.org".equals(u.getHost()) || "doi.org".equals(u.getHost()))) {
+                content = u.getRawPath().substring(1);
             } else {
                 return;
             }
         }
         m = DOI_PATTERN.matcher(content);
-        if (m.find()) {
+        b = m.find();
+        if (b) {
             this.value = content.substring(m.start(), m.end());
             this.infoURI = URI.create("info:doi:" + value);
-            this.httpDoi = URI.create("http://doi.org/" + value);
+            this.httpDoi = URI.create("https://doi.org/" + value);
             this.httpDxDoi = URI.create("http://dx.doi.org/" + value);
         }
     }

src/test/java/org/xbib/standardnumber/DOITests.java

@@ -3,22 +3,59 @@ package org.xbib.standardnumber;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import org.junit.jupiter.api.Test;
 
-/**
- *
- */
 public class DOITests {
 
     @Test
     public void testDOI() throws Exception {
-        StandardNumber doi = StandardNumber.getInstance("doi").set("10.1016/0032-3861(93)90481-o").normalize().verify();
+        StandardNumber doi = StandardNumber.getInstance("doi")
+                .set("10.1016/0032-3861(93)90481-o")
+                .normalize().verify();
         assertEquals("10.1016/0032-3861(93)90481-o", doi.normalizedValue());
-        assertEquals("http://doi.org/10.1016/0032-3861(93)90481-o", doi.format());
+        assertEquals("https://doi.org/10.1016/0032-3861(93)90481-o", doi.format());
+    }
+
+    @Test
+    public void testDOIUppercase() throws Exception {
+        StandardNumber doi = StandardNumber.getInstance("doi")
+                .set("10.1016/0032-3861(93)90481-O")
+                .normalize().verify();
+        assertEquals("10.1016/0032-3861(93)90481-o", doi.normalizedValue());
+        assertEquals("https://doi.org/10.1016/0032-3861(93)90481-o", doi.format());
+    }
+
+    @Test
+    public void testDOIURL() throws Exception {
+        StandardNumber doi = StandardNumber.getInstance("doi")
+                .set("https://doi.org/10.1016/0032-3861(93)90481-o")
+                .normalize().verify();
+        assertEquals("10.1016/0032-3861(93)90481-o", doi.normalizedValue());
+        assertEquals("https://doi.org/10.1016/0032-3861(93)90481-o", doi.format());
+    }
+
+    @Test
+    public void testDOIX() throws Exception {
+        StandardNumber doi = StandardNumber.getInstance("doi")
+                .set("http://dx.doi.org/10.1016/0032-3861(93)90481-o")
+                .normalize().verify();
+        assertEquals("10.1016/0032-3861(93)90481-o", doi.normalizedValue());
+        assertEquals("https://doi.org/10.1016/0032-3861(93)90481-o", doi.format());
     }
 
     @Test
     public void testClone() throws Exception {
-        StandardNumber doi = StandardNumber.getInstance("doi").set("10.1016/0032-3861(93)90481-o").normalize().verify();
+        StandardNumber doi = StandardNumber.getInstance("doi")
+                .set("10.1016/0032-3861(93)90481-o")
+                .normalize().verify();
         StandardNumber doi2 = (StandardNumber) doi.clone();
         assertEquals(doi, doi2);
     }
+
+    @Test
+    public void testDOIX2() throws Exception {
+        StandardNumber doi = StandardNumber.getInstance("doi")
+                .set("http://dx.doi.org/10.1523/jneurosci.0638-07.2007")
+                .normalize().verify();
+        assertEquals("10.1523/jneurosci.0638-07.2007", doi.normalizedValue());
+        assertEquals("https://doi.org/10.1523/jneurosci.0638-07.2007", doi.format());
+    }
 }