diff --git a/build.gradle b/build.gradle index 513f0c6..2fbd64c 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { 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 "org.xbib.gradle.plugin.asciidoctor" version "3.0.0" } wrapper { @@ -16,14 +16,14 @@ wrapper { } ext { - user = 'xbib' - name = 'net' - description = 'Network classes for Java' + user = 'joerg' + name = 'net-http' + description = 'HTTP classes for Java' inceptionYear = '2016' - url = 'https://github.com/' + user + '/' + name - scmUrl = 'https://github.com/' + user + '/' + name - scmConnection = 'scm:git:git://github.com/' + user + '/' + name + '.git' - scmDeveloperConnection = 'scm:git:ssh://git@github.com:' + user + '/' + name + '.git' + url = 'https://xbib.org/' + user + '/' + name + scmUrl = 'https://xbib.org/' + user + '/' + name + scmConnection = 'scm:git:git://xbib.org/' + 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' @@ -42,4 +42,5 @@ subprojects { apply from: rootProject.file('gradle/publish/maven.gradle') } apply from: rootProject.file('gradle/publish/sonatype.gradle') +apply from: rootProject.file('gradle/publish/forgejo.gradle') apply from: rootProject.file('gradle/quality/cyclonedx.gradle') diff --git a/gradle.properties b/gradle.properties index 98203fe..378d12e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.xbib name = net-http -version = 3.4.0 +version = 3.4.1 org.gradle.warning.mode = ALL diff --git a/gradle/publish/forgejo.gradle b/gradle/publish/forgejo.gradle new file mode 100644 index 0000000..b99b2fb --- /dev/null +++ b/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) + } + } + } + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba7..c1962a7 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 761b8f0..8707e8b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d4..aeb74cb 100755 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done 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"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done 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 diff --git a/settings.gradle b/settings.gradle index f6cf278..58e7ca7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,12 +2,12 @@ dependencyResolutionManagement { versionCatalogs { libs { version('gradle', '8.1.1') - version('junit', '5.9.2') - version('groovy', '4.0.11') - version('netty', '4.1.92.Final') - version('netty-tcnative', '2.0.60.Final') + version('junit', '5.9.3') + version('groovy', '4.0.13') + version('netty', '4.1.93.Final') + version('netty-tcnative', '2.0.61.Final') version('datastructures', '2.3.0') - version('config', '5.0.2') + version('config', '5.0.3') version('net', '3.2.0') library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit') @@ -41,7 +41,6 @@ dependencyResolutionManagement { library('jdbc-query', 'org.xbib', 'jdbc-query').version('1.1.0') library('jdbc-connection-pool', 'org.xbib', 'jdbc-connection-pool').version('1.1.0') library('event', 'org.xbib', 'event').version('0.0.1') - plugin('publish', 'com.gradle.plugin-publish').version('0.18.0') } } }