From 047221b353e5ecb718055ada1862deb31026bdde Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Jun 2025 22:28:27 +0000 Subject: [PATCH 1/2] Bump the all-deps-minor-and-patch group with 11 updates Bumps the all-deps-minor-and-patch group with 11 updates: | Package | From | To | | --- | --- | --- | | org.apache.tomcat:tomcat-catalina | `10.1.40` | `10.1.41` | | [org.springframework:spring-webmvc](https://github.com/spring-projects/spring-framework) | `6.2.6` | `6.2.7` | | [org.springframework:spring-tx](https://github.com/spring-projects/spring-framework) | `6.2.6` | `6.2.7` | | [org.springframework.boot:spring-boot-starter-security](https://github.com/spring-projects/spring-boot) | `3.4.5` | `3.5.0` | | [org.springframework.boot:spring-boot-starter-amqp](https://github.com/spring-projects/spring-boot) | `3.4.5` | `3.5.0` | | [org.springframework.boot:spring-boot-configuration-processor](https://github.com/spring-projects/spring-boot) | `3.4.5` | `3.5.0` | | [org.springframework.boot:spring-boot-starter-actuator](https://github.com/spring-projects/spring-boot) | `3.4.5` | `3.5.0` | | [org.springframework.boot:spring-boot-autoconfigure](https://github.com/spring-projects/spring-boot) | `3.4.5` | `3.5.0` | | [org.springframework.boot:spring-boot-starter-validation](https://github.com/spring-projects/spring-boot) | `3.4.5` | `3.5.0` | | [org.springframework.boot:spring-boot-starter-web](https://github.com/spring-projects/spring-boot) | `3.4.5` | `3.5.0` | | [org.springframework.boot:spring-boot-starter-test](https://github.com/spring-projects/spring-boot) | `3.4.5` | `3.5.0` | Updates `org.apache.tomcat:tomcat-catalina` from 10.1.40 to 10.1.41 Updates `org.springframework:spring-webmvc` from 6.2.6 to 6.2.7 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.6...v6.2.7) Updates `org.springframework:spring-tx` from 6.2.6 to 6.2.7 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.6...v6.2.7) Updates `org.springframework:spring-tx` from 6.2.6 to 6.2.7 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v6.2.6...v6.2.7) Updates `org.springframework.boot:spring-boot-starter-security` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) Updates `org.springframework.boot:spring-boot-starter-amqp` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) Updates `org.springframework.boot:spring-boot-configuration-processor` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) Updates `org.springframework.boot:spring-boot-starter-actuator` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) Updates `org.springframework.boot:spring-boot-autoconfigure` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) Updates `org.springframework.boot:spring-boot-starter-validation` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) Updates `org.springframework.boot:spring-boot-starter-web` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) Updates `org.springframework.boot:spring-boot-starter-test` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) Updates `org.springframework.boot:spring-boot-starter-amqp` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) Updates `org.springframework.boot:spring-boot-configuration-processor` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) Updates `org.springframework.boot:spring-boot-starter-actuator` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) Updates `org.springframework.boot:spring-boot-autoconfigure` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) Updates `org.springframework.boot:spring-boot-starter-validation` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) Updates `org.springframework.boot:spring-boot-starter-web` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) Updates `org.springframework.boot:spring-boot-starter-test` from 3.4.5 to 3.5.0 - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v3.4.5...v3.5.0) --- updated-dependencies: - dependency-name: org.apache.tomcat:tomcat-catalina dependency-version: 10.1.41 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework:spring-webmvc dependency-version: 6.2.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework:spring-tx dependency-version: 6.2.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework:spring-tx dependency-version: 6.2.7 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-starter-security dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-starter-amqp dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-configuration-processor dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-starter-actuator dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-autoconfigure dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-starter-validation dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-starter-amqp dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-configuration-processor dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-starter-actuator dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-autoconfigure dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-starter-validation dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-starter-web dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch - dependency-name: org.springframework.boot:spring-boot-starter-test dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-deps-minor-and-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 1b7e901..74638a5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - springBootVersion = '3.4.5' - springVersion = '6.2.6' + springBootVersion = '3.5.0' + springVersion = '6.2.7' jacksonVersion = '2.19.0' mockitoVersion = '5.2.+' retrofitVersion = '2.11.0' @@ -38,7 +38,7 @@ repositories { dependencies { // https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-catalina - compileOnly group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '10.1.40' + compileOnly group: 'org.apache.tomcat', name: 'tomcat-catalina', version: '10.1.41' // https://mvnrepository.com/artifact/org.springframework/spring-webmvc compileOnly group: 'org.springframework', name: 'spring-webmvc', version: "${springVersion}" From dc8203ddb1887abf80895d4fd6bc9b386c08ab90 Mon Sep 17 00:00:00 2001 From: Rain Ramm Date: Mon, 2 Jun 2025 14:09:43 +0300 Subject: [PATCH 2/2] Fix JUnit dependency issue --- build.gradle | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 74638a5..987fa6f 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,6 @@ buildscript { springBootVersion = '3.5.0' springVersion = '6.2.7' jacksonVersion = '2.19.0' - mockitoVersion = '5.2.+' retrofitVersion = '2.11.0' } dependencies { @@ -100,18 +99,14 @@ dependencies { // https://mvnrepository.com/artifact/ee.bitweb/spring-test-core testImplementation group: 'ee.bitweb', name: 'spring-test-core', version: '2.+' - // https://mvnrepository.com/artifact/org.mockito/mockito-inline - testImplementation group: 'org.mockito', name: 'mockito-inline', version: "${mockitoVersion}" - - // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter - testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: "${mockitoVersion}" - // https://mvnrepository.com/artifact/org.mock-server/mockserver-netty testImplementation ("org.mock-server:mockserver-netty:5.15.0") { exclude group: 'junit', module: 'junit' } testImplementation group : 'org.testcontainers', name: 'testcontainers', version: "1.+" + + testRuntimeOnly("org.junit.platform:junit-platform-launcher") } configurations {