Skip to content

Commit 336eb76

Browse files
committed
Version cleanup, minor refactoring
1 parent f828fd3 commit 336eb76

File tree

7 files changed

+21
-47
lines changed

7 files changed

+21
-47
lines changed

api/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ sourceSets {
102102
}
103103
}
104104

105-
tasks.withType(Checkstyle) {
105+
tasks.withType(Checkstyle).configureEach {
106106
exclude '**/ksql/**'
107107
}
108108

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

build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,3 @@ if (prod) {
4444
}
4545
}
4646
}
47-
48-

contract/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
implementation libs.spring.starter.validation
1515
api libs.swagger.integration.jakarta
1616
api libs.jackson.databind.nullable
17-
api libs.annotation.api
17+
api libs.jakarta.annotation.api
1818
compileOnly libs.lombok
1919
annotationProcessor libs.lombok
2020
}
@@ -112,5 +112,3 @@ sourceSets {
112112

113113
compileJava.dependsOn generateUiClient, generateBackendApi, generateConnectClient, generateSchemaRegistryClient
114114
processResources.dependsOn generateUiClient, generateBackendApi, generateConnectClient, generateSchemaRegistryClient
115-
116-

e2e-tests/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@ checkstyle {
2727
toolVersion = libs.versions.checkstyle.get()
2828
configFile = rootProject.file('etc/checkstyle/checkstyle-e2e.xml')
2929
ignoreFailures = false
30-
maxWarnings = 10
30+
maxWarnings = 0
3131
maxErrors = 0
3232
}
3333

34-
3534
test {
3635
useTestNG()
3736
}

frontend/build.gradle

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

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

25-
2625
tasks.register('buildFrontend', PnpmTask) {
2726
dependsOn generateContract
2827
inputs.files(fileTree("src/"))
@@ -45,7 +44,3 @@ sourceSets {
4544

4645
processResources.dependsOn buildFrontend
4746
compileJava.dependsOn buildFrontend
48-
49-
50-
51-

gradle/libs.versions.toml

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
[versions]
2-
spring-boot = '3.3.6'
3-
spring-ldap = '6.3.5'
4-
2+
spring-boot = '3.4.1'
53

64
aws-msk-auth = '2.2.0'
75
azure-identity = '1.14.2'
@@ -16,36 +14,27 @@ avro = '1.11.4'
1614
byte-buddy = '1.14.19'
1715
confluent = '7.8.0'
1816

19-
jackson = '2.14.0'
20-
kafka-clients = '3.8.0'
2117
mapstruct = '1.6.2'
2218
lombok = '1.18.34'
23-
protobuf-java = '3.25.5'
24-
snakeyaml = '2.3'
25-
serde-api = '1.0.0'
2619
odd-oddrn-generator = '0.1.17'
2720
odd-oddrn-client = '0.1.39'
2821
cel = '0.3.0'
29-
guava = '33.3.1-jre'
3022
junit = '5.11.2'
3123
mockito = '5.14.2'
3224
okhttp3 = '4.12.0'
33-
testcontainers = '1.20.2'
25+
testcontainers = '1.20.4'
3426
swagger-integration-jakarta = '2.2.8'
35-
annotation-api = '2.1.1'
27+
jakarta-annotation-api = '2.1.1'
3628
jackson-databind-nullable = '0.2.6'
37-
project-reactor = '3.6.12'
38-
micrometer = '1.13.8'
3929
antlr = '4.12.0'
4030
json-schema-validator = '2.2.14'
4131
checkstyle = '10.3.1'
32+
4233
allure = '2.27.0'
43-
codeborne-selenide = '7.2.3'
34+
selenide = '7.2.3'
4435
testng = '7.10.0'
4536
bonigarcia-webdrivermanager = '5.8.0'
4637
aspectj = '1.9.21'
47-
kafka = '3.8.0'
48-
netty-resolver-dns-native = '4.1.116.Final'
4938

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

60-
61-
62-
6349
[libraries]
6450
spring-starter-actuator = { module = 'org.springframework.boot:spring-boot-starter-actuator', version.ref = 'spring-boot' }
6551
spring-starter-test = { module = 'org.springframework.boot:spring-boot-starter-test', version.ref = 'spring-boot' }
@@ -72,24 +58,23 @@ spring-boot-actuator = { module = 'org.springframework.boot:spring-boot-actuator
7258
spring-boot-devtools = { module = 'org.springframework.boot:spring-boot-devtools', version.ref = 'spring-boot' }
7359
spring-boot-configuration-processor = { module = 'org.springframework.boot:spring-boot-configuration-processor', version.ref = 'spring-boot' }
7460

75-
76-
spring-security-ldap = { module = 'org.springframework.security:spring-security-ldap', version.ref = 'spring-ldap' }
61+
spring-security-ldap = { module = 'org.springframework.security:spring-security-ldap' }
7762

7863
swagger-integration-jakarta = {module = 'io.swagger.core.v3:swagger-integration-jakarta', version.ref = 'swagger-integration-jakarta'}
7964
lombok = {module = 'org.projectlombok:lombok', version.ref = 'lombok'}
8065
mapstruct = {module = 'org.mapstruct:mapstruct', version.ref = 'mapstruct'}
8166
mapstruct-processor = {module = 'org.mapstruct:mapstruct-processor', version.ref = 'mapstruct'}
82-
annotation-api = {module = 'jakarta.annotation:jakarta.annotation-api', version.ref = 'annotation-api'}
67+
jakarta-annotation-api = {module = 'jakarta.annotation:jakarta.annotation-api', version.ref = 'jakarta-annotation-api'}
8368
jackson-databind-nullable = {module = 'org.openapitools:jackson-databind-nullable', version.ref = 'jackson-databind-nullable'}
84-
kafka-clients = { module = 'org.apache.kafka:kafka-clients', version.ref = 'kafka-clients'}
69+
kafka-clients = { module = 'org.apache.kafka:kafka-clients', version = "${versions.confluent}-ccs"}
8570

8671
apache-commons = { module = 'org.apache.commons:commons-lang3', version.ref = 'apache-commons'}
8772
apache-commons-compress = { module = 'org.apache.commons:commons-compress', version.ref = 'apache-commons-compress'}
8873
apache-commons-io = { module = 'commons-io:commons-io', version.ref = 'apache-commons-io'}
8974
apache-commons-pool2 = { module = 'org.apache.commons:commons-pool2', version.ref = 'apache-commons'}
9075
apache-datasketches = { module = 'org.apache.datasketches:datasketches-java', version.ref='apache-datasketches'}
9176
apache-avro = { module = 'org.apache.avro:avro', version.ref = 'avro'}
92-
apache-kafka = { module = 'org.apache.kafka:kafka_2.13', version.ref = 'kafka'}
77+
apache-kafka = { module = 'org.apache.kafka:kafka_2.13', version = "${versions.confluent}-ccs"}
9378

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

9984
aws-msk-auth = { module = 'software.amazon.msk:aws-msk-iam-auth', version.ref = 'aws-msk-auth'}
10085
azure-identity = { module = 'com.azure:azure-identity', version.ref = 'azure-identity' }
101-
reactor-extra = { module = 'io.projectreactor.addons:reactor-extra', version.ref = 'project-reactor'}
102-
reactor-test = { module = 'io.projectreactor:reactor-test', version.ref = 'project-reactor'}
103-
micrometer-registry-prometheus = { module = 'io.micrometer:micrometer-registry-prometheus', version.ref = 'micrometer'}
86+
reactor-test = { module = 'io.projectreactor:reactor-test'}
87+
micrometer-registry-prometheus = { module = 'io.micrometer:micrometer-registry-prometheus'}
10488
antlr = { module = 'org.antlr:antlr4', version.ref = 'antlr'}
10589
antlr-runtime = { module = 'org.antlr:antlr4-runtime', version.ref = 'antlr'}
10690
cel = {module='dev.cel:cel', version.ref='cel'}
@@ -128,9 +112,8 @@ jsonschemavalidator = {module = 'com.github.java-json-tools:json-schema-validato
128112
allure-testng = { module = 'io.qameta.allure:allure-testng', version.ref = 'allure' }
129113
allure-selenide = { module = 'io.qameta.allure:allure-selenide', version.ref = 'allure' }
130114

131-
codeborne-selenide = { module = 'com.codeborne:selenide', version.ref = 'codeborne-selenide'}
115+
codeborne-selenide = { module = 'com.codeborne:selenide', version.ref = 'selenide'}
132116
testng = { module = 'org.testng:testng', version.ref = 'testng'}
133117
aspectj = { module = 'org.aspectj:aspectjweaver', version.ref = 'aspectj'}
134118
bonigarcia-webdrivermanager = { module = 'io.github.bonigarcia:webdrivermanager', version.ref = 'bonigarcia-webdrivermanager'}
135-
netty-resolver-dns-native = { module = 'io.netty:netty-resolver-dns-native-macos', version.ref = 'netty-resolver-dns-native'}
136-
119+
netty-resolver-dns-native = { module = 'io.netty:netty-resolver-dns-native-macos'}

serde-api/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ tasks.register('sourceJar', Jar) {
99
from sourceSets.main.allJava
1010
}
1111

12-
task javadocJar(type: Jar, dependsOn: javadoc) {
12+
tasks.register('javadocJar', Jar) {
13+
dependsOn javadoc
1314
archiveClassifier.set("javadoc")
1415
from javadoc.destinationDir
1516
}

0 commit comments

Comments
 (0)