update to OpenJDK 21, Gradle 8.5, fix DOI

This commit is contained in:
Jörg Prante 2024-02-19 17:24:28 +01:00
parent 7104ccfbdc
commit 60bb106b1c
11 changed files with 92 additions and 54 deletions

View file

@ -1,21 +1,16 @@
plugins {
id "checkstyle"
id "pmd"
id 'maven-publish'
id 'signing'
id "io.github.gradle-nexus.publish-plugin" version "1.3.0"
id "com.github.spotbugs" version "5.0.14"
id "org.cyclonedx.bom" version "1.7.2"
id "org.xbib.gradle.plugin.asciidoctor" version "2.5.2.2"
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'
@ -29,13 +24,11 @@ ext {
licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
}
apply from: rootProject.file('gradle/ide/idea.gradle')
apply plugin: 'java-library'
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/quality/checkstyle.gradle')
apply from: rootProject.file('gradle/quality/pmd.gradle')
apply from: rootProject.file('gradle/quality/spotbugs.gradle')
apply from: rootProject.file('gradle/publish/maven.gradle')
apply from: rootProject.file('gradle/publish/forgejo.gradle')
apply from: rootProject.file('gradle/publish/sonatype.gradle')

View file

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

View file

@ -2,21 +2,14 @@
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 {
manifest {
attributes('Implementation-Version': project.version)
@ -24,7 +17,10 @@ jar {
}
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'
}

View file

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

View file

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

View file

@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.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

22
gradlew vendored
View file

@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
@ -130,18 +131,21 @@ 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=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
@ -198,11 +202,11 @@ 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
# 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" \

View file

@ -15,12 +15,15 @@ pluginManagement {
dependencyResolutionManagement {
versionCatalogs {
libs {
version('gradle', '8.1.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')
}

View file

@ -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;
}

View file

@ -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()))) {
content = u.getRawPath();
if (("http".equals(u.getScheme()) || "https".equals(u.getScheme())) &&
("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);
}
}

View file

@ -3,17 +3,42 @@ 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();
.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
@ -27,8 +52,19 @@ public class DOITests {
@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());
}
}