Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c05af0b

Browse files
MediaMarcoMediaMarco
committed
Use a version catalogue to define dependency versions instead of the old custom dependencies file
1 parent 6e3d72f commit c05af0b

File tree

15 files changed

+180
-205
lines changed

15 files changed

+180
-205
lines changed

‎build.gradle‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
buildscript {
2-
apply from: 'gradle/dependencies.gradle'
3-
42
repositories {
53
mavenCentral()
64
}
7-
8-
dependencies {
9-
classpath gradle_plugins.values()
10-
}
115
}
126

137
plugins {
148
id 'java'
15-
id 'org.jreleaser' version '1.19.0'
9+
alias(libs.plugins.jreleaser)
10+
alias(libs.plugins.spring.boot)
1611
}
1712

1813
jreleaser {
@@ -125,10 +120,10 @@ subprojects {
125120

126121
dependencies {
127122
compileOnly "org.springframework.boot:spring-boot-configuration-processor"
128-
constraints {
129-
implementation 'junit:junit:4.13.2'
130-
// some dependencies bring junit 4.12 which has a security vulnerability
131-
}
123+
// constraints {
124+
// implementation 'junit:junit:4.13.2'
125+
// // some dependencies bring junit 4.12 which has a security vulnerability
126+
// }
132127
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
133128
}
134129

‎edison-core/build.gradle‎

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,21 @@
11
apply plugin: 'java-library'
22
apply plugin: 'maven-publish'
3-
apply plugin: 'io.spring.dependency-management'
4-
5-
dependencyManagement {
6-
imports {
7-
mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES
8-
}
9-
}
103

114
dependencies {
12-
compileOnly libraries.aws_sdk_ssm
13-
api libraries.spring_boot_starter_web
14-
implementation libraries.spring_boot_starter_actuator
15-
implementation libraries.spring_boot_starter_thymeleaf
16-
implementation libraries.jcip_annotations
17-
implementation libraries.logback_classic
18-
implementation libraries.spring_context_support
19-
implementation libraries.unboundid_ldapsdk
20-
implementation libraries.hibernate_validator
5+
compileOnly libs.aws.sdk.ssm
6+
api libs.spring.boot.starter.web
7+
implementation libs.spring.boot.starter.actuator
8+
implementation libs.spring.boot.starter.thymeleaf
9+
implementation libs.jcip.annotations
10+
implementation libs.logback.classic
11+
implementation libs.spring.context.support
12+
implementation libs.unboundid.ldapsdk
13+
implementation libs.hibernate.validator
2114

2215
testImplementation project(":edison-testsupport")
23-
testImplementation libraries.aws_sdk_ssm
24-
testImplementation test_libraries.mockserver_netty
25-
testImplementation test_libraries.mockserver_client_java
26-
testImplementation test_libraries.mockserver_junit_jupiter
27-
testImplementation test_libraries.awaitility
16+
testImplementation libs.aws.sdk.ssm
17+
testImplementation libs.bundles.mockserver
18+
testImplementation libs.awaitility
2819
}
2920

3021
publishing {

‎edison-jobs/build.gradle‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,25 @@ apply plugin: 'java-library'
33
dependencies {
44
implementation project(":edison-core")
55

6-
implementation libraries.mongodb_driver_core
7-
implementation libraries.mongodb_driver_sync
86
implementation project(":edison-mongo")
9-
implementation libraries.aws_sdk_dynamodb
7+
implementation libs.bundles.mongodb
8+
implementation libs.aws.sdk.dynamodb
109

11-
implementation project(":edison-core")
10+
implementation libs.micrometer.core
11+
implementation libs.jcip.annotations
12+
implementation libs.hibernate.validator
13+
implementation libs.jakarta.validation.api
1214

13-
implementation libraries.micrometer
14-
implementation libraries.jcip_annotations
15-
implementation libraries.hibernate_validator
16-
implementation libraries.java_validation_api
17-
api libraries.spring_boot_starter_web
15+
api libs.spring.boot.starter.web
1816

1917
testImplementation project(":edison-mongo")
2018
testImplementation project(":edison-testsupport")
21-
testImplementation test_libraries.json_path
22-
testImplementation test_libraries.jsonassert
23-
testImplementation test_libraries.testcontainers_junit
24-
testImplementation test_libraries.testcontainers_mongo
25-
testImplementation test_libraries.rest_assured
19+
20+
testImplementation libs.json.path
21+
testImplementation libs.jsonassert
22+
testImplementation libs.testcontainers.junit
23+
testImplementation libs.testcontainers.mongo
24+
testImplementation libs.rest.assured
2625
}
2726

2827
publishing {

‎edison-mongo/build.gradle‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@ apply plugin: 'java-library'
22

33
dependencies {
44
implementation project(":edison-core")
5-
implementation libraries.spring_boot
6-
implementation libraries.spring_boot_autoconfigure
7-
implementation libraries.mongodb_driver_core
8-
implementation libraries.mongodb_driver_sync
9-
implementation libraries.mongodb_bson
10-
implementation libraries.hibernate_validator
11-
implementation libraries.java_validation_api
5+
implementation libs.spring.boot
6+
implementation libs.spring.boot.autoconfigure
7+
implementation libs.bundles.mongodb
8+
implementation libs.hibernate.validator
9+
implementation libs.jakarta.validation.api
1210

1311
testImplementation project(":edison-testsupport")
14-
testImplementation test_libraries.testcontainers_mongo
15-
testImplementation test_libraries.testcontainers_junit
12+
testImplementation libs.testcontainers.mongo
13+
testImplementation libs.testcontainers.junit
1614
}
1715

1816
publishing {

‎edison-testsupport/build.gradle‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
apply plugin: 'java-library'
22

33
dependencies {
4-
api libraries.togglz_console
5-
compileOnly libraries.togglz_spring_web
6-
compileOnly libraries.togglz_spring_boot_starter
7-
compileOnly libraries.aws_sdk_ssm
8-
compileOnly libraries.aws_sdk_s3
9-
compileOnly libraries.jackson_databind
10-
compileOnly libraries.jackson_annotations
11-
compileOnly libraries.mongodb_driver_core
12-
compileOnly libraries.mongodb_driver_sync
13-
compileOnly test_libraries.togglz_testing
14-
testImplementation test_libraries.testcontainers_mongo
15-
testImplementation test_libraries.testcontainers_junit
4+
api libs.togglz.console
5+
compileOnly libs.togglz.spring.web
6+
compileOnly libs.togglz.spring.boot.starter
7+
compileOnly libs.aws.sdk.ssm
8+
compileOnly libs.aws.sdk.s3
9+
compileOnly libs.jackson.databind
10+
compileOnly libs.jackson.annotations
11+
compileOnly libs.bundles.mongodb
12+
13+
compileOnly libs.togglz.testing
14+
testImplementation libs.testcontainers.mongo
15+
testImplementation libs.testcontainers.junit
16+
17+
api libs.spring.boot
18+
api libs.spring.boot.autoconfigure
19+
api libs.junit
20+
api libs.junit.engine
21+
api libs.junit.params
22+
api libs.hamcrest
23+
api libs.mockito.core
24+
api libs.spring.test
25+
api libs.spring.boot.starter.test
1626

17-
api libraries.spring_boot
18-
api libraries.spring_boot_autoconfigure
19-
api test_libraries.junit
20-
api test_libraries.junit_params
21-
api test_libraries.junit_engine
22-
api test_libraries.hamcrest_core
23-
api test_libraries.hamcrest_library
24-
api test_libraries.mockito_core
25-
api test_libraries.spring_test
26-
api test_libraries.spring_boot_starter_test
2727
}
2828

2929
publishing {

‎edison-togglz/build.gradle‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,29 @@ apply plugin: 'java-library'
22

33
dependencies {
44
implementation project(":edison-core")
5-
api libraries.togglz_console
6-
api libraries.togglz_spring_web
75

8-
implementation libraries.aws_sdk_s3
9-
implementation libraries.mongodb_driver_core
10-
implementation libraries.mongodb_driver_sync
6+
api libs.togglz.console
7+
api libs.togglz.spring.web
8+
9+
implementation libs.aws.sdk.s3
10+
implementation libs.bundles.mongodb
11+
1112
implementation project(":edison-mongo")
1213

13-
implementation libraries.unboundid_ldapsdk
14-
implementation libraries.jcip_annotations
15-
implementation libraries.java_validation_api
14+
implementation libs.unboundid.ldapsdk
15+
implementation libs.jcip.annotations
16+
implementation libs.jakarta.validation.api
1617

1718
testImplementation project(":edison-testsupport")
1819
testImplementation project(":edison-mongo")
19-
testImplementation test_libraries.togglz_testing
20-
21-
testImplementation libraries.aws_sdk_s3
22-
testImplementation test_libraries.testcontainers_mongo
23-
testImplementation test_libraries.testcontainers_junit
24-
testImplementation test_libraries.junit
25-
testImplementation test_libraries.mockito_core
26-
testImplementation test_libraries.hamcrest_core
27-
testImplementation test_libraries.hamcrest_library
28-
testImplementation test_libraries.spring_boot_starter_test
20+
implementation libs.togglz.testing
21+
22+
testImplementation libs.testcontainers.mongo
23+
testImplementation libs.testcontainers.junit
24+
testImplementation libs.junit
25+
testImplementation libs.mockito.core
26+
testImplementation libs.hamcrest
27+
testImplementation libs.spring.boot.starter.web
2928
}
3029

3130
publishing {

‎edison-validation/build.gradle‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ apply plugin: 'java-library'
22

33
dependencies {
44
implementation project(":edison-core")
5-
implementation libraries.hibernate_validator
6-
implementation (libraries.validator_collection) {
5+
implementation libs.hibernate.validator
6+
implementation (libs.validator.collection) {
77
exclude group: 'org.hibernate', module: 'hibernate-validator'
88
}
9-
implementation libraries.edison_hal
10-
api libraries.java_validation_api
9+
implementation libs.edison.hal
10+
api libs.jakarta.validation.api
1111

1212
testImplementation project(":edison-testsupport")
13-
testImplementation test_libraries.rest_assured
14-
testImplementation test_libraries.commons_codec
13+
testImplementation libs.rest.assured
14+
testImplementation libs.commons.codec
1515
}
1616

1717
publishing {

‎examples/example-status/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ apply plugin: 'java-library'
22
apply plugin: 'org.springframework.boot'
33

44
dependencies {
5-
implementation libraries.spring_boot_starter_actuator
5+
implementation libs.spring.boot.starter.actuator
66

77
implementation project(":edison-core")
8-
implementation libraries.spring_boot_devtools
8+
implementation libs.spring.boot.devtools
99

1010
testImplementation project(":edison-testsupport")
1111
}

‎examples/example-togglz-mongo/build.gradle‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ dependencies {
55
implementation project(":edison-togglz")
66
implementation project(":edison-mongo")
77

8-
implementation libraries.mongodb_driver_core
9-
implementation libraries.mongodb_driver_sync
10-
testImplementation test_libraries.testcontainers_mongo
11-
testImplementation test_libraries.testcontainers_junit
8+
implementation libs.bundles.mongodb
9+
testImplementation libs.testcontainers.mongo
10+
testImplementation libs.testcontainers.junit
1211

1312
testImplementation project(":edison-testsupport")
1413
}

‎examples/example-togglz/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ apply plugin: 'java-library'
22
apply plugin: 'org.springframework.boot'
33

44
dependencies {
5-
implementation libraries.spring_boot_starter_actuator
5+
implementation libs.spring.boot.starter.actuator
66

77
implementation project(":edison-core")
88
implementation project(":edison-togglz")
9-
implementation libraries.spring_boot_starter_web
9+
implementation libs.spring.boot.starter.web
1010

1111
testImplementation project(":edison-testsupport")
1212
}

0 commit comments

Comments
 (0)