diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 926bc13..ec29e41 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,14 +1,34 @@ -name: CI +name: Publish on: push: branches: [ master ] +env: + JAVA_VERSION: '25' + GRADLE_VERSION: '9.7.1' jobs: build: - runs-on: woryzen + runs-on: hostinger + container: + image: gitea.woggioni.net/woggioni/gitea-runner/debian:latest steps: - - name: Checkout sources - uses: actions/checkout@v4 - - name: Execute Gradle build + - name: Checkout repository + uses: actions/checkout@v6 + with: + fetch-depth: 0 + - name: Set up JDK + uses: actions/setup-java@v5 + with: + distribution: 'oracle' + java-version: ${{ env.JAVA_VERSION }} + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v6 + with: + gradle-version: ${{ env.GRADLE_VERSION }} + # Only the main branch writes to the cache; PRs/feature branches read-only + cache-read-only: false + + - name: Run Gradle build and publish artifacts env: PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }} - run: ./gradlew publish + run: ./gradlew --no-daemon publish diff --git a/build.gradle b/build.gradle index 686d99f..ea11691 100644 --- a/build.gradle +++ b/build.gradle @@ -15,28 +15,29 @@ catalog { version('klevtree', '2025.03.11') version('khtml', '2024.04.14') version('jlevtree', '2023.05') - version('my-gradle-plugins', '2026.06.07') + version('my-gradle-plugins', '2026.08.24') version('envelope', '2026.04.28') version('wdi', '2024.12.31') version('gradle.docker', '10.0.0') version('antlr', '4.13.2') - version('bnd', '7.2.3') - version('bouncycastle', '1.84') + version('bnd', '7.4.0') + version('bouncycastle', '1.85') version('commons-compress', '1.28.0') version('docker-java', '3.7.1') - version('hibernate', '7.4.0.Final') + version('hibernate', '7.4.6.Final') version('lombok', '1.18.46') - version('groovy', '5.0.6') + version('groovy', '5.1.0') version('h2', '2.4.240') - version('infinispan', '16.1.4') - version('jackson', '2.21.3') + version('infinispan', '16.2.2') + version('jackson', '2.22.2') version('jakartaee', '11.0.0') version('jakartaee-api', '11.0.0') - version('jakarta.faces', '4.1.5') + version('jakarta.faces', '4.1.2') + version('jakarta.faces.impl', '4.1.14') version('jakarta.el-api', '6.0.1') version('jakarta.json-api', '2.1.3') - version('jakarta.json.bind-api', '3.0.1') + version('jakarta.json.bind-api', '3.0.2') version('jakarta.xml.bind-api', '4.0.5') version('jakarta.persistence-api', '3.2.0') version('jakarta.jakartaee-web-api', '11.0.0') @@ -51,46 +52,46 @@ catalog { version('jakarta.annotation.api', '3.0.0') version('jaxb-api', '2.3.1') version('jcommander', '3.0') - version('jgit', '7.6.0.202603022253-r') - version('jgroups', '5.5.5.Final') - version('jna', '5.18.1') + version('jgit', '7.7.1.202607240634-r') + version('jgroups', '5.5.6.Final') + version('jna', '5.19.1') version('jboss-ejb-client', '5.0.8.Final') - version('junit.jupiter', '6.1.0') - version('kotlin', '2.3.21') + version('junit.jupiter', '6.1.3') + version('kotlin', '2.4.10') version('kotlin.serialization.jvm', '1.11.0') version('kotlin.coroutines', '1.11.0') - version('kotlin.io', '0.9.0') - version('log4j', '2.26.0') - version('micronaut', '4.10.23') - version('netty', '4.2.15.Final') - version('opentelemetry', '1.63.0') - version('opentelemetry-instrumentation-api', '2.28.1') - version('opentelemetry-instrumentation', '2.28.1-alpha') - version('parsson', '1.1.7') + version('kotlin.io', '0.9.1') + version('log4j', '2.26.1') + version('micronaut', '5.0.2') + version('netty', '4.2.17.Final') + version('opentelemetry', '1.65.0') + version('opentelemetry-instrumentation-api', '2.30.0') + version('opentelemetry-instrumentation', '2.30.0-alpha') + version('parsson', '1.1.9') version('picocli', '4.7.7') - version('postgresql', '42.7.11') - version('resteasy', '7.0.2.Final') + version('postgresql', '42.7.13') + version('resteasy', '7.0.3.Final') version('slf4j', '2.0.18') - version('typesafe-config', '1.4.6') + version('typesafe-config', '1.4.9') version('xz', '1.12') - version('yasson', '3.0.4') + version('yasson', '3.0.5') version('weld', '6.0.4.Final') version('felix', '7.0.5') - version('felix.scr', '2.2.12') + version('felix.scr', '2.2.18') version('osgi.util.function', '1.2.0') version('osgi.util.promise', '1.3.0') version('osgi', '8.0.0') version('osgi.cmpn', '7.0.0') version('osgi.service.component.annotations', '1.5.1') - version('rsyntaxtextarea', '3.6.2') - version('rsyntaxtextarea-ls', '3.4.0') + version('rsyntaxtextarea', '4.0.1') + version('rsyntaxtextarea-ls', '3.4.1') version('jetbrains.annotations', '26.1.0') version('gradle.jmh', '0.7.3') - version('undertow', '2.4.1.Final') - version('graalvm', '25.0.3') - version('liquibase', '5.0.3') + version('undertow', '2.4.2.Final') + version('graalvm', '25.2.4') + version('liquibase', '5.0.4') version('gradle.liquibase', '3.1.0') - version('logback', '1.5.32') + version('logback', '1.6.3') version('javax.money', '1.1') version('moneta', '1.4.5') version('testcontainers', '2.0.5') @@ -246,7 +247,7 @@ catalog { library('jakarta.validation.api', 'jakarta.validation', 'jakarta.validation-api').versionRef('jakarta.validation.api') library('jakarta.annotation.api', 'jakarta.annotation', 'jakarta.annotation-api').versionRef('jakarta.annotation.api') library('jakartaee-bom', 'jakarta.platform', 'jakarta.jakartaee-bom').versionRef('jakartaee') - library('jakarta.faces', 'org.glassfish', 'jakarta.faces').versionRef('jakarta.faces') + library('jakarta.faces', 'org.glassfish', 'jakarta.faces').versionRef('jakarta.faces.impl') library('jakarta.faces-api', 'jakarta.faces', 'jakarta.faces-api').versionRef('jakarta.faces') library('jakarta.el', 'jakarta.el', 'jakarta.el-api').versionRef('jakarta.el-api') diff --git a/gradle.properties b/gradle.properties index 7dff33d..1c862db 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -lys.catalog.version = 2026.06.08 +lys.catalog.version = 2026.08.24 gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..b1b8ef5 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 1a70468..ad7845b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index f5feea6..b9bb139 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -115,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -173,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -206,15 +203,14 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_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" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a21..24c62d5 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,30 +65,18 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%