upgrade to Gradle 8.0.2

This commit is contained in:
Jörg Prante 2023-04-04 20:55:40 +02:00
parent 53fbabba47
commit 40e6051a40
11 changed files with 34 additions and 38 deletions

View file

@ -1,11 +1,12 @@
plugins { 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 "checkstyle"
id "pmd" 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 { wrapper {

View file

@ -1,5 +1,5 @@
group = org.xbib group = org.xbib
name = marc name = marc
version = 2.9.21 version = 2.10.0
org.gradle.warning.mode = ALL org.gradle.warning.mode = ALL

View file

@ -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) { tasks.withType(JavaCompile) {
options.compilerArgs << '-Xlint:all' options.compilerArgs << '-Xlint:all'
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
@ -46,3 +30,8 @@ tasks.withType(Javadoc) {
options.addStringOption('Xdoclint:none', '-quiet') options.addStringOption('Xdoclint:none', '-quiet')
options.encoding = 'UTF-8' options.encoding = 'UTF-8'
} }
java {
withSourcesJar()
withJavadocJar()
}

View file

@ -1,12 +1,10 @@
apply plugin: "de.marcphilipp.nexus-publish" apply plugin: 'io.github.gradle-nexus.publish-plugin'
publishing { publishing {
publications { publications {
mavenJava(MavenPublication) { javaPublication(MavenPublication) {
from components.java from components.java
artifact sourcesJar
artifact javadocJar
pom { pom {
name = project.name name = project.name
description = rootProject.ext.description description = rootProject.ext.description
@ -22,7 +20,7 @@ publishing {
id = 'jprante' id = 'jprante'
name = 'Jörg Prante' name = 'Jörg Prante'
email = 'joergprante@gmail.com' email = 'joergprante@gmail.com'
url = 'https://github.com/jprante' url = 'https://github.com/xbib'
} }
} }
scm { scm {
@ -47,18 +45,18 @@ publishing {
} }
if (project.hasProperty("signing.keyId")) { if (project.hasProperty("signing.keyId")) {
apply plugin: 'signing'
signing { signing {
sign publishing.publications.mavenJava sign publishing.publications.javaPublication
} }
} }
if (project.hasProperty("ossrhUsername")) { if (project.hasProperty("ossrhUsername")) {
nexusPublishing { nexusPublishing {
repositories { repositories {
sonatype { sonatype {
username = project.property('ossrhUsername') username = project.property('ossrhUsername')
password = project.property('ossrhPassword') password = project.property('ossrhPassword')
packageGroup = "org.xbib" packageGroup = 'org.xbib'
} }
} }
} }

Binary file not shown.

View file

@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

12
gradlew vendored
View file

@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop. # Darwin, MinGW, and NonStop.
# #
# (3) This script is generated from the Groovy template # (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. # within the Gradle project.
# #
# You can find Gradle at https://github.com/gradle/gradle/. # You can find Gradle at https://github.com/gradle/gradle/.
@ -80,10 +80,10 @@ do
esac esac
done done
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # This is normally unused
# shellcheck disable=SC2034
APP_NAME="Gradle"
APP_BASE_NAME=${0##*/} 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. # 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"' DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #( case $MAX_FD in #(
max*) 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 ) || MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit" warn "Could not query maximum file descriptor limit"
esac esac
case $MAX_FD in #( case $MAX_FD in #(
'' | soft) :;; #( '' | 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" || ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD" warn "Could not set maximum file descriptor limit to $MAX_FD"
esac esac

1
gradlew.bat vendored
View file

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

View file

@ -15,9 +15,9 @@ pluginManagement {
dependencyResolutionManagement { dependencyResolutionManagement {
versionCatalogs { versionCatalogs {
libs { libs {
version('gradle', '7.5.1') version('gradle', '8.0.2')
version('groovy', '3.0.10') version('groovy', '3.0.13')
version('junit', '5.9.1') version('junit', '5.9.2')
// all dependencies are test dependencies only // all dependencies are test dependencies only
library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') 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-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')

View file

@ -3,6 +3,7 @@ package org.xbib.marc.json;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
@SuppressWarnings("serial")
public class MarcListNode extends LinkedList<Node<?>> implements ListNode { public class MarcListNode extends LinkedList<Node<?>> implements ListNode {
public MarcListNode() { public MarcListNode() {

View file

@ -3,6 +3,7 @@ package org.xbib.marc.json;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
@SuppressWarnings("serial")
public class MarcMapNode extends LinkedHashMap<CharSequence, Node<?>> implements MapNode { public class MarcMapNode extends LinkedHashMap<CharSequence, Node<?>> implements MapNode {
public MarcMapNode() { public MarcMapNode() {