diff --git a/.github/workflows/cve.yml b/.github/workflows/cve.yml
index d53913521..2a8bfbc59 100644
--- a/.github/workflows/cve.yml
+++ b/.github/workflows/cve.yml
@@ -1,4 +1,4 @@
-name: CVE checks docker main
+name: "Infra: CVE checks"
on:
workflow_dispatch:
schedule:
diff --git a/api/Dockerfile b/api/Dockerfile
index 463ce22f3..422c020de 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -1,5 +1,5 @@
#FROM azul/zulu-openjdk-alpine:17-jre-headless
-FROM azul/zulu-openjdk-alpine@sha256:a36679ac0d28cb835e2a8c00e1e0d95509c6c51c5081c7782b85edb1f37a771a
+FROM azul/zulu-openjdk-alpine@sha256:d59f1266db40341318e563fd76c21b2880ffa5d371f0c097c29d33f89c3a0010
RUN apk add --no-cache \
# snappy codec
diff --git a/api/pom.xml b/api/pom.xml
index 79dcba395..c945dcc37 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -253,6 +253,30 @@
dev.cel
cel
+
+
+ ch.qos.logback
+ logback-classic
+ 1.4.12
+
+
+
+ ch.qos.logback
+ logback-core
+ 1.4.12
+
+
+
+ com.squareup.okhttp3
+ logging-interceptor
+ 4.12.0
+
+
+
+ org.apache.commons
+ commons-compress
+ 1.26.0
+
diff --git a/api/src/main/java/io/kafbat/ui/serdes/builtin/ProtobufFileSerde.java b/api/src/main/java/io/kafbat/ui/serdes/builtin/ProtobufFileSerde.java
index 371002696..e2fc105b9 100644
--- a/api/src/main/java/io/kafbat/ui/serdes/builtin/ProtobufFileSerde.java
+++ b/api/src/main/java/io/kafbat/ui/serdes/builtin/ProtobufFileSerde.java
@@ -365,7 +365,8 @@ private Map knownProtoFiles() {
loadKnownProtoFile("google/protobuf/struct.proto", StructProto.getDescriptor()),
loadKnownProtoFile("google/protobuf/timestamp.proto", TimestampProto.getDescriptor()),
loadKnownProtoFile("google/protobuf/type.proto", TypeProto.getDescriptor()),
- loadKnownProtoFile("google/protobuf/wrappers.proto", WrappersProto.getDescriptor())
+ loadKnownProtoFile("google/protobuf/wrappers.proto", WrappersProto.getDescriptor()),
+ loadKnownProtoFile("wire/extensions.proto")
).collect(Collectors.toMap(p -> p.getLocation().getPath(), p -> p));
}
@@ -382,6 +383,10 @@ private ProtoFile loadKnownProtoFile(String path, Descriptors.FileDescriptor fil
return ProtoFile.Companion.get(ProtoParser.Companion.parse(Location.get(path), protoFileString));
}
+ private ProtoFile loadKnownProtoFile(String path) {
+ return ProtoFile.Companion.get(ProtoFileElement.empty(path));
+ }
+
private Loader createFilesLoader(Map files) {
return new Loader() {
@Override
diff --git a/documentation/compose/postgres/Dockerfile b/documentation/compose/postgres/Dockerfile
index c737c43a7..399a9dbe3 100644
--- a/documentation/compose/postgres/Dockerfile
+++ b/documentation/compose/postgres/Dockerfile
@@ -2,8 +2,8 @@ ARG image
FROM ${image}
-MAINTAINER Kafbat Team
+LABEL maintainer="Kafbat Team"
-ADD data.sql /docker-entrypoint-initdb.d
+COPY data.sql /docker-entrypoint-initdb.d
EXPOSE 5432
diff --git a/pom.xml b/pom.xml
index 84637da9b..26eeaf215 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,30 +32,29 @@
4.12.0
2.12.0
3.25.3
- 1.11.1
+ 1.11.3
1.12.19
- 7.4.0
+ 7.4.4
3.1.0
3.0.13
2.14.0
- 3.5.0
+ 3.5.2
1.5.5.Final
1.18.30
3.23.3
2.13.9
2.0
- 3.1.3
+ 3.1.9
1.0.0
0.1.17
0.1.39
- 20230227
+ 20231013
0.3.0
33.0.0-jre
-
5.9.1
5.3.1
- 4.10.0
+ 4.12.0
1.19.5