Skip to content

Commit 119f2fe

Browse files
rwinchrwinch
committed
Sort dependency declarations
1 parent 318e0dd commit 119f2fe

File tree

20 files changed

+177
-179
lines changed

20 files changed

+177
-179
lines changed

‎spring-session-core/spring-session-core.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ dependencies {
99

1010
optional "io.projectreactor:reactor-core"
1111
optional "jakarta.servlet:jakarta.servlet-api"
12+
optional "org.springframework.security:spring-security-core"
13+
optional "org.springframework.security:spring-security-web"
1214
optional "org.springframework:spring-context"
1315
optional "org.springframework:spring-jdbc"
1416
optional "org.springframework:spring-messaging"
1517
optional "org.springframework:spring-web"
1618
optional "org.springframework:spring-webflux"
1719
optional "org.springframework:spring-websocket"
18-
optional "org.springframework.security:spring-security-core"
19-
optional "org.springframework.security:spring-security-web"
2020

21-
testImplementation "io.projectreactor:reactor-test"
22-
testImplementation "org.mockito:mockito-core"
23-
testImplementation "org.mockito:mockito-junit-jupiter"
2421
testImplementation "edu.umd.cs.mtc:multithreadedtc"
25-
testImplementation "org.springframework:spring-test"
22+
testImplementation "io.projectreactor:reactor-test"
23+
testImplementation "org.aspectj:aspectjweaver"
2624
testImplementation "org.assertj:assertj-core"
27-
testImplementation "org.springframework.security:spring-security-core"
2825
testImplementation "org.junit.jupiter:junit-jupiter-api"
2926
testImplementation "org.junit.jupiter:junit-jupiter-params"
30-
testImplementation "org.aspectj:aspectjweaver"
27+
testImplementation "org.mockito:mockito-core"
28+
testImplementation "org.mockito:mockito-junit-jupiter"
29+
testImplementation "org.springframework.security:spring-security-core"
30+
testImplementation "org.springframework:spring-test"
3131
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
3232
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
3333
}

‎spring-session-data-mongodb/spring-session-data-mongodb.gradle

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -3,47 +3,47 @@ apply plugin: 'io.spring.convention.spring-module'
33
description = "Spring Session and Spring MongoDB integration"
44

