Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Checkstyle violations

Browse Source 
* Upgrade to Spring Security `6.0.0-M5`
This commit is contained in:
Artem Bilan
2022-05-18 13:56:01 -04:00
parent ed6f26104f
commit 1790f235b7
4 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -103,7 +103,7 @@ ext {
springGraphqlVersion = '1.0.0'
springKafkaVersion = '3.0.0-M4'
springRetryVersion = '1.3.3'
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M4'
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-M5'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-M4'
springWsVersion = '4.0.0-M2'
testcontainersVersion = '1.17.1'

5
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlContainerTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2021 the original author or authors.
* Copyright 2021-2022 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.
@@ -19,9 +19,6 @@ package org.springframework.integration.jdbc.mysql;
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.testcontainers.utility.DockerImageName;
import org.springframework.integration.test.util.TestUtils;
/**
* The base contract for JUnit tests based on the container for MqSQL.

4
spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/MosquittoContainerTest.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2021 the original author or authors.
* Copyright 2021-2022 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.
@@ -20,8 +20,6 @@ import org.testcontainers.containers.GenericContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import org.springframework.integration.test.util.TestUtils;
/**
*
* @author Artem Bilan

14
spring-integration-test-support/src/main/java/org/springframework/integration/test/util/TestUtils.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 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.
@@ -21,7 +21,6 @@ import java.lang.reflect.InvocationTargetException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;
@@ -375,16 +374,7 @@ public abstract class TestUtils {
ctx.updateLoggers();
}
public static class LevelsContainer {
private final Map<Class<?>, Level> classLevels;
private final Map<String, Level> categoryLevels;
public LevelsContainer(Map<Class<?>, Level> classLevels, Map<String, Level> categoryLevels) {
this.classLevels = classLevels;
this.categoryLevels = categoryLevels;
}
public record LevelsContainer(Map<Class<?>, Level> classLevels, Map<String, Level> categoryLevels) {
}