diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 00310ffc..17a691fd 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -10,9 +10,9 @@ repositories { // dependency for spring boot gradle plugin and dependency management. // It is necessary to share it between conventions as plugins dependencies { - implementation 'org.springframework.boot:spring-boot-gradle-plugin:4.0.3' + implementation 'org.springframework.boot:spring-boot-gradle-plugin:4.0.6' implementation 'io.spring.gradle:dependency-management-plugin:1.1.7' - implementation 'com.diffplug.spotless:spotless-lib:4.3.0' - implementation 'com.diffplug.spotless:spotless-plugin-gradle:8.2.1' - runtimeOnly 'com.google.protobuf:protobuf-gradle-plugin:0.9.6' + implementation 'com.diffplug.spotless:spotless-lib:4.5.0' + implementation 'com.diffplug.spotless:spotless-plugin-gradle:8.4.0' + runtimeOnly 'com.google.protobuf:protobuf-gradle-plugin:0.10.0' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 61285a65..b1b8ef56 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 78dfb562..743f4870 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index adff685a..b9bb139f 100755 --- a/gradlew +++ b/gradlew @@ -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/. diff --git a/gradlew.bat b/gradlew.bat index e509b2dd..aa5f10b0 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,7 +65,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 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@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% diff --git a/subscriptions_holder/build.gradle b/subscriptions_holder/build.gradle index 9d968eb0..cd3d991e 100644 --- a/subscriptions_holder/build.gradle +++ b/subscriptions_holder/build.gradle @@ -14,7 +14,7 @@ plugins { id 'spring-web-conventions' id 'spring-feign-conventions' id 'lombok-conventions' - id "io.github.ximtech.jasypt-encrypt-plugin" version "1.3.3" + id "io.github.ximtech.jasypt-encrypt-plugin" version "1.4.1" } apply plugin: JasyptPlugin diff --git a/telegram_bot/build.gradle b/telegram_bot/build.gradle index 43a5ff10..cc46917f 100644 --- a/telegram_bot/build.gradle +++ b/telegram_bot/build.gradle @@ -28,13 +28,13 @@ dependencies { // bot - doesn't work with eureka client // adds core bot functionality - implementation('org.telegram:telegrambots-longpolling:9.4.0') { + implementation('org.telegram:telegrambots-longpolling:9.5.0') { exclude group: 'org.glassfish.jersey.containers' exclude group: 'org.glassfish.jersey.core' exclude group: 'org.glassfish.jersey.inject' exclude group: 'org.glassfish.jersey.media' } - implementation('org.telegram:telegrambots-client:9.4.0') // adds client to communicate with telegram api + implementation('org.telegram:telegrambots-client:9.5.0') // adds client to communicate with telegram api // freemarker implementation 'org.springframework.boot:spring-boot-starter-freemarker' diff --git a/telegram_chat_service/build.gradle b/telegram_chat_service/build.gradle index 6b4fe898..1a41e6fc 100644 --- a/telegram_chat_service/build.gradle +++ b/telegram_chat_service/build.gradle @@ -4,10 +4,10 @@ buildscript { dependencies { classpath files('jasypt-encrypt-plugin-1.3.3.jar') classpath files('jooq-codegen-gradle-3.19.30.jar') // update only if starter updated it - classpath("org.testcontainers:testcontainers-postgresql:2.0.3") - classpath("org.postgresql:postgresql:42.7.10") + classpath("org.testcontainers:testcontainers-postgresql:2.0.5") + classpath("org.postgresql:postgresql:42.7.11") classpath("org.liquibase:liquibase-gradle-plugin:3.0.2") - classpath('org.liquibase:liquibase-core:5.0.1') + classpath('org.liquibase:liquibase-core:5.0.2') } } @@ -18,8 +18,8 @@ plugins { id 'loki-conventions' id 'spring-web-conventions' id 'lombok-conventions' - id "io.github.ximtech.jasypt-encrypt-plugin" version "1.3.3" - id "org.jooq.jooq-codegen-gradle" version "3.19.30" // update only if starter updated jooq version + id "io.github.ximtech.jasypt-encrypt-plugin" version "1.4.1" + id "org.jooq.jooq-codegen-gradle" version "3.21.2" // update only if starter updated jooq version id 'org.liquibase.gradle' version '3.1.0' }