Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BE: Fix deps and build #897

Merged
merged 4 commits into from
Mar 8, 2025
Merged

BE: Fix deps and build #897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8fa3817
BE: Fix deps and build
Haarolean Mar 8, 2025
a5514a4
ok, this time?
Haarolean Mar 8, 2025
342b26c
nuke sonar as it's being run automatically
Haarolean Mar 8, 2025
7cb5bd4
Rename some jobs ot match branch protection rules
Haarolean Mar 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/backend_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ permissions:
pull-requests: write

jobs:
build-and-test:
tests:
runs-on: ubuntu-latest
steps:

Expand All @@ -35,7 +35,3 @@ jobs:
- name: "Tests"
run: |
./gradlew :api:test --info

- name: "Sonar"
run: |
./gradlew sonar --info
2 changes: 1 addition & 1 deletion .github/workflows/frontend_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ permissions:
contents: read

jobs:
build-and-test:
tests:
env:
CI: true
NODE_ENV: dev
Expand Down
9 changes: 5 additions & 4 deletions api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

plugins {
id 'antlr'
id 'checkstyle'
Expand Down Expand Up @@ -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'
}

Expand All @@ -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'
Expand Down Expand Up @@ -82,6 +81,8 @@ dependencies {
testImplementation libs.bytebuddy
testImplementation libs.assertj
testImplementation libs.jsonschemavalidator
testImplementation(libs.kafka.clients) { artifact { classifier = "test" } }
testImplementation libs.bouncycastle.bcpkix

testImplementation libs.okhttp3
testImplementation libs.okhttp3.mockwebserver
Expand Down Expand Up @@ -123,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}")
}
Expand Down
5 changes: 4 additions & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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' }
Loading