55
dependencies {
6-
management platform(project(":spring-session-dependencies"))
7-
8-
api project(':spring-session-core')
9-
10-
// Spring Data MongoDB
11-
12-
api("org.springframework.data:spring-data-mongodb") {
13-
exclude group: "org.mongodb", module: "mongo-java-driver"
14-
exclude group: "org.slf4j", module: "jcl-over-slf4j"
15-
}
16-
17-
// MongoDB dependencies
18-
19-
optional "org.mongodb:mongodb-driver-core"
20-
testImplementation "org.mongodb:mongodb-driver-sync"
21-
testImplementation "org.mongodb:mongodb-driver-reactivestreams"
22-
testImplementation 'jakarta.websocket:jakarta.websocket-api'
23-
testImplementation 'jakarta.websocket:jakarta.websocket-client-api'
24-
integrationTestCompile "org.testcontainers:mongodb"
25-
26-
// Everything else
27-
28-
api "com.fasterxml.jackson.core:jackson-databind"
29-
api "org.springframework.security:spring-security-core"
30-
api "com.google.code.findbugs:jsr305"
31-
32-
optional "io.projectreactor:reactor-core"
33-
34-
testImplementation "org.springframework:spring-web"
35-
testImplementation "org.springframework:spring-webflux"
36-
testImplementation "org.springframework.security:spring-security-config"
37-
testImplementation "org.springframework.security:spring-security-web"
38-
testImplementation "org.assertj:assertj-core"
39-
testImplementation "org.junit.jupiter:junit-jupiter-engine"
40-
testImplementation "org.junit.jupiter:junit-jupiter-params"
41-
testImplementation "org.springframework:spring-test"
42-
testImplementation "org.hamcrest:hamcrest"
43-
testImplementation "ch.qos.logback:logback-core"
44-
testImplementation "org.mockito:mockito-core"
45-
testImplementation "org.mockito:mockito-junit-jupiter"
46-
testImplementation "io.projectreactor:reactor-test"
47-
testImplementation "jakarta.servlet:jakarta.servlet-api"
48-
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
6+
management platform(project(":spring-session-dependencies"))
7+
8+
api project(':spring-session-core')
9+
10+
// Spring Data MongoDB
11+
12+
api("org.springframework.data:spring-data-mongodb") {
13+
exclude group: "org.mongodb", module: "mongo-java-driver"
14+
exclude group: "org.slf4j", module: "jcl-over-slf4j"
15+
}
16+
17+
// MongoDB dependencies
18+
19+
optional "org.mongodb:mongodb-driver-core"
20+
testImplementation "org.mongodb:mongodb-driver-reactivestreams"
21+
testImplementation "org.mongodb:mongodb-driver-sync"
22+
testImplementation 'jakarta.websocket:jakarta.websocket-api'
23+
testImplementation 'jakarta.websocket:jakarta.websocket-client-api'
24+
integrationTestCompile "org.testcontainers:mongodb"
25+
26+
// Everything else
27+
28+
api "com.fasterxml.jackson.core:jackson-databind"
29+
api "com.google.code.findbugs:jsr305"
30+
api "org.springframework.security:spring-security-core"
31+
32+
optional "io.projectreactor:reactor-core"
33+
34+
testImplementation "ch.qos.logback:logback-core"
35+
testImplementation "io.projectreactor:reactor-test"
36+
testImplementation "jakarta.servlet:jakarta.servlet-api"
37+
testImplementation "org.assertj:assertj-core"
38+
testImplementation "org.hamcrest:hamcrest"
39+
testImplementation "org.junit.jupiter:junit-jupiter-engine"
40+
testImplementation "org.junit.jupiter:junit-jupiter-params"
41+
testImplementation "org.mockito:mockito-core"
42+
testImplementation "org.mockito:mockito-junit-jupiter"
43+
testImplementation "org.springframework.security:spring-security-config"
44+
testImplementation "org.springframework.security:spring-security-web"
45+
testImplementation "org.springframework:spring-test"
46+
testImplementation "org.springframework:spring-web"
47+
testImplementation "org.springframework:spring-webflux"
48+
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
4949
}

‎spring-session-data-redis/spring-session-data-redis.gradle

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,26 @@ description = "Spring Session Redis implementation"
55
dependencies {
66
management platform(project(":spring-session-dependencies"))
77
api project(':spring-session-core')
8-
api ("org.springframework.data:spring-data-redis") {
9-
exclude group: "org.slf4j", module: 'jcl-over-slf4j'
10-
}
8+
api 'org.springframework.data:spring-data-redis'
119

1210
optional "io.projectreactor:reactor-core"
1311
optional "org.springframework:spring-web"
1412

13+
testImplementation "io.lettuce:lettuce-core"
14+
testImplementation "io.projectreactor:reactor-test"
15+
testImplementation "jakarta.servlet:jakarta.servlet-api"
1516
testImplementation "org.assertj:assertj-core"
17+
testImplementation "org.awaitility:awaitility"
18+
testImplementation "org.junit.jupiter:junit-jupiter-api"
1619
testImplementation "org.mockito:mockito-core"
1720
testImplementation "org.mockito:mockito-junit-jupiter"
21+
testImplementation "org.springframework.security:spring-security-core"
1822
testImplementation "org.springframework:spring-test"
19-
testImplementation "io.projectreactor:reactor-test"
20-
testImplementation "jakarta.servlet:jakarta.servlet-api"
2123
testImplementation "org.springframework:spring-web"
22-
testImplementation "org.springframework.security:spring-security-core"
23-
testImplementation "org.junit.jupiter:junit-jupiter-api"
24-
testImplementation "org.awaitility:awaitility"
25-
testImplementation "io.lettuce:lettuce-core"
24+
2625
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
2726
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
2827

29-
integrationTestCompile "org.testcontainers:testcontainers"
3028
integrationTestCompile "com.redis:testcontainers-redis:1.7.0"
29+
integrationTestCompile "org.testcontainers:testcontainers"
3130
}

‎spring-session-dependencies/spring-session-dependencies.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,19 @@ javaPlatform {
77
}
88

