Skip to content

Commit b63adfc

Browse files
committed
BE: Chore: Bump Spring Boot to 3.5.3
1 parent bbf5c3a commit b63adfc

File tree

2 files changed

+19
-38
lines changed

2 files changed

+19
-38
lines changed

api/build.gradle

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -53,26 +53,16 @@ dependencies {
5353
exclude group: 'io.projectreactor.ipc', module: 'reactor-netty'
5454
}
5555

56-
runtimeOnly libs.micrometer.registry.prometheus
56+
runtimeOnly(libs.micrometer.registry.prometheus){
57+
exclude group: 'com.google.protobuf', module: 'protobuf-java' because("Micrometer uses protobuf-java 4.x, which is incompatible with protobuf-java 3.x used by various dependencies of this project. See https://github.com/prometheus/client_java/issues/1431")
58+
}
5759

5860
// CVE Fixes
5961
implementation libs.apache.commons.compress
6062
implementation libs.okhttp3.logging.intercepter
6163
implementation libs.json.smart
6264
implementation libs.netty.common
6365
implementation libs.netty.handler
64-
implementation libs.spring.context
65-
66-
implementation libs.modelcontextprotocol.spring.webflux
67-
implementation libs.victools.jsonschema.generator
68-
69-
// Google Managed Service for Kafka IAM support
70-
implementation (libs.google.managed.kafka.login.handler) {
71-
exclude group: 'com.google.oauth-client', module: 'google-oauth-client'
72-
}
73-
implementation (libs.google.oauth.client) {
74-
because("CVE Fix: It is excluded above because of a vulnerability")
75-
}
7666

7767
// Annotation processors
7868
implementation libs.lombok
@@ -107,20 +97,14 @@ generateGrammarSource {
10797
arguments += ["-package", "ksql"]
10898
}
10999

110-
tasks.withType(JavaCompile) {
111-
options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
112-
}
113-
114-
115-
116100
sourceSets {
117101
main {
102+
antlr {
103+
srcDirs = ["src/main/antlr4"]
104+
}
118105
java {
119106
srcDirs += generateGrammarSource.outputDirectory
120107
}
121-
resources {
122-
srcDirs += project(":frontend").layout.buildDirectory.dir("vite")
123-
}
124108
}
125109
}
126110

@@ -158,7 +142,15 @@ if (buildDockerImages) {
158142
}
159143

160144
if (includeFrontend) {
145+
tasks.named("build") {
146+
dependsOn(":frontend:buildFrontend")
147+
}
148+
161149
tasks.named("processResources") {
162150
dependsOn(":frontend:buildFrontend")
151+
from(project(":frontend").layout.buildDirectory.dir("vite")) {
152+
into("static")
153+
}
154+
into("$buildDir/resources/main")
163155
}
164156
}

gradle/libs.versions.toml

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
spring-boot = '3.4.5'
2+
spring-boot = '3.5.3'
33

44
aws-msk-auth = '2.3.0'
55
azure-identity = '1.15.4'
@@ -21,7 +21,9 @@ lombok = '1.18.34'
2121
odd-oddrn-generator = '0.1.17'
2222
odd-oddrn-client = '0.1.41'
2323
cel = '0.3.0'
24-
junit = '5.11.2'
24+
# This version should be compatible with the version used by spring-boot-starter-test to avoid conflicts
25+
# See https://github.com/spring-projects/spring-boot/blob/b6b570ebebb6ea233e00af5e554adcf40256f224/gradle.properties#L16C21-L16C27
26+
junit = '5.13.1'
2527
mockito = '5.16.0'
2628
okhttp3 = '4.12.0'
2729
testcontainers = '1.20.6'
@@ -30,7 +32,7 @@ jakarta-annotation-api = '2.1.1'
3032
jackson-databind-nullable = '0.2.6'
3133
antlr = '4.12.0'
3234
json-schema-validator = '2.2.14'
33-
checkstyle = '10.24.0'
35+
checkstyle = '10.3.1'
3436

3537
allure = '2.29.1'
3638
selenide = '7.2.3'
@@ -126,18 +128,5 @@ aspectj = { module = 'org.aspectj:aspectjweaver', version.ref = 'aspectj' }
126128
bonigarcia-webdrivermanager = { module = 'io.github.bonigarcia:webdrivermanager', version.ref = 'bonigarcia-webdrivermanager' }
127129
netty-resolver-dns-native = { module = 'io.netty:netty-resolver-dns-native-macos' }
128130

129-
# CVE fixes
130-
json-smart = { module = 'net.minidev:json-smart', version = '2.5.2' }
131-
netty-common = { module = 'io.netty:netty-common', version.ref = 'netty' }
132-
netty-handler = { module = 'io.netty:netty-handler', version.ref = 'netty' }
133-
spring-context = { module = 'org.springframework:spring-context', version = '6.2.7' }
134-
135131
# test scope
136132
bouncycastle-bcpkix = { module = 'org.bouncycastle:bcpkix-jdk18on', version = '1.80' }
137-
138-
# Google Managed Service for Apache Kafka support
139-
google-managed-kafka-login-handler = {module = 'com.google.cloud.hosted.kafka:managed-kafka-auth-login-handler', version = '1.0.5'}
140-
google-oauth-client = { module = 'com.google.oauth-client:google-oauth-client', version = '1.39.0' }
141-
142-
modelcontextprotocol-spring-webflux = {module = 'io.modelcontextprotocol.sdk:mcp-spring-webflux', version = '0.10.0'}
143-
victools-jsonschema-generator = {module = 'com.github.victools:jsonschema-generator', version = '4.38.0'}

0 commit comments

Comments
 (0)