diff --git a/build.gradle b/build.gradle index 642f511..ad0db81 100644 --- a/build.gradle +++ b/build.gradle @@ -1,22 +1,13 @@ -buildscript { - repositories { - maven { - url 'https://xbib.org/repository' - } - } - dependencies { - classpath "org.xbib.gradle.plugin:gradle-plugin-shadow:1.1.1" - } -} plugins { - id "de.marcphilipp.nexus-publish" version "0.4.0" - id "io.codearte.nexus-staging" version "0.21.1" - id "org.xbib.gradle.plugin.asciidoctor" version "2.5.2.2" - id "org.cyclonedx.bom" version "1.7.2" - id "com.github.spotbugs" version "5.0.13" 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" } wrapper { @@ -39,6 +30,8 @@ ext { 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') diff --git a/gradle.properties b/gradle.properties index 34a11f1..8461118 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.xbib name = net -version = 3.1.0 +version = 3.2.0 org.gradle.warning.mode = ALL diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index 55ccc91..f99230f 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -2,6 +2,8 @@ apply plugin: 'java-library' java { modularity.inferModulePath.set(true) + withSourcesJar() + withJavadocJar() } compileJava { @@ -21,20 +23,6 @@ jar { duplicatesStrategy = DuplicatesStrategy.INCLUDE } -task sourcesJar(type: Jar, dependsOn: classes) { - classifier 'sources' - from sourceSets.main.allSource -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - classifier 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar, javadocJar -} - tasks.withType(JavaCompile) { options.compilerArgs.add('-Xlint:all') options.encoding = 'UTF-8' diff --git a/gradle/publish/maven.gradle b/gradle/publish/maven.gradle index 4ada9c0..ce6a26f 100644 --- a/gradle/publish/maven.gradle +++ b/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 @@ -49,18 +46,6 @@ publishing { if (project.hasProperty("signing.keyId")) { apply plugin: 'signing' signing { - sign publishing.publications.mavenJava - } -} - -if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) { - nexusPublishing { - repositories { - sonatype { - username = project.property('ossrhUsername') - password = project.property('ossrhPassword') - packageGroup = "org.xbib" - } - } + sign publishing.publications."${project.name}" } } diff --git a/gradle/publish/sonatype.gradle b/gradle/publish/sonatype.gradle index e1813f3..02744cd 100644 --- a/gradle/publish/sonatype.gradle +++ b/gradle/publish/sonatype.gradle @@ -1,11 +1,12 @@ 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" + nexusPublishing { + repositories { + sonatype { + username = project.property('ossrhUsername') + password = project.property('ossrhPassword') + packageGroup = "org.xbib" + } + } } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e583..ccebba7 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 8fad3f5..761b8f0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ 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.0.2-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb..79a61d4 100755 --- a/gradlew +++ b/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,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 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"' @@ -143,12 +143,16 @@ fi 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 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=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index 53a6b23..6689b85 100644 --- a/gradlew.bat +++ b/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% diff --git a/net-resource/src/main/java/org/xbib/net/resource/URI.java b/net-resource/src/main/java/org/xbib/net/resource/URI.java index e12e71a..ff4a0bc 100644 --- a/net-resource/src/main/java/org/xbib/net/resource/URI.java +++ b/net-resource/src/main/java/org/xbib/net/resource/URI.java @@ -1117,7 +1117,7 @@ public final class URI extends ResourceIdentifier * against this URI. * *

This convenience method works as if invoking it were equivalent to - * evaluating the expression {@link #resolve(java.net.URI) + * evaluating the expression {@link #resolve(URI) * resolve}{@code (URI.}{@link #create(String) create}{@code (str))}.

* * @param str The string to be parsed into a URI diff --git a/settings.gradle b/settings.gradle index 8c98e14..b496c7d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,16 +15,15 @@ pluginManagement { dependencyResolutionManagement { versionCatalogs { libs { - version('gradle', '7.5.1') + version('gradle', '8.0.2') version('junit', '5.9.2') 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('junit4', 'junit', 'junit').version('4.13.2') library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2') library('bouncycastle', 'org.bouncycastle', 'bcpkix-jdk18on').version('1.72') library('jackson', 'com.fasterxml.jackson.core', 'jackson-databind').version('2.12.7') - library('jna', 'net.java.dev.jna', 'jna').version('5.12.1') + library('jna', 'net.java.dev.jna', 'jna').version('5.13.0') library('datastructures-common', 'org.xbib', 'datastructures-common').version('2.0.0') plugin('publish', 'com.gradle.plugin-publish').version('0.18.0') }