99
dependencies {
10-
api platform(libs.io.projectreactor.reactor.bom)
1110
api platform(libs.com.fasterxml.jackson.jackson.bom)
11+
api platform(libs.io.projectreactor.reactor.bom)
1212
api platform(libs.org.junit.junit.bom)
1313
api platform(libs.org.mockito.mockito.bom)
14-
api platform(libs.org.springframework.spring.framework.bom)
1514
api platform(libs.org.springframework.data.spring.data.bom)
1615
api platform(libs.org.springframework.security.spring.security.bom)
16+
api platform(libs.org.springframework.spring.framework.bom)
1717
api platform(libs.org.testcontainers.testcontainers.bom)
1818
constraints {
19-
api libs.com.hazelcast
20-
api libs.org.aspectj.aspectjweaver
2119
api libs.ch.qos.logback.logback.core
2220
api libs.com.google.code.findbugs.jsr305
2321
api libs.com.h2database.h2
22+
api libs.com.hazelcast
2423
api libs.com.ibm.db2.jcc
2524
api libs.com.microsoft.sqlserver.mssql.jdbc
2625
api libs.com.oracle.database.jdbc.ojdbc8
@@ -33,15 +32,16 @@ dependencies {
3332
api libs.mysql.mysql.connector.java
3433
api libs.org.apache.derby.derby
3534
api libs.org.apache.derby.derbytools
35+
api libs.org.aspectj.aspectjweaver
3636
api libs.org.assertj.assertj.core
37+
api libs.org.awaitility.awaitility
3738
api libs.org.hamcrest
3839
api libs.org.hsqldb
3940
api libs.org.mariadb.jdbc.mariadb.java.client
4041
api libs.org.mongodb.mongodb.driver.core
41-
api libs.org.mongodb.mongodb.driver.sync
4242
api libs.org.mongodb.mongodb.driver.reactivestreams
43+
api libs.org.mongodb.mongodb.driver.sync
4344
api libs.org.postgresql
44-
api libs.org.awaitility.awaitility
4545
}
4646
}
4747

‎spring-session-docs/spring-session-docs.gradle

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@ apply plugin: 'io.spring.convention.spring-test'
88

99
dependencies {
1010
management platform(project(":spring-session-dependencies"))
11-
testImplementation project(':spring-session-core')
12-
testImplementation project(':spring-session-data-redis')
13-
testImplementation project(':spring-session-hazelcast')
14-
testImplementation project(':spring-session-jdbc')
15-
testImplementation 'org.springframework:spring-jdbc'
16-
testImplementation 'org.springframework:spring-messaging'
17-
testImplementation 'org.springframework:spring-webmvc'
18-
testImplementation 'org.springframework:spring-websocket'
19-
testImplementation 'org.springframework.security:spring-security-config'
20-
testImplementation 'org.springframework.security:spring-security-web'
21-
testImplementation 'org.springframework.security:spring-security-test'
22-
testImplementation 'org.mockito:mockito-core'
23-
testImplementation 'org.mockito:mockito-junit-jupiter'
24-
testImplementation 'org.springframework:spring-test'
25-
testImplementation 'org.assertj:assertj-core'
2611
testImplementation 'com.hazelcast:hazelcast'
2712
testImplementation 'io.lettuce:lettuce-core'
2813
testImplementation 'jakarta.servlet:jakarta.servlet-api'
14+
testImplementation 'org.assertj:assertj-core'
2915
testImplementation 'org.junit.jupiter:junit-jupiter-api'
16+
testImplementation 'org.mockito:mockito-core'
17+
testImplementation 'org.mockito:mockito-junit-jupiter'
18+
testImplementation 'org.springframework.security:spring-security-config'
19+
testImplementation 'org.springframework.security:spring-security-test'
20+
testImplementation 'org.springframework.security:spring-security-web'
21+
testImplementation 'org.springframework:spring-jdbc'
22+
testImplementation 'org.springframework:spring-messaging'
23+
testImplementation 'org.springframework:spring-test'
24+
testImplementation 'org.springframework:spring-webmvc'
25+
testImplementation 'org.springframework:spring-websocket'
26+
testImplementation project(':spring-session-core')
27+
testImplementation project(':spring-session-data-redis')
28+
testImplementation project(':spring-session-hazelcast')
29+
testImplementation project(':spring-session-jdbc')
3030
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
31-
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
31+
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
3232
}
3333

3434

‎spring-session-hazelcast/spring-session-hazelcast.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ dependencies {
88

99
testImplementation "jakarta.servlet:jakarta.servlet-api"
1010
testImplementation "org.assertj:assertj-core"
11+
testImplementation "org.junit.jupiter:junit-jupiter-api"
1112
testImplementation "org.mockito:mockito-core"
1213
testImplementation "org.mockito:mockito-junit-jupiter"
14+
testImplementation "org.springframework.security:spring-security-core"
1315
testImplementation "org.springframework:spring-test"
1416
testImplementation "org.springframework:spring-web"
15-
testImplementation "org.springframework.security:spring-security-core"
16-
testImplementation "org.junit.jupiter:junit-jupiter-api"
1717

1818
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
1919
testRuntimeOnly "org.junit.platform:junit-platform-launcher"

‎spring-session-jdbc/spring-session-jdbc.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ dependencies {
1010

1111
testImplementation "jakarta.servlet:jakarta.servlet-api"
1212
testImplementation "org.assertj:assertj-core"
13+
testImplementation "org.junit.jupiter:junit-jupiter-api"
14+
testImplementation "org.junit.jupiter:junit-jupiter-params"
1315
testImplementation "org.mockito:mockito-core"
1416
testImplementation "org.mockito:mockito-junit-jupiter"
17+
testImplementation "org.springframework.security:spring-security-core"
1518
testImplementation "org.springframework:spring-test"
1619
testImplementation "org.springframework:spring-web"
17-
testImplementation "org.springframework.security:spring-security-core"
18-
testImplementation "org.junit.jupiter:junit-jupiter-api"
19-
testImplementation "org.junit.jupiter:junit-jupiter-params"
2020

2121
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
2222
testRuntimeOnly "org.junit.platform:junit-platform-launcher"
2323

2424
integrationTestCompile "com.h2database:h2"
2525
integrationTestCompile "com.ibm.db2:jcc"
2626
integrationTestCompile "com.microsoft.sqlserver:mssql-jdbc"
27+
integrationTestCompile "com.mysql:mysql-connector-j"
2728
integrationTestCompile "com.oracle.database.jdbc:ojdbc8"
2829
integrationTestCompile "com.zaxxer:HikariCP"
29-
integrationTestCompile "com.mysql:mysql-connector-j"
3030
integrationTestCompile "org.apache.derby:derby"
3131
integrationTestCompile "org.apache.derby:derbytools"
3232
integrationTestCompile "org.hsqldb:hsqldb"

‎spring-session-samples/spring-session-sample-boot-findbyusername/spring-session-sample-boot-findbyusername.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ apply plugin: 'io.spring.convention.spring-sample-boot'
33
dependencies {
44
management platform(project(":spring-session-dependencies"))
55
implementation project(':spring-session-data-redis')
6-
implementation "org.springframework.boot:spring-boot-starter-web"
7-
implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
8-
implementation "org.springframework.boot:spring-boot-starter-security"
9-
implementation "org.springframework.boot:spring-boot-starter-data-redis"
10-
implementation "org.springframework.boot:spring-boot-session-data-redis"
11-
implementation "org.springframework.boot:spring-boot-devtools"
6+
implementation "com.maxmind.geoip2:geoip2"
127
implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
8+
implementation "org.apache.httpcomponents:httpclient"
9+
implementation "org.springframework.boot:spring-boot-devtools"
10+
implementation "org.springframework.boot:spring-boot-session-data-redis"
11+
implementation "org.springframework.boot:spring-boot-starter-data-redis"
12+
implementation "org.springframework.boot:spring-boot-starter-security"
13+
implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
14+
implementation "org.springframework.boot:spring-boot-starter-web"
1315
implementation "org.webjars:bootstrap"
1416
implementation "org.webjars:html5shiv"
1517
implementation "org.webjars:webjars-locator-core"
16-
implementation "com.maxmind.geoip2:geoip2"
17-
implementation "org.apache.httpcomponents:httpclient"
1818

19-
testImplementation "org.springframework.boot:spring-boot-starter-test"
2019
testImplementation "org.assertj:assertj-core"
2120
testImplementation "org.junit.jupiter:junit-jupiter-api"
21+
testImplementation "org.springframework.boot:spring-boot-starter-test"
2222

2323

2424
integrationTestCompile "org.htmlunit:htmlunit"

‎spring-session-samples/spring-session-sample-boot-hazelcast/spring-session-sample-boot-hazelcast.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ apply plugin: 'io.spring.convention.spring-sample-boot'
33
dependencies {
44
management platform(project(":spring-session-dependencies"))
55
implementation project(':spring-session-hazelcast')
6-
implementation "org.springframework.boot:spring-boot-starter-web"
7-
implementation "org.springframework.boot:spring-boot-starter-actuator"
8-
implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
9-
implementation "org.springframework.boot:spring-boot-starter-security"
10-
implementation "org.springframework.boot:spring-boot-session-hazelcast"
116
implementation "com.hazelcast:hazelcast"
127
implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
8+
implementation "org.springframework.boot:spring-boot-session-hazelcast"
9+
implementation "org.springframework.boot:spring-boot-starter-actuator"
10+
implementation "org.springframework.boot:spring-boot-starter-security"
11+
implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
12+
implementation "org.springframework.boot:spring-boot-starter-web"
1313
implementation "org.webjars:bootstrap"
1414
implementation "org.webjars:html5shiv"
1515
implementation "org.webjars:webjars-locator-core"
1616

17-
testImplementation "org.springframework.boot:spring-boot-starter-test"
1817
testImplementation "org.junit.jupiter:junit-jupiter-api"
18+
testImplementation "org.springframework.boot:spring-boot-starter-test"
1919

2020
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
2121
testRuntimeOnly "org.junit.platform:junit-platform-launcher"

‎spring-session-samples/spring-session-sample-boot-jdbc-json-attribute/spring-session-sample-boot-jdbc-json-attribute.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ apply plugin: 'io.spring.convention.spring-sample-boot'
33
dependencies {
44
management platform(project(":spring-session-dependencies"))
55
implementation project(':spring-session-jdbc')
6-
implementation "org.springframework.boot:spring-boot-starter-jdbc"
6+
implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
77
implementation "org.springframework.boot:spring-boot-session-jdbc"
8-
implementation "org.springframework.boot:spring-boot-starter-web"
9-
implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
8+
implementation "org.springframework.boot:spring-boot-starter-jdbc"
109
implementation "org.springframework.boot:spring-boot-starter-security"
11-
implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
10+
implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
11+
implementation "org.springframework.boot:spring-boot-starter-web"
1212
implementation "org.webjars:bootstrap"
1313
implementation "org.webjars:html5shiv"
1414
implementation "org.webjars:webjars-locator-core"

‎spring-session-samples/spring-session-sample-boot-jdbc/spring-session-sample-boot-jdbc.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ apply plugin: 'io.spring.convention.spring-sample-boot'
33
dependencies {
44
management platform(project(":spring-session-dependencies"))
55
implementation project(':spring-session-jdbc')
6-
implementation "org.springframework.boot:spring-boot-starter-web"
7-
implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
8-
implementation "org.springframework.boot:spring-boot-starter-security"
9-
implementation "org.springframework.boot:spring-boot-session-jdbc"
10-
implementation "org.springframework.boot:spring-boot-h2console"
11-
implementation "org.springframework.boot:spring-boot-devtools"
6+
implementation "com.h2database:h2"
127
implementation "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
8+
implementation "org.springframework.boot:spring-boot-devtools"
9+
implementation "org.springframework.boot:spring-boot-h2console"
10+
implementation "org.springframework.boot:spring-boot-session-jdbc"
11+
implementation "org.springframework.boot:spring-boot-starter-security"
12+
implementation "org.springframework.boot:spring-boot-starter-thymeleaf"
13+
implementation "org.springframework.boot:spring-boot-starter-web"
1314
implementation "org.webjars:bootstrap"
1415
implementation "org.webjars:html5shiv"
1516
implementation "org.webjars:webjars-locator-core"
16-
implementation "com.h2database:h2"
1717

18-
testImplementation "org.springframework.boot:spring-boot-starter-test"
1918
testImplementation "org.assertj:assertj-core"
2019
testImplementation "org.junit.jupiter:junit-jupiter-api"
20+
testImplementation "org.springframework.boot:spring-boot-starter-test"
2121

2222
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
2323
testRuntimeOnly "org.junit.platform:junit-platform-launcher"

0 commit comments

Comments
 (0)