Skip to content

Commit fea0a2e

Browse files
authored
Fix gradle version catalog for maven (#1088)
* chore: remove gradle managed version "." "." breaks maven when importing .pom files * chore: remove unused dependency versions * chore: use spring managed dependency versions
1 parent 972784f commit fea0a2e

File tree

1 file changed

+34
-43
lines changed

1 file changed

+34
-43
lines changed

gradle/libs.versions.toml

+34-43
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
[versions]
2+
activemq = "6.1.3"
23
cutterslade-analyze = "1.10.0"
34
docker-spring-boot = "9.4.0"
45
gradle-nexus-publish-plugin = "2.0.0"
@@ -11,7 +12,6 @@ node-plugin = "7.1.0"
1112
nodeVersion = "22.9.0"
1213
npm = "10.8.3"
1314
openapi-gradle = "1.9.0"
14-
org-jetbrains-kotlin = "2.0.21"
1515
org-junit-jupiter = "5.11.3"
1616
org-mockito = "5.14.2"
1717
org-slf4j = "2.0.16"
@@ -20,18 +20,17 @@ owasp-dependencycheck = "11.1.0"
2020
protobuf = "4.28.3"
2121
protobuf-plugin = "0.9.4"
2222
spotless = "6.25.0"
23-
spring = "3.3.5"
24-
spring-cloud = "2023.0.3"
25-
spring-managed = "."
23+
spring-boot-plugin = "3.3.5"
24+
spring-cloud = "2023.0.3" # not managed by spring-boot-dependencies
25+
spring-cloud-stream = "4.1.3" # not managed by spring-boot-dependencies
2626

2727
[libraries]
28-
activemq-broker = { module = "org.apache.activemq:activemq-broker", version.ref = "spring-managed" }
28+
activemq-broker = { module = "org.apache.activemq:activemq-broker", version.ref = "activemq" }
2929
amqp-client = "com.rabbitmq:amqp-client:5.22.0"
3030
assertj-core = "org.assertj:assertj-core:3.26.3"
3131
avro = "org.apache.avro:avro:1.12.0"
3232
awaitility = "org.awaitility:awaitility:4.2.2"
3333
commons-lang3 = "org.apache.commons:commons-lang3:3.17.0"
34-
google-java-format = "com.google.googlejavaformat:google-java-format:1.24.0"
3534
jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations", version.ref = "jackson-core" }
3635
jackson-core = { module = "com.fasterxml.jackson.core:jackson-core", version.ref = "jackson-core" }
3736
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson-core" }
@@ -51,20 +50,13 @@ kafka-avro-serializer = { module = "io.confluent:kafka-avro-serializer", version
5150
kafka-clients = "org.apache.kafka:kafka-clients:3.9.0"
5251
kafka-streams = "org.apache.kafka:kafka-streams:3.9.0"
5352
kafka-protobuf-serializer = { module = "io.confluent:kafka-protobuf-serializer", version.ref = "io-confluent" }
54-
kotlin-build-tools-impl = { module = "org.jetbrains.kotlin:kotlin-build-tools-impl", version.ref = "org-jetbrains-kotlin" }
5553
kotlin-reflect = "org.jetbrains.kotlin:kotlin-reflect:2.0.21"
56-
kotlin-scripting-compiler-embeddable = { module = "org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable", version.ref = "org-jetbrains-kotlin" }
57-
kotlin-serialization-compiler-plugin-embeddable = { module = "org.jetbrains.kotlin:kotlin-serialization-compiler-plugin-embeddable", version.ref = "org-jetbrains-kotlin" }
5854
kotlinx-serialization-core-jvm = "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3"
59-
ktfmt = "com.facebook:ktfmt:0.53"
60-
ktlint-cli = "com.pinterest.ktlint:ktlint-cli:1.4.1"
61-
log4j-core = "org.apache.logging.log4j:log4j-core:2.24.1"
6255
lombok = "org.projectlombok:lombok:1.18.34"
6356
mockito-core = { module = "org.mockito:mockito-core", version.ref = "org-mockito" }
6457
mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "org-mockito" }
6558
moneta = "org.javamoney:moneta:1.4.4"
6659
money-api = "javax.money:money-api:1.1"
67-
palantir-java-format = "com.palantir.javaformat:palantir-java-format:2.50.0"
6860
protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
6961
protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
7062
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "org-slf4j" }
@@ -74,36 +66,35 @@ spring-cloud-aws-sns = { module = "io.awspring.cloud:spring-cloud-aws-sns", vers
7466
spring-cloud-aws-sqs = { module = "io.awspring.cloud:spring-cloud-aws-sqs", version.ref = "io-awspring-cloud" }
7567
spring-cloud-aws-starter-sns = { module = "io.awspring.cloud:spring-cloud-aws-starter-sns", version.ref = "io-awspring-cloud" }
7668
spring-cloud-aws-starter-sqs = { module = "io.awspring.cloud:spring-cloud-aws-starter-sqs", version.ref = "io-awspring-cloud" }
77-
spring-amqp = { module = "org.springframework.amqp:spring-amqp", version.ref = "spring-managed" }
78-
spring-rabbit = { module = "org.springframework.amqp:spring-rabbit", version.ref = "spring-managed" }
79-
spring-boot = { module = "org.springframework.boot:spring-boot", version.ref = "spring-managed" }
80-
spring-boot-actuator = { module = "org.springframework.boot:spring-boot-actuator", version.ref = "spring-managed" }
81-
spring-boot-autoconfigure = { module = "org.springframework.boot:spring-boot-autoconfigure", version.ref = "spring-managed" }
82-
spring-boot-configuration-processor = { module = "org.springframework.boot:spring-boot-configuration-processor", version.ref = "spring-managed" }
83-
spring-boot-dependencies = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "spring-managed" }
84-
spring-boot-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator", version.ref = "spring-managed" }
85-
spring-boot-starter-artemis = { module = "org.springframework.boot:spring-boot-starter-artemis", version.ref = "spring-managed" }
86-
spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web", version.ref = "spring-managed" }
87-
spring-boot-starter-websocket = { module = "org.springframework.boot:spring-boot-starter-websocket", version.ref = "spring-managed" }
88-
spring-boot-test = { module = "org.springframework.boot:spring-boot-test", version.ref = "spring-managed" }
89-
spring-boot-test-autoconfigure = { module = "org.springframework.boot:spring-boot-test-autoconfigure", version.ref = "spring-managed" }
69+
spring-amqp = { module = "org.springframework.amqp:spring-amqp" }
70+
spring-rabbit = { module = "org.springframework.amqp:spring-rabbit" }
71+
spring-boot = { module = "org.springframework.boot:spring-boot" }
72+
spring-boot-actuator = { module = "org.springframework.boot:spring-boot-actuator" }
73+
spring-boot-autoconfigure = { module = "org.springframework.boot:spring-boot-autoconfigure" }
74+
spring-boot-configuration-processor = { module = "org.springframework.boot:spring-boot-configuration-processor" }
75+
spring-boot-starter-actuator = { module = "org.springframework.boot:spring-boot-starter-actuator" }
76+
spring-boot-starter-artemis = { module = "org.springframework.boot:spring-boot-starter-artemis" }
77+
spring-boot-starter-web = { module = "org.springframework.boot:spring-boot-starter-web" }
78+
spring-boot-starter-websocket = { module = "org.springframework.boot:spring-boot-starter-websocket" }
79+
spring-boot-test = { module = "org.springframework.boot:spring-boot-test" }
80+
spring-boot-test-autoconfigure = { module = "org.springframework.boot:spring-boot-test-autoconfigure" }
9081
spring-cloud-dependencies = { module = "org.springframework.cloud:spring-cloud-dependencies", version.ref = "spring-cloud" }
91-
spring-cloud-starter-stream-kafka = { module = "org.springframework.cloud:spring-cloud-starter-stream-kafka", version.ref = "spring-managed" }
92-
spring-cloud-stream = { module = "org.springframework.cloud:spring-cloud-stream", version.ref = "spring-managed" }
93-
spring-kafka = { module = "org.springframework.kafka:spring-kafka", version.ref = "spring-managed" }
94-
spring-kafka-test = { module = "org.springframework.kafka:spring-kafka-test", version.ref = "spring-managed" }
95-
spring-security-config = { module = "org.springframework.security:spring-security-config", version.ref = "spring-managed" }
96-
spring-security-web = { module = "org.springframework.security:spring-security-web", version.ref = "spring-managed" }
97-
spring-beans = { module = "org.springframework:spring-beans", version.ref = "spring-managed" }
98-
spring-context = { module = "org.springframework:spring-context", version.ref = "spring-managed" }
99-
spring-core = { module = "org.springframework:spring-core", version.ref = "spring-managed" }
100-
spring-jcl = { module = "org.springframework:spring-jcl", version.ref = "spring-managed" }
101-
spring-jms = { module = "org.springframework:spring-jms", version.ref = "spring-managed" }
102-
spring-messaging = { module = "org.springframework:spring-messaging", version.ref = "spring-managed" }
103-
spring-test = { module = "org.springframework:spring-test", version.ref = "spring-managed" }
104-
spring-web = { module = "org.springframework:spring-web", version.ref = "spring-managed" }
105-
spring-webmvc = { module = "org.springframework:spring-webmvc", version.ref = "spring-managed" }
106-
spring-websocket = { module = "org.springframework:spring-websocket", version.ref = "spring-managed" }
82+
spring-cloud-starter-stream-kafka = { module = "org.springframework.cloud:spring-cloud-starter-stream-kafka", version.ref = "spring-cloud-stream" }
83+
spring-cloud-stream = { module = "org.springframework.cloud:spring-cloud-stream", version.ref = "spring-cloud-stream" }
84+
spring-kafka = { module = "org.springframework.kafka:spring-kafka" }
85+
spring-kafka-test = { module = "org.springframework.kafka:spring-kafka-test" }
86+
spring-security-config = { module = "org.springframework.security:spring-security-config" }
87+
spring-security-web = { module = "org.springframework.security:spring-security-web" }
88+
spring-beans = { module = "org.springframework:spring-beans" }
89+
spring-context = { module = "org.springframework:spring-context" }
90+
spring-core = { module = "org.springframework:spring-core" }
91+
spring-jcl = { module = "org.springframework:spring-jcl" }
92+
spring-jms = { module = "org.springframework:spring-jms" }
93+
spring-messaging = { module = "org.springframework:spring-messaging" }
94+
spring-test = { module = "org.springframework:spring-test" }
95+
spring-web = { module = "org.springframework:spring-web" }
96+
spring-webmvc = { module = "org.springframework:spring-webmvc" }
97+
spring-websocket = { module = "org.springframework:spring-websocket" }
10798
swagger-annotations-outdated = { module = "io.swagger.core.v3:swagger-annotations", version.ref = "io-swagger-core-v3" }
10899
swagger-annotations-jakarta = { module = "io.swagger.core.v3:swagger-annotations-jakarta", version.ref = "io-swagger-core-v3" }
109100
swagger-core-jakarta = { module = "io.swagger.core.v3:swagger-core-jakarta", version.ref = "io-swagger-core-v3" }
@@ -124,4 +115,4 @@ openapi-gradle = { id = "org.springdoc.openapi-gradle-plugin", version.ref = "op
124115
owasp-dependencycheck = { id = "org.owasp.dependencycheck", version.ref = "owasp-dependencycheck" }
125116
protobuf = { id = "com.google.protobuf", version.ref = "protobuf-plugin" }
126117
spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
127-
spring-boot = { id = "org.springframework.boot", version.ref = "spring" }
118+
spring-boot = { id = "org.springframework.boot", version.ref = "spring-boot-plugin" }

0 commit comments

Comments
 (0)