From cae8b51eab961b28abc9541b3f9de5d09373e37f Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 17 Aug 2021 15:14:03 +0200 Subject: [PATCH] Upgrade test dependencies --- gradle/dependency-management.gradle | 22 +++++++++---------- .../session/jdbc/DatabaseContainers.java | 8 +++---- .../gradle/dependency-management.gradle | 10 ++++----- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 37d75eda..7f4d69dc 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -5,7 +5,7 @@ dependencyManagement { mavenBom 'org.springframework:spring-framework-bom:5.3.9' mavenBom 'org.springframework.data:spring-data-bom:2021.1.0-M2' mavenBom 'org.springframework.security:spring-security-bom:5.6.0-M2' - mavenBom 'org.testcontainers:testcontainers-bom:1.15.3' + mavenBom 'org.testcontainers:testcontainers-bom:1.16.0' } dependencies { @@ -14,23 +14,23 @@ dependencyManagement { entry 'hazelcast-client' } - dependency 'org.aspectj:aspectjweaver:1.9.6' + dependency 'org.aspectj:aspectjweaver:1.9.7' dependency 'com.h2database:h2:1.4.200' - dependency 'com.ibm.db2:jcc:11.5.5.0' - dependency 'com.microsoft.sqlserver:mssql-jdbc:7.4.1.jre8' - dependency 'com.oracle.database.jdbc:ojdbc8:19.10.0.0' + dependency 'com.ibm.db2:jcc:11.5.6.0' + dependency 'com.microsoft.sqlserver:mssql-jdbc:9.4.0.jre8' + dependency 'com.oracle.database.jdbc:ojdbc8:21.1.0.0' dependency 'com.zaxxer:HikariCP:3.4.5' dependency 'edu.umd.cs.mtc:multithreadedtc:1.01' - dependency 'io.lettuce:lettuce-core:6.1.2.RELEASE' + dependency 'io.lettuce:lettuce-core:6.1.4.RELEASE' dependency 'javax.annotation:javax.annotation-api:1.3.2' dependency 'javax.servlet:javax.servlet-api:4.0.1' dependency 'junit:junit:4.13.2' - dependency 'mysql:mysql-connector-java:8.0.25' + dependency 'mysql:mysql-connector-java:8.0.26' dependency 'org.apache.derby:derby:10.14.2.0' - dependency 'org.assertj:assertj-core:3.19.0' + dependency 'org.assertj:assertj-core:3.20.2' dependency 'org.hsqldb:hsqldb:2.5.1' - dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.3' - dependency 'org.mockito:mockito-core:3.10.0' - dependency 'org.postgresql:postgresql:42.2.20' + dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.4' + dependency 'org.mockito:mockito-core:3.11.2' + dependency 'org.postgresql:postgresql:42.2.23' } } diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java index fde20c53..e53ca35c 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2020 the original author or authors. + * Copyright 2014-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,11 +42,11 @@ final class DatabaseContainers { } static MariaDBContainer mariaDb() { - return new MariaDBContainer<>("mariadb:10.6.0"); + return new MariaDBContainer<>("mariadb:10.6.4"); } static MySQLContainer mySql() { - return new MySQLContainer<>("mysql:8.0.25"); + return new MySQLContainer<>("mysql:8.0.26"); } static OracleContainer oracle() { @@ -68,7 +68,7 @@ final class DatabaseContainers { } static PostgreSQLContainer postgreSql() { - return new PostgreSQLContainer<>("postgres:13.3"); + return new PostgreSQLContainer<>("postgres:13.4"); } static MSSQLServerContainer sqlServer() { diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle index 61c2cf22..c2b1874c 100644 --- a/spring-session-samples/gradle/dependency-management.gradle +++ b/spring-session-samples/gradle/dependency-management.gradle @@ -1,17 +1,17 @@ dependencyManagement { imports { - mavenBom 'com.fasterxml.jackson:jackson-bom:2.12.3' + mavenBom 'com.fasterxml.jackson:jackson-bom:2.12.4' } dependencies { - dependency 'ch.qos.logback:logback-classic:1.2.3' + dependency 'ch.qos.logback:logback-classic:1.2.5' dependency 'com.maxmind.geoip2:geoip2:2.15.0' dependency 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2' dependency 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.3' dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5' - dependency 'org.seleniumhq.selenium:htmlunit-driver:2.49.1' - dependency 'org.slf4j:jcl-over-slf4j:1.7.30' - dependency 'org.slf4j:log4j-over-slf4j:1.7.30' + dependency 'org.seleniumhq.selenium:htmlunit-driver:2.52.0' + dependency 'org.slf4j:jcl-over-slf4j:1.7.32' + dependency 'org.slf4j:log4j-over-slf4j:1.7.32' dependency 'org.webjars:bootstrap:2.3.2' dependency 'org.webjars:html5shiv:3.7.3-1' dependency 'org.webjars:jquery:3.6.0'