diff --git a/lapis/build.gradle b/lapis/build.gradle index 489cc3ccb..053caf3f4 100644 --- a/lapis/build.gradle +++ b/lapis/build.gradle @@ -4,8 +4,8 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent plugins { id 'org.springframework.boot' version '4.1.1' id 'io.spring.dependency-management' version '1.1.7' - id 'org.jetbrains.kotlin.jvm' version '2.4.10' - id 'org.jetbrains.kotlin.plugin.spring' version '2.4.10' + id 'org.jetbrains.kotlin.jvm' version '2.4.20' + id 'org.jetbrains.kotlin.plugin.spring' version '2.4.20' id 'org.jlleitschuh.gradle.ktlint' version "14.2.0" id 'org.springdoc.openapi-gradle-plugin' version "1.9.0" id 'antlr' @@ -36,7 +36,7 @@ dependencies { implementation 'com.fasterxml.jackson.module:jackson-module-kotlin' // needed by springdoc/swagger-core (still on Jackson 2) implementation 'org.jetbrains.kotlin:kotlin-reflect' implementation 'tools.jackson.dataformat:jackson-dataformat-yaml' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.1.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.1.1' implementation 'io.github.microutils:kotlin-logging-jvm:3.0.5' antlr 'org.antlr:antlr4:4.13.2' implementation 'org.antlr:antlr4-runtime:4.13.2' @@ -44,7 +44,7 @@ dependencies { implementation 'com.github.luben:zstd-jni:1.5.7-16' implementation 'org.apache.arrow:arrow-vector:19.0.0' implementation 'org.apache.arrow:arrow-memory-netty:19.0.0' - implementation 'com.github.ben-manes.caffeine:caffeine:3.2.4' + implementation 'com.github.ben-manes.caffeine:caffeine:3.3.0' implementation 'org.jetbrains.kotlinx:kotlinx-datetime:0.8.0-0.6.x-compat' implementation "org.springframework.boot:spring-boot-starter-security-oauth2-resource-server" diff --git a/lapis/gradle/wrapper/gradle-wrapper.jar b/lapis/gradle/wrapper/gradle-wrapper.jar index eddabd2ee..5097068a8 100644 Binary files a/lapis/gradle/wrapper/gradle-wrapper.jar and b/lapis/gradle/wrapper/gradle-wrapper.jar differ diff --git a/lapis/gradle/wrapper/gradle-wrapper.properties b/lapis/gradle/wrapper/gradle-wrapper.properties index ad7845be3..9b7cb4af3 100644 --- a/lapis/gradle/wrapper/gradle-wrapper.properties +++ b/lapis/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/lapis/gradlew.bat b/lapis/gradlew.bat index 8508ef684..03754c4c3 100644 --- a/lapis/gradlew.bat +++ b/lapis/gradlew.bat @@ -26,6 +26,33 @@ @rem Set local scope for the variables, and ensure extensions are enabled setlocal EnableExtensions +@rem Catch executions from older scripts and ensure they exit cleanly. +@rem This can be removed once we can be reasonably confident that few people +@rem will be migrating directly to this new wrapper. +goto afterSafetyNet +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +goto exitWithErrorLevel +:afterSafetyNet + set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @rem This is normally unused @@ -45,13 +72,14 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -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 +1>&2 echo. +1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +1>&2 echo. +1>&2 echo Please set the JAVA_HOME variable in your environment to match the +1>&2 echo location of your Java installation. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -59,13 +87,14 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -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 +1>&2 echo. +1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +1>&2 echo. +1>&2 echo Please set the JAVA_HOME variable in your environment to match the +1>&2 echo location of your Java installation. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :execute @rem Setup the command line @@ -75,8 +104,9 @@ echo location of your Java installation. 1>&2 @rem Execute gradlew @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 +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 & goto exitWithErrorLevel +@rem This label must not be changed. We rely on old scripts being able to jump to this point. :exitWithErrorLevel @rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts "%COMSPEC%" /c exit %ERRORLEVEL%