From 89301905760836f9f46df34b361c782c9173e099 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2026 17:53:43 +0000 Subject: [PATCH 1/2] build(deps): bump the minor-patch-group group with 7 updates Bumps the minor-patch-group group with 7 updates: | Package | From | To | | --- | --- | --- | | [org.springframework.cloud:spring-cloud-dependencies](https://github.com/spring-cloud/spring-cloud-release) | `2025.1.1` | `2025.1.2` | | [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) | `42.7.11` | `42.7.12` | | [org.jooq.jooq-codegen-gradle](https://github.com/jOOQ/jOOQ) | `3.21.4` | `3.21.6` | | [org.springframework.boot:spring-boot-gradle-plugin](https://github.com/spring-projects/spring-boot) | `4.0.6` | `4.1.0` | | [com.diffplug.spotless:spotless-lib](https://github.com/diffplug/spotless) | `4.6.2` | `4.8.0` | | [com.diffplug.spotless:spotless-plugin-gradle](https://github.com/diffplug/spotless) | `8.6.0` | `8.8.0` | | [gradle-wrapper](https://github.com/gradle/gradle) | `9.5.1` | `9.6.1` | Updates `org.springframework.cloud:spring-cloud-dependencies` from 2025.1.1 to 2025.1.2 - [Release notes](https://github.com/spring-cloud/spring-cloud-release/releases) - [Commits](https://github.com/spring-cloud/spring-cloud-release/compare/v2025.1.1...v2025.1.2) Updates `org.postgresql:postgresql` from 42.7.11 to 42.7.12 - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.7.11...REL42.7.12) Updates `org.jooq.jooq-codegen-gradle` from 3.21.4 to 3.21.6 - [Release notes](https://github.com/jOOQ/jOOQ/releases) - [Commits](https://github.com/jOOQ/jOOQ/compare/version-3.21.4...version-3.21.6) Updates `org.springframework.boot:spring-boot-gradle-plugin` from 4.0.6 to 4.1.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v4.0.6...v4.1.0) Updates `com.diffplug.spotless:spotless-lib` from 4.6.2 to 4.8.0 - [Release notes](https://github.com/diffplug/spotless/releases) - [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md) - [Commits](https://github.com/diffplug/spotless/compare/lib/4.6.2...lib/4.8.0) Updates `com.diffplug.spotless:spotless-plugin-gradle` from 8.6.0 to 8.8.0 - [Release notes](https://github.com/diffplug/spotless/releases) - [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md) - [Commits](https://github.com/diffplug/spotless/compare/gradle/8.6.0...gradle/8.8.0) Updates `gradle-wrapper` from 9.5.1 to 9.6.1 - [Release notes](https://github.com/gradle/gradle/releases) - [Commits](https://github.com/gradle/gradle/compare/v9.5.1...v9.6.1) --- updated-dependencies: - dependency-name: org.springframework.cloud:spring-cloud-dependencies dependency-version: 2025.1.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-group - dependency-name: org.postgresql:postgresql dependency-version: 42.7.12 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-group - dependency-name: org.jooq.jooq-codegen-gradle dependency-version: 3.21.6 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: minor-patch-group - dependency-name: org.springframework.boot:spring-boot-gradle-plugin dependency-version: 4.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-group - dependency-name: com.diffplug.spotless:spotless-lib dependency-version: 4.8.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-group - dependency-name: com.diffplug.spotless:spotless-plugin-gradle dependency-version: 8.8.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-group - dependency-name: gradle-wrapper dependency-version: 9.6.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: minor-patch-group ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- buildSrc/build.gradle | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 4 ++-- gradlew.bat | 4 ++-- telegram_chat_service/build.gradle | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 38e6ed4f..03f5cccd 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ ext { // doesn't work in build.gradle in buildSrc project ext { - springCloudDependencies = "org.springframework.cloud:spring-cloud-dependencies:2025.1.1" + springCloudDependencies = "org.springframework.cloud:spring-cloud-dependencies:2025.1.2" } //share project version between all projects diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 1690028a..f385c809 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.6' + implementation 'org.springframework.boot:spring-boot-gradle-plugin:4.1.0' implementation 'io.spring.gradle:dependency-management-plugin:1.1.7' - implementation 'com.diffplug.spotless:spotless-lib:4.6.2' - implementation 'com.diffplug.spotless:spotless-plugin-gradle:8.6.0' + implementation 'com.diffplug.spotless:spotless-lib:4.8.0' + implementation 'com.diffplug.spotless:spotless-plugin-gradle:8.8.0' runtimeOnly 'com.google.protobuf:protobuf-gradle-plugin:0.10.0' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4dcb8425..db6d1940 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/gradlew b/gradlew index b9bb139f..249efbb0 100755 --- a/gradlew +++ b/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/gradlew.bat b/gradlew.bat index aa5f10b0..8508ef68 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -19,7 +19,7 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## @@ -72,7 +72,7 @@ echo location of your Java installation. 1>&2 -@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 diff --git a/telegram_chat_service/build.gradle b/telegram_chat_service/build.gradle index 0b8ba842..1ec4e266 100644 --- a/telegram_chat_service/build.gradle +++ b/telegram_chat_service/build.gradle @@ -5,7 +5,7 @@ buildscript { 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.5") - classpath("org.postgresql:postgresql:42.7.11") + classpath("org.postgresql:postgresql:42.7.12") classpath("org.liquibase:liquibase-gradle-plugin:3.0.2") classpath('org.liquibase:liquibase-core:5.0.3') } @@ -19,7 +19,7 @@ plugins { id 'spring-web-conventions' id 'lombok-conventions' id "io.github.ximtech.jasypt-encrypt-plugin" version "1.4.1" - id "org.jooq.jooq-codegen-gradle" version "3.21.4" // update only if starter updated jooq version + id "org.jooq.jooq-codegen-gradle" version "3.21.6" // update only if starter updated jooq version id 'org.liquibase.gradle' version '3.1.0' } From 7be2060adb46ee1f8c11c7a6a8a0cd6a32563fb8 Mon Sep 17 00:00:00 2001 From: Evgeny Date: Thu, 30 Jul 2026 15:23:12 +0300 Subject: [PATCH 2/2] refactor: jooq codegen comply with spring boot deps --- telegram_chat_service/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telegram_chat_service/build.gradle b/telegram_chat_service/build.gradle index 1ec4e266..207b552f 100644 --- a/telegram_chat_service/build.gradle +++ b/telegram_chat_service/build.gradle @@ -3,7 +3,7 @@ import com.github.jasypt.encrypt.JasyptPlugin 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 files('jooq-codegen-gradle-3.21.5.jar') // update only if starter updated it classpath("org.testcontainers:testcontainers-postgresql:2.0.5") classpath("org.postgresql:postgresql:42.7.12") classpath("org.liquibase:liquibase-gradle-plugin:3.0.2") @@ -19,7 +19,7 @@ plugins { id 'spring-web-conventions' id 'lombok-conventions' id "io.github.ximtech.jasypt-encrypt-plugin" version "1.4.1" - id "org.jooq.jooq-codegen-gradle" version "3.21.6" // update only if starter updated jooq version + id "org.jooq.jooq-codegen-gradle" version "3.21.5" // update only if starter updated jooq version id 'org.liquibase.gradle' version '3.1.0' }