Skip to content

Commit 43660cf

Browse files
committed
revert
1 parent b63adfc commit 43660cf

File tree

1 file changed

+22
-14
lines changed

1 file changed

+22
-14
lines changed

api/build.gradle

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

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-
}
56+
runtimeOnly libs.micrometer.registry.prometheus
5957

6058
// CVE Fixes
6159
implementation libs.apache.commons.compress
6260
implementation libs.okhttp3.logging.intercepter
6361
implementation libs.json.smart
6462
implementation libs.netty.common
6563
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+
}
6676

6777
// Annotation processors
6878
implementation libs.lombok
@@ -97,14 +107,20 @@ generateGrammarSource {
97107
arguments += ["-package", "ksql"]
98108
}
99109

110+
tasks.withType(JavaCompile) {
111+
options.compilerArgs << "-Xlint:deprecation" << "-Xlint:unchecked"
112+
}
113+
114+
115+
100116
sourceSets {
101117
main {
102-
antlr {
103-
srcDirs = ["src/main/antlr4"]
104-
}
105118
java {
106119
srcDirs += generateGrammarSource.outputDirectory
107120
}
121+
resources {
122+
srcDirs += project(":frontend").layout.buildDirectory.dir("vite")
123+
}
108124
}
109125
}
110126

@@ -142,15 +158,7 @@ if (buildDockerImages) {
142158
}
143159

144160
if (includeFrontend) {
145-
tasks.named("build") {
146-
dependsOn(":frontend:buildFrontend")
147-
}
148-
149161
tasks.named("processResources") {
150162
dependsOn(":frontend:buildFrontend")
151-
from(project(":frontend").layout.buildDirectory.dir("vite")) {
152-
into("static")
153-
}
154-
into("$buildDir/resources/main")
155163
}
156164
}

0 commit comments

Comments
 (0)