Skip to content

Commit

Permalink
Version cleanup, minor refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
Haarolean committed Jan 17, 2025
1 parent f828fd3 commit 336eb76
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 47 deletions.
4 changes: 2 additions & 2 deletions api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ sourceSets {
}
}

tasks.withType(Checkstyle) {
tasks.withType(Checkstyle).configureEach {
exclude '**/ksql/**'
}

Expand All @@ -123,7 +123,7 @@ tasks.register('buildDockerImage', DockerBuildImage) {
dockerFile = project.layout.projectDirectory.file('Dockerfile')
buildArgs = [
'JAR_FILE': "build/libs/${project.name}-${project.version}.jar"
]
] as Map<String, String>
images.add("ghcr.io/kafbat/kafka-ui:${project.version}")
}

Expand Down
2 changes: 0 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,3 @@ if (prod) {
}
}
}


4 changes: 1 addition & 3 deletions contract/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {
implementation libs.spring.starter.validation
api libs.swagger.integration.jakarta
api libs.jackson.databind.nullable
api libs.annotation.api
api libs.jakarta.annotation.api
compileOnly libs.lombok
annotationProcessor libs.lombok
}
Expand Down Expand Up @@ -112,5 +112,3 @@ sourceSets {

compileJava.dependsOn generateUiClient, generateBackendApi, generateConnectClient, generateSchemaRegistryClient
processResources.dependsOn generateUiClient, generateBackendApi, generateConnectClient, generateSchemaRegistryClient


3 changes: 1 addition & 2 deletions e2e-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,10 @@ checkstyle {
toolVersion = libs.versions.checkstyle.get()
configFile = rootProject.file('etc/checkstyle/checkstyle-e2e.xml')
ignoreFailures = false
maxWarnings = 10
maxWarnings = 0
maxErrors = 0
}


test {
useTestNG()
}
Expand Down
7 changes: 1 addition & 6 deletions frontend/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

node {
download = !"true".equals(project.property("local_node"))
download = "true" != project.property("local_node")
version = project.property("node_version").toString()
pnpmVersion = project.property("pnpm_version").toString()
nodeProjectDir = project.layout.projectDirectory
Expand All @@ -22,7 +22,6 @@ tasks.register('generateContract', PnpmTask) {
args = ['gen:sources']
}


tasks.register('buildFrontend', PnpmTask) {
dependsOn generateContract
inputs.files(fileTree("src/"))
Expand All @@ -45,7 +44,3 @@ sourceSets {

processResources.dependsOn buildFrontend
compileJava.dependsOn buildFrontend




45 changes: 14 additions & 31 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
[versions]
spring-boot = '3.3.6'
spring-ldap = '6.3.5'

spring-boot = '3.4.1'

aws-msk-auth = '2.2.0'
azure-identity = '1.14.2'
Expand All @@ -16,36 +14,27 @@ avro = '1.11.4'
byte-buddy = '1.14.19'
confluent = '7.8.0'

jackson = '2.14.0'
kafka-clients = '3.8.0'
mapstruct = '1.6.2'
lombok = '1.18.34'
protobuf-java = '3.25.5'
snakeyaml = '2.3'
serde-api = '1.0.0'
odd-oddrn-generator = '0.1.17'
odd-oddrn-client = '0.1.39'
cel = '0.3.0'
guava = '33.3.1-jre'
junit = '5.11.2'
mockito = '5.14.2'
okhttp3 = '4.12.0'
testcontainers = '1.20.2'
testcontainers = '1.20.4'
swagger-integration-jakarta = '2.2.8'
annotation-api = '2.1.1'
jakarta-annotation-api = '2.1.1'
jackson-databind-nullable = '0.2.6'
project-reactor = '3.6.12'
micrometer = '1.13.8'
antlr = '4.12.0'
json-schema-validator = '2.2.14'
checkstyle = '10.3.1'

allure = '2.27.0'
codeborne-selenide = '7.2.3'
selenide = '7.2.3'
testng = '7.10.0'
bonigarcia-webdrivermanager = '5.8.0'
aspectj = '1.9.21'
kafka = '3.8.0'
netty-resolver-dns-native = '4.1.116.Final'

[plugins]
spring-boot = { id = 'org.springframework.boot', version = '3.4.1' }
Expand All @@ -54,12 +43,9 @@ openapi-generator = { id = 'org.openapi.generator', version = '7.9.0' }
allure = { id = 'io.qameta.allure', version='2.10.0' }
nexus-publish-plugin = { id = 'io.github.gradle-nexus.publish-plugin', version = '1.1.0'}
node-gradle = { id = 'com.github.node-gradle.node', version = '7.0.2'}
jib = { id = 'com.google.cloud.tools.jib', version = '3.4.4' }
#jib = { id = 'com.google.cloud.tools.jib', version = '3.4.4' }
docker-remote-api = { id = 'com.bmuschko.docker-remote-api', version = '9.4.0'}




[libraries]
spring-starter-actuator = { module = 'org.springframework.boot:spring-boot-starter-actuator', version.ref = 'spring-boot' }
spring-starter-test = { module = 'org.springframework.boot:spring-boot-starter-test', version.ref = 'spring-boot' }
Expand All @@ -72,24 +58,23 @@ spring-boot-actuator = { module = 'org.springframework.boot:spring-boot-actuator
spring-boot-devtools = { module = 'org.springframework.boot:spring-boot-devtools', version.ref = 'spring-boot' }
spring-boot-configuration-processor = { module = 'org.springframework.boot:spring-boot-configuration-processor', version.ref = 'spring-boot' }


spring-security-ldap = { module = 'org.springframework.security:spring-security-ldap', version.ref = 'spring-ldap' }
spring-security-ldap = { module = 'org.springframework.security:spring-security-ldap' }

swagger-integration-jakarta = {module = 'io.swagger.core.v3:swagger-integration-jakarta', version.ref = 'swagger-integration-jakarta'}
lombok = {module = 'org.projectlombok:lombok', version.ref = 'lombok'}
mapstruct = {module = 'org.mapstruct:mapstruct', version.ref = 'mapstruct'}
mapstruct-processor = {module = 'org.mapstruct:mapstruct-processor', version.ref = 'mapstruct'}
annotation-api = {module = 'jakarta.annotation:jakarta.annotation-api', version.ref = 'annotation-api'}
jakarta-annotation-api = {module = 'jakarta.annotation:jakarta.annotation-api', version.ref = 'jakarta-annotation-api'}
jackson-databind-nullable = {module = 'org.openapitools:jackson-databind-nullable', version.ref = 'jackson-databind-nullable'}
kafka-clients = { module = 'org.apache.kafka:kafka-clients', version.ref = 'kafka-clients'}
kafka-clients = { module = 'org.apache.kafka:kafka-clients', version = "${versions.confluent}-ccs"}

apache-commons = { module = 'org.apache.commons:commons-lang3', version.ref = 'apache-commons'}
apache-commons-compress = { module = 'org.apache.commons:commons-compress', version.ref = 'apache-commons-compress'}
apache-commons-io = { module = 'commons-io:commons-io', version.ref = 'apache-commons-io'}
apache-commons-pool2 = { module = 'org.apache.commons:commons-pool2', version.ref = 'apache-commons'}
apache-datasketches = { module = 'org.apache.datasketches:datasketches-java', version.ref='apache-datasketches'}
apache-avro = { module = 'org.apache.avro:avro', version.ref = 'avro'}
apache-kafka = { module = 'org.apache.kafka:kafka_2.13', version.ref = 'kafka'}
apache-kafka = { module = 'org.apache.kafka:kafka_2.13', version = "${versions.confluent}-ccs"}

confluent-schema-registry-client = { module = 'io.confluent:kafka-schema-registry-client', version.ref = 'confluent'}
confluent-avro-serializer = { module = 'io.confluent:kafka-avro-serializer', version.ref = 'confluent'}
Expand All @@ -98,9 +83,8 @@ confluent-json-schema-serializer = { module = 'io.confluent:kafka-json-schema-se

aws-msk-auth = { module = 'software.amazon.msk:aws-msk-iam-auth', version.ref = 'aws-msk-auth'}
azure-identity = { module = 'com.azure:azure-identity', version.ref = 'azure-identity' }
reactor-extra = { module = 'io.projectreactor.addons:reactor-extra', version.ref = 'project-reactor'}
reactor-test = { module = 'io.projectreactor:reactor-test', version.ref = 'project-reactor'}
micrometer-registry-prometheus = { module = 'io.micrometer:micrometer-registry-prometheus', version.ref = 'micrometer'}
reactor-test = { module = 'io.projectreactor:reactor-test'}
micrometer-registry-prometheus = { module = 'io.micrometer:micrometer-registry-prometheus'}
antlr = { module = 'org.antlr:antlr4', version.ref = 'antlr'}
antlr-runtime = { module = 'org.antlr:antlr4-runtime', version.ref = 'antlr'}
cel = {module='dev.cel:cel', version.ref='cel'}
Expand Down Expand Up @@ -128,9 +112,8 @@ jsonschemavalidator = {module = 'com.github.java-json-tools:json-schema-validato
allure-testng = { module = 'io.qameta.allure:allure-testng', version.ref = 'allure' }
allure-selenide = { module = 'io.qameta.allure:allure-selenide', version.ref = 'allure' }

codeborne-selenide = { module = 'com.codeborne:selenide', version.ref = 'codeborne-selenide'}
codeborne-selenide = { module = 'com.codeborne:selenide', version.ref = 'selenide'}
testng = { module = 'org.testng:testng', version.ref = 'testng'}
aspectj = { module = 'org.aspectj:aspectjweaver', version.ref = 'aspectj'}
bonigarcia-webdrivermanager = { module = 'io.github.bonigarcia:webdrivermanager', version.ref = 'bonigarcia-webdrivermanager'}
netty-resolver-dns-native = { module = 'io.netty:netty-resolver-dns-native-macos', version.ref = 'netty-resolver-dns-native'}

netty-resolver-dns-native = { module = 'io.netty:netty-resolver-dns-native-macos'}
3 changes: 2 additions & 1 deletion serde-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ tasks.register('sourceJar', Jar) {
from sourceSets.main.allJava
}

task javadocJar(type: Jar, dependsOn: javadoc) {
tasks.register('javadocJar', Jar) {
dependsOn javadoc
archiveClassifier.set("javadoc")
from javadoc.destinationDir
}
Expand Down

0 comments on commit 336eb76

Please sign in to comment.