diff --git a/build.gradle b/build.gradle index 720bc92..6b76a61 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,12 @@ 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 "org.cyclonedx.bom" version "1.7.2" + id "com.github.spotbugs" version "5.0.13" + id "org.xbib.gradle.plugin.asciidoctor" version "2.5.2.2" } wrapper { diff --git a/gradle.properties b/gradle.properties index 67e7414..08a8ffe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.xbib name = marc -version = 2.9.21 +version = 2.10.0 org.gradle.warning.mode = ALL diff --git a/gradle/compile/java.gradle b/gradle/compile/java.gradle index 9ba7262..c7867e0 100644 --- a/gradle/compile/java.gradle +++ b/gradle/compile/java.gradle @@ -21,22 +21,6 @@ jar { } } -task sourcesJar(type: Jar, dependsOn: classes) { - dependsOn classes - classifier 'sources' - from sourceSets.main.allSource -} - -task javadocJar(type: Jar, dependsOn: javadoc) { - dependsOn javadoc - classifier 'javadoc' - from javadoc.destinationDir -} - -artifacts { - archives sourcesJar, javadocJar -} - tasks.withType(JavaCompile) { options.compilerArgs << '-Xlint:all' options.encoding = 'UTF-8' @@ -45,4 +29,9 @@ tasks.withType(JavaCompile) { tasks.withType(Javadoc) { options.addStringOption('Xdoclint:none', '-quiet') options.encoding = 'UTF-8' +} + +java { + withSourcesJar() + withJavadocJar() } \ No newline at end of file diff --git a/gradle/publishing/publication.gradle b/gradle/publishing/publication.gradle index fd7d7b5..904f65b 100644 --- a/gradle/publishing/publication.gradle +++ b/gradle/publishing/publication.gradle @@ -1,12 +1,10 @@ -apply plugin: "de.marcphilipp.nexus-publish" +apply plugin: 'io.github.gradle-nexus.publish-plugin' publishing { publications { - mavenJava(MavenPublication) { + javaPublication(MavenPublication) { from components.java - artifact sourcesJar - artifact javadocJar pom { name = project.name description = rootProject.ext.description @@ -22,7 +20,7 @@ publishing { id = 'jprante' name = 'Jörg Prante' email = 'joergprante@gmail.com' - url = 'https://github.com/jprante' + url = 'https://github.com/xbib' } } scm { @@ -47,18 +45,18 @@ publishing { } if (project.hasProperty("signing.keyId")) { - apply plugin: 'signing' signing { - sign publishing.publications.mavenJava + sign publishing.publications.javaPublication } } + if (project.hasProperty("ossrhUsername")) { nexusPublishing { repositories { sonatype { username = project.property('ossrhUsername') password = project.property('ossrhPassword') - packageGroup = "org.xbib" + 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/settings.gradle b/settings.gradle index 60603ed..ca49856 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,9 +15,9 @@ pluginManagement { dependencyResolutionManagement { versionCatalogs { libs { - version('gradle', '7.5.1') - version('groovy', '3.0.10') - version('junit', '5.9.1') + version('gradle', '8.0.2') + version('groovy', '3.0.13') + version('junit', '5.9.2') // all dependencies are test dependencies only library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit') diff --git a/src/main/java/org/xbib/marc/json/MarcListNode.java b/src/main/java/org/xbib/marc/json/MarcListNode.java index d53bac4..0d6b58d 100644 --- a/src/main/java/org/xbib/marc/json/MarcListNode.java +++ b/src/main/java/org/xbib/marc/json/MarcListNode.java @@ -3,6 +3,7 @@ package org.xbib.marc.json; import java.util.LinkedList; import java.util.List; +@SuppressWarnings("serial") public class MarcListNode extends LinkedList> implements ListNode { public MarcListNode() { diff --git a/src/main/java/org/xbib/marc/json/MarcMapNode.java b/src/main/java/org/xbib/marc/json/MarcMapNode.java index 5d6dec6..21f7258 100644 --- a/src/main/java/org/xbib/marc/json/MarcMapNode.java +++ b/src/main/java/org/xbib/marc/json/MarcMapNode.java @@ -3,6 +3,7 @@ package org.xbib.marc.json; import java.util.LinkedHashMap; import java.util.Map; +@SuppressWarnings("serial") public class MarcMapNode extends LinkedHashMap> implements MapNode { public MarcMapNode() {