Merge branch '3.0.x' into 3.1.x

Author: marcusdacoregio

gradle/libs.versions.toml

@@ -1,13 +1,11 @@
 [versions]
 ch-qos-logback = "1.4.11"
-io-projectreactor = "3.4.34"
 jakarta-websocket = "2.1.1"
 org-apache-derby = "10.16.1.1"
 org-codehaus-groovy = "3.0.19"
 org-gretty = "4.1.1"
 org-mongodb = "4.8.2"
 org-slf4j = "2.0.9"
-org-springframework-boot = "3.0.13"
 org-testcontainers = "1.17.6"
 
 [libraries]
@@ -26,8 +24,6 @@ com-zaxxer-HikariCP = "com.zaxxer:HikariCP:5.0.1"
 edu-umd-cs-mtc-multithreadedtc = "edu.umd.cs.mtc:multithreadedtc:1.01"
 io-lettuce-lettuce-core = "io.lettuce:lettuce-core:6.2.7.RELEASE"
 io-projectreactor-reactor-bom = "io.projectreactor:reactor-bom:2022.0.13"
-io-projectreactor-reactor-core = { module = "io.projectreactor:reactor-core", version.ref = "io-projectreactor" }
-io-projectreactor-reactor-test = { module = "io.projectreactor:reactor-test", version.ref = "io-projectreactor" }
 io-spring-javaformat-spring-javaformat-checkstyle = "io.spring.javaformat:spring-javaformat-checkstyle:0.0.40"
 io-spring-nohttp-nohttp-checkstyle = "io.spring.nohttp:nohttp-checkstyle:0.0.11"
 jakarta-servlet-jakarta-servlet-api = "jakarta.servlet:jakarta.servlet-api:6.0.0"
@@ -52,9 +48,6 @@ org-gretty-gretty-starter = { module = "org.gretty:gretty-starter", version.ref
 org-hamcrest = "org.hamcrest:hamcrest:2.2"
 org-hsqldb = "org.hsqldb:hsqldb:2.7.2"
 org-junit-junit-bom = "org.junit:junit-bom:5.8.2"
-org-junit-jupiter-junit-jupiter-api = "org.junit.jupiter:junit-jupiter-api:5.9.3"
-org-junit-jupiter-junit-jupiter-engine = "org.junit.jupiter:junit-jupiter-engine:5.9.3"
-org-junit-jupiter-junit-jupiter-params = "org.junit.jupiter:junit-jupiter-params:5.9.3"
 org-mariadb-jdbc-mariadb-java-client = "org.mariadb.jdbc:mariadb-java-client:3.0.11"
 org-mockito-mockito-bom = "org.mockito:mockito-bom:4.8.1"
 org-mongodb-mongodb-driver-core = { module = "org.mongodb:mongodb-driver-core", version.ref = "org-mongodb" }
@@ -67,32 +60,10 @@ org-skyscreamer-jsonassert = "org.skyscreamer:jsonassert:1.5.1"
 org-slf4j-jcl-over-slf4j = { module = "org.slf4j:jcl-over-slf4j", version.ref = "org-slf4j" }
 org-slf4j-log4j-over-slf4j = { module = "org.slf4j:log4j-over-slf4j", version.ref = "org-slf4j" }
 org-slf4j-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "org-slf4j" }
