From 8fa3817782f725d556641274ab7fb5c9ba445b19 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <gpg@haarolean.dev>
Date: Sun, 9 Mar 2025 00:05:54 +0800
Subject: [PATCH 1/4] BE: Fix deps and build

---
 api/build.gradle          | 2 ++
 gradle/libs.versions.toml | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/api/build.gradle b/api/build.gradle
index bf515cb87..ce3a64c5d 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -82,6 +82,8 @@ dependencies {
     testImplementation libs.bytebuddy
     testImplementation libs.assertj
     testImplementation libs.jsonschemavalidator
+    testImplementation libs.kafka.clients
+    testImplementation libs.bouncycastle.bcpkix
 
     testImplementation libs.okhttp3
     testImplementation libs.okhttp3.mockwebserver
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f31056253..4158f4d44 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -129,3 +129,6 @@ netty-resolver-dns-native = { module = 'io.netty:netty-resolver-dns-native-macos
 json-smart = { module = 'net.minidev:json-smart', version = '2.5.2' }
 netty-common = { module = 'io.netty:netty-common', version.ref = 'netty' }
 netty-handler = { module = 'io.netty:netty-handler', version.ref = 'netty' }
+
+# test scope
+bouncycastle-bcpkix = { module = 'org.bouncycastle:bcpkix-jdk18on', version = '1.80' }

From a5514a46230b20732eddccd9dd76eb0b065748e6 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <gpg@haarolean.dev>
Date: Sun, 9 Mar 2025 01:57:45 +0800
Subject: [PATCH 2/4] ok, this time?

---
 api/build.gradle          | 9 ++++-----
 gradle/libs.versions.toml | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/api/build.gradle b/api/build.gradle
index ce3a64c5d..896a17844 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -1,4 +1,3 @@
-
 plugins {
     id 'antlr'
     id 'checkstyle'
@@ -36,7 +35,7 @@ dependencies {
     implementation libs.confluent.json.schema.serializer
 
     implementation libs.aws.msk.auth
-    implementation (libs.azure.identity) {
+    implementation(libs.azure.identity) {
         exclude group: 'io.netty', module: 'netty-tcnative-boringssl-static'
     }
 
@@ -46,7 +45,7 @@ dependencies {
     implementation libs.antlr.runtime
 
     implementation libs.opendatadiscovery.oddrn
-    implementation (libs.opendatadiscovery.client) {
+    implementation(libs.opendatadiscovery.client) {
         exclude group: 'org.springframework.boot', module: 'spring-boot-starter-webflux'
         exclude group: 'io.projectreactor', module: 'reactor-core'
         exclude group: 'io.projectreactor.ipc', module: 'reactor-netty'
@@ -82,7 +81,7 @@ dependencies {
     testImplementation libs.bytebuddy
     testImplementation libs.assertj
     testImplementation libs.jsonschemavalidator
-    testImplementation libs.kafka.clients
+    testImplementation(libs.kafka.clients) { artifact { classifier = "test" } }
     testImplementation libs.bouncycastle.bcpkix
 
     testImplementation libs.okhttp3
@@ -125,7 +124,7 @@ tasks.register('buildDockerImageTask', DockerBuildImage) {
     inputDir = projectDir
     dockerFile = project.layout.projectDirectory.file('Dockerfile')
     buildArgs = [
-       'JAR_FILE': "build/libs/${project.name}-${project.version}.jar"
+            'JAR_FILE': "build/libs/${project.name}-${project.version}.jar"
     ] as Map<String, String>
     images.add("ghcr.io/kafbat/kafka-ui:${project.version}")
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4158f4d44..44e4d8d9c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,7 @@ assertj = '3.25.3'
 avro = '1.11.4'
 byte-buddy = '1.14.19'
 confluent = '7.9.0'
-confluent-ccs = '7.8.0-ccs'
+confluent-ccs = '7.9.0-ccs'
 
 mapstruct = '1.6.2'
 lombok = '1.18.34'

From 342b26c389bdb28d923f941773c5b0abd7a9a625 Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <gpg@haarolean.dev>
Date: Sun, 9 Mar 2025 02:11:44 +0800
Subject: [PATCH 3/4] nuke sonar as it's being run automatically

---
 .github/workflows/backend_tests.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/backend_tests.yml b/.github/workflows/backend_tests.yml
index b79ac4abe..b23a192a7 100644
--- a/.github/workflows/backend_tests.yml
+++ b/.github/workflows/backend_tests.yml
@@ -35,7 +35,3 @@ jobs:
       - name: "Tests"
         run: |
           ./gradlew :api:test --info
-
-      - name: "Sonar"
-        run: |
-          ./gradlew sonar --info

From 7cb5bd450940b15c5cf587ec30ec18295d8682dd Mon Sep 17 00:00:00 2001
From: Roman Zabaluev <gpg@haarolean.dev>
Date: Sun, 9 Mar 2025 02:28:44 +0800
Subject: [PATCH 4/4] Rename some jobs ot match branch protection rules

---
 .github/workflows/backend_tests.yml  | 2 +-
 .github/workflows/frontend_tests.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/backend_tests.yml b/.github/workflows/backend_tests.yml
index b23a192a7..f3ea2061c 100644
--- a/.github/workflows/backend_tests.yml
+++ b/.github/workflows/backend_tests.yml
@@ -14,7 +14,7 @@ permissions:
   pull-requests: write
 
 jobs:
-  build-and-test:
+  tests:
     runs-on: ubuntu-latest
     steps:
 
diff --git a/.github/workflows/frontend_tests.yml b/.github/workflows/frontend_tests.yml
index d0f7bca00..9a385be61 100644
--- a/.github/workflows/frontend_tests.yml
+++ b/.github/workflows/frontend_tests.yml
@@ -7,7 +7,7 @@ permissions:
   contents: read
 
 jobs:
-  build-and-test:
+  tests:
     env:
       CI: true
       NODE_ENV: dev