diff --git a/build.gradle b/build.gradle index cd42c3b..56b7bd0 100644 --- a/build.gradle +++ b/build.gradle @@ -21,14 +21,14 @@ catalog { version('wdi', '2023.10.05') version('antlr', '4.13.1') - version('bnd', '6.4.0') - version('commons-compress', '1.24.0') - version('docker-java', '3.3.3') - version('hibernate', '6.3.1.Final') + version('bnd', '7.0.0') + version('commons-compress', '1.25.0') + version('docker-java', '3.3.4') + version('hibernate', '6.4.2.Final') version('lombok', '1.18.30') - version('groovy', '4.0.15') + version('groovy', '4.0.18') version('h2', '2.1.224') - version('jackson', '2.15.2') + version('jackson', '2.16.1') version('jakartaee', '10.0.0') version('jakartaee-api', '10.0.0') version('jakarta.json-api', '2.1.2') @@ -47,25 +47,25 @@ catalog { version('jakarta.annotation.api', '2.1.1') version('jaxb-api', '2.3.1') version('jcommander', '1.82') - version('jgit', '6.7.0.202309050840-r') - version('jgroups', '5.3.0.Final') - version('jna', '5.13.0') + version('jgit', '6.8.0.202311291450-r') + version('jgroups', '5.3.1.Final') + version('jna', '5.14.0') version('jboss-ejb-client', '5.0.5.Final') - version('junit.jupiter', '5.10.0') - version('kotlin', '1.9.10') - version('log4j', '2.21.1') - version('netty', '4.1.100.Final') + version('junit.jupiter', '5.10.1') + version('kotlin', '1.9.22') + version('log4j', '2.22.1') + version('netty', '4.1.106.Final') version('parsson', '1.1.5') version('picocli', '4.7.5') - version('postgresql', '42.5.4') - version('resteasy', '6.2.5.Final') - version('slf4j', '2.0.9') - version('typesafe-config', '1.4.2') + version('postgresql', '42.7.1') + version('resteasy', '6.2.7.Final') + version('slf4j', '2.0.11') + version('typesafe-config', '1.4.3') version('xz', '1.9') version('yasson', '3.0.3') - version('weld', '5.1.1.Final') + version('weld', '5.1.2.Final') version('felix', '7.0.5') - version('felix.scr', '2.2.6') + version('felix.scr', '2.2.10') version('osgi.util.function', '1.2.0') version('osgi.util.promise', '1.3.0') version('osgi', '8.0.0') @@ -77,6 +77,8 @@ catalog { version('gradle.jmh', '0.7.1') version('undertow', '2.3.10.Final') version('graalvm', '23.1.1') + version('liquibase', '4.25.1') + version('gradle.liquibase', '2.2.1') library('wson', 'net.woggioni', 'wson').versionRef('wson') @@ -194,8 +196,9 @@ catalog { library('rsyntaxtextarea-ls', 'com.fifesoft', 'languagesupport').versionRef('rsyntaxtextarea-ls') library('jetbrains.annotations', 'org.jetbrains', 'annotations').versionRef('jetbrains.annotations') library('undertow-core', 'io.undertow', 'undertow-core').versionRef('undertow') - - + library('liquibase-cdi', 'org.liquibase', 'liquibase-cdi').versionRef('liquibase') + library('liquibase-cdi-jakarta', 'org.liquibase', 'liquibase-cdi-jakarta').versionRef('liquibase') + library('liquibase-core', 'org.liquibase', 'liquibase-core').versionRef('liquibase') [ 'groovy', @@ -285,6 +288,7 @@ catalog { plugin('gradle.docker.java-app', 'com.bmuschko.docker-java-application').versionRef('gradle.docker') plugin('gradle.docker.spring-boot-app', 'com.bmuschko.docker-spring-boot-application').versionRef('gradle.docker') plugin('gradle.jmh', 'me.champeau.jmh').versionRef('gradle.jmh') + plugin('liquibase', 'org.liquibase.gradle').versionRef('gradle.liquibase') } } diff --git a/gradle.properties b/gradle.properties index 2b41862..540aeab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -lys.catalog.version = 2023.11.09 +lys.catalog.version = 2024.01.29 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba7..d64cd49 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 c30b486..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d4..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -83,10 +83,8 @@ done # 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"' +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -144,7 +145,7 @@ 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 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# 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 -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# 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, 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" \