-org-springframework-boot-spring-boot-devtools = { module = "org.springframework.boot:spring-boot-devtools", version.ref = "org-springframework-boot" }
-org-springframework-boot-spring-boot-gradle-plugin = { module = "org.springframework.boot:spring-boot-gradle-plugin", version.ref = "org-springframework-boot" }
-org-springframework-boot-spring-boot-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator", version.ref = "org-springframework-boot" }
-org-springframework-boot-spring-boot-starter-data-jpa = { module = "org.springframework.boot:spring-boot-starter-data-jpa", version.ref = "org-springframework-boot" }
-org-springframework-boot-spring-boot-starter-data-mongodb = { module = "org.springframework.boot:spring-boot-starter-data-mongodb", version.ref = "org-springframework-boot" }
-org-springframework-boot-spring-boot-starter-data-mongodb-reactive = { module = "org.springframework.boot:spring-boot-starter-data-mongodb-reactive", version.ref = "org-springframework-boot" }
-org-springframework-boot-spring-boot-starter-data-redis = { module = "org.springframework.boot:spring-boot-starter-data-redis", version.ref = "org-springframework-boot" }
-org-springframework-boot-spring-boot-starter-security = { module = "org.springframework.boot:spring-boot-starter-security", version.ref = "org-springframework-boot" }
-org-springframework-boot-spring-boot-starter-test = { module = "org.springframework.boot:spring-boot-starter-test", version.ref = "org-springframework-boot" }
-org-springframework-boot-spring-boot-starter-thymeleaf = { module = "org.springframework.boot:spring-boot-starter-thymeleaf", version.ref = "org-springframework-boot" }
-org-springframework-boot-spring-boot-starter-validation = { module = "org.springframework.boot:spring-boot-starter-validation", version.ref = "org-springframework-boot" }
-org-springframework-boot-spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "org-springframework-boot" }
-org-springframework-boot-spring-boot-starter-webflux = { module = "org.springframework.boot:spring-boot-starter-webflux", version.ref = "org-springframework-boot" }
-org-springframework-boot-spring-boot-starter-websocket = { module = "org.springframework.boot:spring-boot-starter-websocket", version.ref = "org-springframework-boot" }
 org-springframework-data-spring-data-bom = "org.springframework.data:spring-data-bom:2022.0.12"
 org-springframework-security-spring-security-bom = "org.springframework.security:spring-security-bom:6.1.5"
 org-springframework-spring-framework-bom = "org.springframework:spring-framework-bom:6.0.14"
-org-springframework-springloaded = "org.springframework:springloaded:1.2.8.RELEASE"
 org-testcontainers-testcontainers-bom = { module = "org.testcontainers:testcontainers-bom", version.ref = "org-testcontainers" }
-org-testcontainers-db2 = { module = "org.testcontainers:db2", version.ref = "org-testcontainers" }
-org-testcontainers-mariadb = { module = "org.testcontainers:mariadb", version.ref = "org-testcontainers" }
-org-testcontainers-mongodb = { module = "org.testcontainers:mongodb", version.ref = "org-testcontainers" }
-org-testcontainers-mssqlserver = { module = "org.testcontainers:mssqlserver", version.ref = "org-testcontainers" }
-org-testcontainers-mysql = { module = "org.testcontainers:mysql", version.ref = "org-testcontainers" }
-org-testcontainers-oracle-xe = { module = "org.testcontainers:oracle-xe", version.ref = "org-testcontainers" }
-org-testcontainers-postgresql = { module = "org.testcontainers:postgresql", version.ref = "org-testcontainers" }
 org-thymeleaf-extras-thymeleaf-extras-springsecurity6 = "org.thymeleaf.extras:thymeleaf-extras-springsecurity6:3.1.2.RELEASE"
 org-webjars-bootstrap = "org.webjars:bootstrap:2.3.2"
 org-webjars-html5shiv = "org.webjars:html5shiv:3.7.3-1"
@@ -102,9 +73,3 @@ org-webjars-stomp-websocket = "org.webjars:stomp-websocket:2.3.4"
 org-webjars-webjars-locator-core = "org.webjars:webjars-locator-core:0.52"
 
 [plugins]
-io-spring-antora-generate-antora-yml = "io.spring.antora.generate-antora-yml:0.0.1"
-nl-littlerobots-version-catalog-update = "nl.littlerobots.version-catalog-update:0.8.1"
-org-antora = "org.antora:1.0.0"
-org-gretty = "org.gretty:4.1.1"
-org-springframework-boot = "org.springframework.boot:3.0.13"
-org-springframework-boot-aot = "org.springframework.boot.aot:3.0.13"