Skip to content

Commit d43b48b

Browse files
committed
Revert "Upgrade test dependencies"
This reverts commit 2369b2c.
1 parent e1dea5e commit d43b48b

File tree

18 files changed

+35
-35
lines changed

18 files changed

+35
-35
lines changed

gradle/dependency-management.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencyManagement {
66
mavenBom 'org.springframework:spring-framework-bom:5.3.19'
77
mavenBom 'org.springframework.data:spring-data-bom:2021.2.0-RC1'
88
mavenBom 'org.springframework.security:spring-security-bom:5.7.0-RC1'
9-
mavenBom 'org.testcontainers:testcontainers-bom:1.17.1'
9+
mavenBom 'org.testcontainers:testcontainers-bom:1.16.2'
1010
}
1111

1212
dependencies {
@@ -15,25 +15,25 @@ dependencyManagement {
1515
entry 'hazelcast-client'
1616
}
1717

18-
dependency 'org.aspectj:aspectjweaver:1.9.9.1'
19-
dependency 'ch.qos.logback:logback-core:1.2.11'
18+
dependency 'org.aspectj:aspectjweaver:1.9.7'
19+
dependency 'ch.qos.logback:logback-core:1.2.10'
2020
dependency 'com.google.code.findbugs:jsr305:3.0.2'
2121
dependency 'com.h2database:h2:1.4.200'
22-
dependency 'com.ibm.db2:jcc:11.5.7.0'
22+
dependency 'com.ibm.db2:jcc:11.5.6.0'
2323
dependency 'com.microsoft.sqlserver:mssql-jdbc:9.4.1.jre8'
24-
dependency 'com.oracle.database.jdbc:ojdbc8:21.5.0.0'
24+
dependency 'com.oracle.database.jdbc:ojdbc8:21.4.0.0.1'
2525
dependency 'com.zaxxer:HikariCP:3.4.5'
2626
dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
27-
dependency 'io.lettuce:lettuce-core:6.1.8.RELEASE'
27+
dependency 'io.lettuce:lettuce-core:6.1.6.RELEASE'
2828
dependency 'jakarta.annotation:jakarta.annotation-api:1.3.5'
2929
dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4'
30-
dependency 'mysql:mysql-connector-java:8.0.28'
30+
dependency 'mysql:mysql-connector-java:8.0.27'
3131
dependency 'org.apache.derby:derby:10.14.2.0'
3232
dependency 'org.assertj:assertj-core:3.22.0'
33-
dependency 'org.hamcrest:hamcrest:2.2'
34-
dependency 'org.hsqldb:hsqldb:2.6.1'
35-
dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.5'
36-
dependencySet(group: 'org.mockito', version: '4.4.0') {
33+
dependency 'org.hamcrest:hamcrest:2.1'
34+
dependency 'org.hsqldb:hsqldb:2.5.2'
35+
dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.4'
36+
dependencySet(group: 'org.mockito', version: '4.2.0') {
3737
entry 'mockito-core'
3838
entry 'mockito-junit-jupiter'
3939
}
@@ -43,7 +43,7 @@ dependencyManagement {
4343
entry 'mongodb-driver-sync'
4444
entry 'mongodb-driver-reactivestreams'
4545
}
46-
dependency 'org.postgresql:postgresql:42.3.4'
46+
dependency 'org.postgresql:postgresql:42.3.1'
4747
}
4848
}
4949

spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
*/
3030
public abstract class AbstractRedisITests {
3131

32-
private static final String DOCKER_IMAGE = "redis:5.0.14";
32+
private static final String DOCKER_IMAGE = "redis:5.0.10";
3333

3434
protected static class BaseConfig {
3535

spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ static Db2Container db2() {
4242
}
4343

4444
static MariaDBContainer<?> mariaDb() {
45-
return new MariaDBContainer<>("mariadb:10.7.3");
45+
return new MariaDBContainer<>("mariadb:10.6.4");
4646
}
4747

4848
static MySQLContainer<?> mySql() {
49-
return new MySQLContainer<>("mysql:8.0.28");
49+
return new MySQLContainer<>("mysql:8.0.27");
5050
}
5151

5252
static OracleContainer oracle() {
@@ -68,7 +68,7 @@ protected void waitUntilContainerStarted() {
6868
}
6969

7070
static PostgreSQLContainer<?> postgreSql() {
71-
return new PostgreSQLContainer<>("postgres:14.2");
71+
return new PostgreSQLContainer<>("postgres:14.0");
7272
}
7373

7474
static MSSQLServerContainer<?> sqlServer() {

spring-session-samples/gradle/dependency-management.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ dependencyManagement {
44
}
55

66
dependencies {
7-
dependency 'ch.qos.logback:logback-classic:1.2.11'
8-
dependency 'com.maxmind.geoip2:geoip2:2.16.1'
7+
dependency 'ch.qos.logback:logback-classic:1.2.10'
8+
dependency 'com.maxmind.geoip2:geoip2:2.15.0'
99
dependency 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2'
1010
dependency 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.3'
1111
dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5'
12-
dependency 'org.seleniumhq.selenium:htmlunit-driver:3.60.0'
13-
dependency 'org.slf4j:jcl-over-slf4j:1.7.36'
14-
dependency 'org.slf4j:log4j-over-slf4j:1.7.36'
12+
dependency 'org.seleniumhq.selenium:htmlunit-driver:3.56.0'
13+
dependency 'org.slf4j:jcl-over-slf4j:1.7.33'
14+
dependency 'org.slf4j:log4j-over-slf4j:1.7.33'
1515
dependency 'org.webjars:bootstrap:2.3.2'
1616
dependency 'org.webjars:html5shiv:3.7.3-1'
1717
dependency 'org.webjars:jquery:3.6.0'

spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/FindByUsernameTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
@SpringBootTest(webEnvironment = WebEnvironment.MOCK)
4747
class FindByUsernameTests {
4848

49-
private static final String DOCKER_IMAGE = "redis:5.0.14";
49+
private static final String DOCKER_IMAGE = "redis:5.0.10";
5050

5151
@Autowired
5252
private MockMvc mockMvc;

spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
@AutoConfigureMockMvc
5151
class HttpRedisJsonTest {
5252

53-
private static final String DOCKER_IMAGE = "redis:5.0.14";
53+
private static final String DOCKER_IMAGE = "redis:5.0.10";
5454

5555
@Autowired
5656
private MockMvc mockMvc;

spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/RedisSerializerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
@SpringBootTest
4040
class RedisSerializerTest {
4141

42-
private static final String DOCKER_IMAGE = "redis:5.0.14";
42+
private static final String DOCKER_IMAGE = "redis:5.0.10";
4343

4444
@SpringSessionRedisOperations
4545
private RedisTemplate<Object, Object> sessionRedisTemplate;

spring-session-samples/spring-session-sample-boot-redis-simple/src/integration-test/java/sample/BootTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
@SpringBootTest(webEnvironment = WebEnvironment.MOCK)
4242
class BootTests {
4343

44-
private static final String DOCKER_IMAGE = "redis:5.0.14";
44+
private static final String DOCKER_IMAGE = "redis:5.0.10";
4545

4646
@Autowired
4747
private MockMvc mockMvc;

spring-session-samples/spring-session-sample-boot-redis/src/integration-test/java/sample/BootTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
@SpringBootTest(webEnvironment = WebEnvironment.MOCK)
4646
class BootTests {
4747

48-
private static final String DOCKER_IMAGE = "redis:5.0.14";
48+
private static final String DOCKER_IMAGE = "redis:5.0.10";
4949

5050
@Autowired
5151
private MockMvc mockMvc;

spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/integration-test/java/sample/AttributeTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
4646
class AttributeTests {
4747

48-
private static final String DOCKER_IMAGE = "redis:5.0.14";
48+
private static final String DOCKER_IMAGE = "redis:5.0.9";
4949

5050
@LocalServerPort
5151
private int port;

0 commit comments

Comments
 (0)