Skip to content

Commit ac99710

Browse files
committed
Simplify dep mngmnt, update libs
1 parent 336eb76 commit ac99710

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

api/build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55
alias(libs.plugins.spring.boot)
66
alias(libs.plugins.git.properties)
77
alias(libs.plugins.docker.remote.api)
8+
alias(libs.plugins.spring.dependency.management)
89
}
910

1011
import com.bmuschko.gradle.docker.tasks.image.DockerBuildImage
@@ -127,4 +128,6 @@ tasks.register('buildDockerImage', DockerBuildImage) {
127128
images.add("ghcr.io/kafbat/kafka-ui:${project.version}")
128129
}
129130

130-
tasks.build.finalizedBy buildDockerImage
131+
if (prod) {
132+
tasks.build.finalizedBy buildDockerImage
133+
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ext {
3131
prod = resolveBooleanProperty("prod")
3232
}
3333

34-
if (prod) {
34+
if (prod) { // TODO shouldn't be prod, 'publish' instead?
3535
nexusPublishing {
3636
repositories {
3737
sonatype {

gradle/libs.versions.toml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@ spring-boot = '3.4.1'
44
aws-msk-auth = '2.2.0'
55
azure-identity = '1.14.2'
66

7-
apache-commons = '2.12.0'
7+
apache-commons-lang3 = '3.12.0'
88
apache-commons-io = '2.16.1'
9+
apache-commons-pool2 = '2.12.0'
910
apache-datasketches = '3.1.0'
1011
apache-commons-compress = '1.26.0'
1112

1213
assertj = '3.25.3'
1314
avro = '1.11.4'
1415
byte-buddy = '1.14.19'
1516
confluent = '7.8.0'
17+
confluent-ccs = '7.8.0-ccs'
1618

1719
mapstruct = '1.6.2'
1820
lombok = '1.18.34'
@@ -38,6 +40,7 @@ aspectj = '1.9.21'
3840

3941
[plugins]
4042
spring-boot = { id = 'org.springframework.boot', version = '3.4.1' }
43+
spring-dependency-management = { id = 'io.spring.dependency-management', version = '1.1.3' }
4144
git-properties = { id = 'com.gorylenko.gradle-git-properties', version = '2.4.2' }
4245
openapi-generator = { id = 'org.openapi.generator', version = '7.9.0' }
4346
allure = { id = 'io.qameta.allure', version='2.10.0' }
@@ -66,15 +69,15 @@ mapstruct = {module = 'org.mapstruct:mapstruct', version.ref = 'mapstruct'}
6669
mapstruct-processor = {module = 'org.mapstruct:mapstruct-processor', version.ref = 'mapstruct'}
6770
jakarta-annotation-api = {module = 'jakarta.annotation:jakarta.annotation-api', version.ref = 'jakarta-annotation-api'}
6871
jackson-databind-nullable = {module = 'org.openapitools:jackson-databind-nullable', version.ref = 'jackson-databind-nullable'}
69-
kafka-clients = { module = 'org.apache.kafka:kafka-clients', version = "${versions.confluent}-ccs"}
72+
kafka-clients = { module = 'org.apache.kafka:kafka-clients', version.ref = 'confluent-ccs'}
7073

71-
apache-commons = { module = 'org.apache.commons:commons-lang3', version.ref = 'apache-commons'}
74+
apache-commons = { module = 'org.apache.commons:commons-lang3', version.ref = 'apache-commons-lang3'}
7275
apache-commons-compress = { module = 'org.apache.commons:commons-compress', version.ref = 'apache-commons-compress'}
7376
apache-commons-io = { module = 'commons-io:commons-io', version.ref = 'apache-commons-io'}
74-
apache-commons-pool2 = { module = 'org.apache.commons:commons-pool2', version.ref = 'apache-commons'}
77+
apache-commons-pool2 = { module = 'org.apache.commons:commons-pool2', version.ref = 'apache-commons-pool2'}
7578
apache-datasketches = { module = 'org.apache.datasketches:datasketches-java', version.ref='apache-datasketches'}
7679
apache-avro = { module = 'org.apache.avro:avro', version.ref = 'avro'}
77-
apache-kafka = { module = 'org.apache.kafka:kafka_2.13', version = "${versions.confluent}-ccs"}
80+
apache-kafka = { module = 'org.apache.kafka:kafka_2.13', version.ref = 'confluent-ccs'}
7881

7982
confluent-schema-registry-client = { module = 'io.confluent:kafka-schema-registry-client', version.ref = 'confluent'}
8083
confluent-avro-serializer = { module = 'io.confluent:kafka-avro-serializer', version.ref = 'confluent'}

serde-api/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ artifacts {
1919
archives sourceJar, javadocJar
2020
}
2121

22-
if (prod) {
22+
if (prod) { // TODO shouldn't be prod, 'publish' instead?
2323
signing {
2424
sign(publishing.publications)
2525
}
2626
}
2727

2828
publishing {
29-
if (prod) {
29+
if (prod) { // TODO shouldn't be prod, 'publish' instead?
3030
repositories {
3131
maven {
3232
url "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2"

0 commit comments

Comments
 (0)