diff --git a/booklore-api/build.gradle b/booklore-api/build.gradle index b5eb3515d..f91d429a2 100644 --- a/booklore-api/build.gradle +++ b/booklore-api/build.gradle @@ -2,8 +2,8 @@ plugins { id 'java' id 'org.springframework.boot' version '4.1.1' id 'io.spring.dependency-management' version '1.1.7' - id 'org.hibernate.orm' version '7.4.8.Final' - id 'io.github.ben-manes.versions' version '0.64.0' + id 'org.hibernate.orm' version '7.4.10.Final' + id 'io.github.ben-manes.versions' version '0.66.0' id 'jacoco' } @@ -30,7 +30,7 @@ configurations { ext['flyway.version'] = '12.11.0' ext['hibernate.version'] = '7.4.8.Final' ext['jackson-2-bom.version'] = '2.22.1' -ext['jackson-bom.version'] = '3.2.2' +ext['jackson-bom.version'] = '3.2.3' dependencies { // --- Spring Boot --- @@ -50,7 +50,7 @@ dependencies { // --- Database & Migration --- implementation 'org.mariadb.jdbc:mariadb-java-client:3.5.10' implementation 'org.springframework.boot:spring-boot-starter-flyway' - implementation 'org.flywaydb:flyway-mysql:12.11.0' + implementation 'org.flywaydb:flyway-mysql:13.10.0' // --- Security & Authentication --- implementation 'io.jsonwebtoken:jjwt-api:0.13.0' @@ -71,10 +71,10 @@ dependencies { implementation 'com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0' // --- TwelveMonkeys ImageIO --- - implementation 'com.twelvemonkeys.imageio:imageio-jpeg:3.15.1' - implementation 'com.twelvemonkeys.imageio:imageio-tiff:3.15.1' - implementation 'com.twelvemonkeys.imageio:imageio-webp:3.15.1' - implementation 'com.twelvemonkeys.imageio:imageio-bmp:3.15.1' + implementation 'com.twelvemonkeys.imageio:imageio-jpeg:3.15.3' + implementation 'com.twelvemonkeys.imageio:imageio-tiff:3.15.3' + implementation 'com.twelvemonkeys.imageio:imageio-webp:3.15.3' + implementation 'com.twelvemonkeys.imageio:imageio-bmp:3.15.3' implementation 'io.documentnode:epub4j-core:4.2.3' @@ -82,7 +82,7 @@ dependencies { implementation 'com.github.RouHim:jaudiotagger:2.0.36' // --- UNRAR Support --- - implementation 'com.github.junrar:junrar:7.6.1' + implementation 'com.github.junrar:junrar:8.1.2' // --- JSON & Web Scraping --- implementation 'org.jsoup:jsoup:1.23.2' @@ -105,7 +105,7 @@ dependencies { implementation 'org.freemarker:freemarker:2.3.35' // --- Jackson 3 --- - implementation platform('tools.jackson:jackson-bom:3.2.2') + implementation platform('tools.jackson:jackson-bom:3.2.3') implementation 'tools.jackson.core:jackson-core' implementation 'tools.jackson.core:jackson-databind' implementation 'tools.jackson.module:jackson-module-blackbird' @@ -116,14 +116,14 @@ dependencies { // --- Caching --- implementation 'org.springframework.boot:spring-boot-starter-cache' - implementation 'com.github.ben-manes.caffeine:caffeine:3.2.4' + implementation 'com.github.ben-manes.caffeine:caffeine:3.3.0' // --- Test Dependencies --- testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.boot:spring-boot-test-autoconfigure' testImplementation 'org.assertj:assertj-core:3.27.7' testImplementation "org.mockito:mockito-inline:5.2.0" - testRuntimeOnly 'com.h2database:h2:2.5.250' + testRuntimeOnly 'com.h2database:h2:2.5.252' } jacoco { diff --git a/booklore-api/gradle/wrapper/gradle-wrapper.jar b/booklore-api/gradle/wrapper/gradle-wrapper.jar index b1b8ef56b..9fa7f2882 100644 Binary files a/booklore-api/gradle/wrapper/gradle-wrapper.jar and b/booklore-api/gradle/wrapper/gradle-wrapper.jar differ diff --git a/booklore-api/gradle/wrapper/gradle-wrapper.properties b/booklore-api/gradle/wrapper/gradle-wrapper.properties index ad7845be3..2e7bb9fd6 100644 --- a/booklore-api/gradle/wrapper/gradle-wrapper.properties +++ b/booklore-api/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.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/booklore-api/gradlew b/booklore-api/gradlew index b9bb139f7..249efbb03 100755 --- a/booklore-api/gradlew +++ b/booklore-api/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/booklore-api/gradlew.bat b/booklore-api/gradlew.bat index aa5f10b06..03754c4c3 100644 --- a/booklore-api/gradlew.bat +++ b/booklore-api/gradlew.bat @@ -19,13 +19,40 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @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,24 +87,26 @@ 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 -@rem Execute Gradle +@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%