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

Move Spring deps to SNAPSHOTs; other changes

Browse Source 
* Removed overridden `getMethodValue()` in the `CookieTests` which is removed from SF already
* Re-enable JDBC tests related to complex named params because of the fix in SF
* `--add-opens` for Tomcat warnings
* Upgrade to `log4j-slf4j2-impl`
* Add `cassandra.yaml` resource with increased timeouts to wait more in busy environment from Cassandra cluster
This commit is contained in:
Artem Bilan
2022-10-19 14:06:00 -04:00
parent d4f0bed408
commit f146b4cbbe
9 changed files with 1914 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
build.gradle
View File

@@ -89,28 +89,28 @@ ext {
lettuceVersion = '6.2.1.RELEASE'
log4jVersion = '2.19.0'
mailVersion = '2.0.1'
micrometerVersion = '1.10.0-RC1'
micrometerTracingVersion = '1.0.0-RC1'
micrometerVersion = '1.10.0-SNAPSHOT'
micrometerTracingVersion = '1.0.0-SNAPSHOT'
mockitoVersion = '4.8.0'
mongoDriverVersion = '4.7.2'
mysqlVersion = '8.0.30'
pahoMqttClientVersion = '1.2.5'
postgresVersion = '42.5.0'
r2dbch2Version = '1.0.0.RC1'
reactorVersion = '2022.0.0-RC1'
reactorVersion = '2022.0.0-SNAPSHOT'
resilience4jVersion = '1.7.1'
romeToolsVersion = '1.18.0'
rsocketVersion = '1.1.3'
servletApiVersion = '5.0.0'
smackVersion = '4.4.6'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-RC1'
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-RC1'
springGraphqlVersion = '1.1.0-RC1'
springKafkaVersion = '3.0.0-RC1'
springRetryVersion = '2.0.0-RC2'
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-RC1'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-RC1'
springWsVersion = '4.0.0-RC1'
springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '3.0.0-SNAPSHOT'
springDataVersion = project.hasProperty('springDataVersion') ? project.springDataVersion : '2022.0.0-SNAPSHOT'
springGraphqlVersion = '1.1.0-SNAPSHOT'
springKafkaVersion = '3.0.0-SNAPSHOT'
springRetryVersion = '2.0.0-SNAPSHOT'
springSecurityVersion = project.hasProperty('springSecurityVersion') ? project.springSecurityVersion : '6.0.0-SNAPSHOT'
springVersion = project.hasProperty('springVersion') ? project.springVersion : '6.0.0-SNAPSHOT'
springWsVersion = '4.0.0-SNAPSHOT'
testcontainersVersion = '1.17.5'
tomcatVersion = '10.0.23'
xmlUnitVersion = '2.9.0'
@@ -284,7 +284,7 @@ configure(javaProjects) { subproject ->
testRuntimeOnly 'org.apache.logging.log4j:log4j-core'
testRuntimeOnly 'org.apache.logging.log4j:log4j-jcl'
testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
testRuntimeOnly 'org.apache.logging.log4j:log4j-slf4j2-impl'
}
// enable all compiler warnings; individual projects may customize further
@@ -933,6 +933,12 @@ project('spring-integration-stomp') {
testRuntimeOnly 'org.springframework:spring-webmvc'
testRuntimeOnly 'io.projectreactor.netty:reactor-netty-http'
}
tasks.withType(JavaForkOptions) {
jvmArgs '--add-opens', 'java.base/java.io=ALL-UNNAMED',
'--add-opens', 'java.base/java.lang=ALL-UNNAMED',
'--add-opens', 'java.rmi/sun.rmi.transport=ALL-UNNAMED'
}
}
project('spring-integration-stream') {
@@ -998,6 +1004,12 @@ project('spring-integration-websocket') {
testRuntimeOnly 'com.fasterxml.jackson.core:jackson-databind'
}
tasks.withType(JavaForkOptions) {
jvmArgs '--add-opens', 'java.base/java.io=ALL-UNNAMED',
'--add-opens', 'java.base/java.lang=ALL-UNNAMED',
'--add-opens', 'java.rmi/sun.rmi.transport=ALL-UNNAMED'
}
}
project('spring-integration-ws') {

2
gradle/docs.gradle
View File

@@ -1,6 +1,6 @@
ext {
backendVersion = '0.0.3'
micrometerDocsVersion='1.0.0-RC1'
micrometerDocsVersion='1.0.0-SNAPSHOT'
}
configurations {

4
spring-integration-cassandra/src/test/java/org/springframework/integration/cassandra/CassandraContainerTest.java
View File

@@ -34,7 +34,9 @@ import org.testcontainers.junit.jupiter.Testcontainers;
@Testcontainers(disabledWithoutDocker = true)
public interface CassandraContainerTest {
CassandraContainer<?> CASSANDRA_CONTAINER = new CassandraContainer<>("cassandra:4.1");
CassandraContainer<?> CASSANDRA_CONTAINER =
new CassandraContainer<>("cassandra:4.1")
.withConfigurationOverride("cassandra");
@BeforeAll
static void startContainer() {

1883
spring-integration-cassandra/src/test/resources/cassandra/cassandra.yaml Normal file
View File

File diff suppressed because it is too large Load Diff

6
spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java
View File

@@ -111,12 +111,6 @@ public class CookieTests {
return null;
}
@Override
@Deprecated
public String getMethodValue() {
return null;
}
public ClientHttpResponse execute() {
allHeaders.add(headers);
return new ClientHttpResponse() {

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

@@ -28,7 +28,6 @@ import java.util.stream.IntStream;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.BeanFactory;
@@ -183,10 +182,9 @@ public class JdbcMessageHandlerIntegrationTests {
}
@Test
@Disabled("SF doesn't handle [] in query params any more")
public void testIdHeaderDynamicInsert() {
JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate,
"insert into foos (id, status, name) values (headers[idAsString], 0, :payload)");
"insert into foos (id, status, name) values (:headers[idAsString], 0, :payload)");
handler.afterPropertiesSet();
Message<String> message = new GenericMessage<>("foo");
String id = message.getHeaders().getId().toString();
@@ -200,7 +198,6 @@ public class JdbcMessageHandlerIntegrationTests {
}
@Test
@Disabled("SF doesn't handle [] in query params any more")
public void testDottedHeaderDynamicInsert() {
JdbcMessageHandler handler = new JdbcMessageHandler(jdbcTemplate,
"insert into foos (id, status, name) values (:headers[business.id], 0, :payload)");

3
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java
View File

@@ -25,7 +25,6 @@ import java.util.Map;
import javax.sql.DataSource;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.context.ConfigurableApplicationContext;
@@ -49,7 +48,6 @@ import org.springframework.messaging.MessageChannel;
* @since 2.0
*
*/
@Disabled("SF doesn't handle [] in query params any more")
public class JdbcMessageHandlerParserTests {
private JdbcTemplate jdbcTemplate;
@@ -168,4 +166,5 @@ public class JdbcMessageHandlerParserTests {
}
}
}

2
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java
View File

@@ -31,7 +31,6 @@ import javax.sql.DataSource;
import org.apache.commons.logging.Log;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.DirectFieldAccessor;
@@ -60,7 +59,6 @@ import org.springframework.messaging.support.GenericMessage;
* @since 2.0
*
*/
@Disabled("SF doesn't handle [] in query params any more")
public class JdbcOutboundGatewayParserTests {
private JdbcTemplate jdbcTemplate;

2
spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/outboundSchema.sql
View File

@@ -1,2 +1,2 @@
create table foos(id varchar(100), status int, name varchar(20));
create table bars(id int identity, status int, name varchar(20));
create table bars(id int AUTO_INCREMENT, status int, name varchar(20));