Skip to content

Commit 7e09ef1

Browse files
authored
BE: Fix dependencies resolution (#897)
- Add missing dependencies due to gradle migration - Rename some CI jobs to match branch protection rules - Nuke sonar job as it's being run automatically
1 parent fc64d55 commit 7e09ef1

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.github/workflows/backend_tests.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414
pull-requests: write
1515

1616
jobs:
17-
build-and-test:
17+
tests:
1818
runs-on: ubuntu-latest
1919
steps:
2020

@@ -35,7 +35,3 @@ jobs:
3535
- name: "Tests"
3636
run: |
3737
./gradlew :api:test --info
38-
39-
- name: "Sonar"
40-
run: |
41-
./gradlew sonar --info

.github/workflows/frontend_tests.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ permissions:
77
contents: read
88

99
jobs:
10-
build-and-test:
10+
tests:
1111
env:
1212
CI: true
1313
NODE_ENV: dev

api/build.gradle

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
plugins {
32
id 'antlr'
43
id 'checkstyle'
@@ -36,7 +35,7 @@ dependencies {
3635
implementation libs.confluent.json.schema.serializer
3736

3837
implementation libs.aws.msk.auth
39-
implementation (libs.azure.identity) {
38+
implementation(libs.azure.identity) {
4039
exclude group: 'io.netty', module: 'netty-tcnative-boringssl-static'
4140
}
4241

@@ -46,7 +45,7 @@ dependencies {
4645
implementation libs.antlr.runtime
4746

4847
implementation libs.opendatadiscovery.oddrn
49-
implementation (libs.opendatadiscovery.client) {
48+
implementation(libs.opendatadiscovery.client) {
5049
exclude group: 'org.springframework.boot', module: 'spring-boot-starter-webflux'
5150
exclude group: 'io.projectreactor', module: 'reactor-core'
5251
exclude group: 'io.projectreactor.ipc', module: 'reactor-netty'
@@ -82,6 +81,8 @@ dependencies {
8281
testImplementation libs.bytebuddy
8382
testImplementation libs.assertj
8483
testImplementation libs.jsonschemavalidator
84+
testImplementation(libs.kafka.clients) { artifact { classifier = "test" } }
85+
testImplementation libs.bouncycastle.bcpkix
8586

8687
testImplementation libs.okhttp3
8788
testImplementation libs.okhttp3.mockwebserver
@@ -123,7 +124,7 @@ tasks.register('buildDockerImageTask', DockerBuildImage) {
123124
inputDir = projectDir
124125
dockerFile = project.layout.projectDirectory.file('Dockerfile')
125126
buildArgs = [
126-
'JAR_FILE': "build/libs/${project.name}-${project.version}.jar"
127+
'JAR_FILE': "build/libs/${project.name}-${project.version}.jar"
127128
] as Map<String, String>
128129
images.add("ghcr.io/kafbat/kafka-ui:${project.version}")
129130
}

gradle/libs.versions.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ assertj = '3.25.3'
1414
avro = '1.11.4'
1515
byte-buddy = '1.14.19'
1616
confluent = '7.9.0'
17-
confluent-ccs = '7.8.0-ccs'
17+
confluent-ccs = '7.9.0-ccs'
1818

1919
mapstruct = '1.6.2'
2020
lombok = '1.18.34'
@@ -129,3 +129,6 @@ netty-resolver-dns-native = { module = 'io.netty:netty-resolver-dns-native-macos
129129
json-smart = { module = 'net.minidev:json-smart', version = '2.5.2' }
130130
netty-common = { module = 'io.netty:netty-common', version.ref = 'netty' }
131131
netty-handler = { module = 'io.netty:netty-handler', version.ref = 'netty' }
132+
133+
# test scope
134+
bouncycastle-bcpkix = { module = 'org.bouncycastle:bcpkix-jdk18on', version = '1.80' }

0 commit comments

Comments
 (0)