diff --git a/build.gradle b/build.gradle index fc92d43f3f..6ef3ae12bb 100644 --- a/build.gradle +++ b/build.gradle @@ -16,10 +16,10 @@ buildscript { plugins { id 'org.sonarqube' version '2.8' - id 'io.spring.nohttp' version '0.0.10' apply false + id 'io.spring.nohttp' version '0.0.11' apply false id 'org.ajoberstar.grgit' version '4.1.1' id 'io.spring.dependency-management' version '1.1.0' - id 'com.jfrog.artifactory' version '4.29.3' apply false + id 'com.jfrog.artifactory' version '4.31.0' apply false id 'org.jetbrains.dokka' version '1.7.20' id 'org.asciidoctor.jvm.pdf' version '3.3.2' id 'org.asciidoctor.jvm.gems' version '3.3.2' @@ -50,8 +50,8 @@ ext { apacheSshdVersion = '2.9.2' artemisVersion = '2.27.1' - aspectjVersion = '1.9.9.1' - assertjVersion = '3.23.1' + aspectjVersion = '1.9.19' + assertjVersion = '3.24.2' assertkVersion = '0.25' avroVersion = '1.11.1' awaitilityVersion = '4.2.0' @@ -64,8 +64,8 @@ ext { findbugsVersion = '3.0.1' ftpServerVersion = '1.2.0' graalvmVersion = '22.3.0' - greenmailVersion = '2.0.0-alpha-2' - groovyVersion = '4.0.6' + greenmailVersion = '2.0.0-alpha-3' + groovyVersion = '4.0.7' hamcrestVersion = '2.2' hazelcastVersion = '5.2.1' hibernateVersion = '6.1.6.Final' @@ -80,39 +80,39 @@ ext { jrubyVersion = '9.3.9.0' jsonpathVersion = '2.7.0' junit4Version = '4.13.2' - junitJupiterVersion = '5.9.1' + junitJupiterVersion = '5.9.2' jythonVersion = '2.7.3' kotlinCoroutinesVersion = '1.6.4' kryoVersion = '5.3.0' lettuceVersion = '6.2.2.RELEASE' log4jVersion = '2.19.0' mailVersion = '1.0.0' - micrometerVersion = '1.10.2' - micrometerTracingVersion = '1.0.0' + micrometerVersion = '1.10.3' + micrometerTracingVersion = '1.0.1' mockitoVersion = '4.10.0' - mongoDriverVersion = '4.8.1' + mongoDriverVersion = '4.8.2' mysqlVersion = '8.0.31' pahoMqttClientVersion = '1.2.5' postgresVersion = '42.5.1' r2dbch2Version = '1.0.0.RELEASE' - reactorVersion = '2022.0.1' + reactorVersion = '2022.0.2' resilience4jVersion = '1.7.1' romeToolsVersion = '1.18.0' rsocketVersion = '1.1.3' servletApiVersion = '6.0.0' smackVersion = '4.4.6' - springAmqpVersion = '3.0.0' - springDataVersion = '2022.0.0' + springAmqpVersion = '3.0.1' + springDataVersion = '2022.0.1' springGraphqlVersion = '1.1.1' - springKafkaVersion = '3.0.1' + springKafkaVersion = '3.0.2' springRetryVersion = '2.0.0' springSecurityVersion = '6.0.1' - springVersion = '6.0.3' - springWsVersion = '4.0.0' + springVersion = '6.0.4' + springWsVersion = '4.0.1' testcontainersVersion = '1.17.6' - tomcatVersion = '10.1.4' - xmlUnitVersion = '2.9.0' - xstreamVersion = '1.4.19' + tomcatVersion = '10.1.5' + xmlUnitVersion = '2.9.1' + xstreamVersion = '1.4.20' javaProjects = subprojects - project(':spring-integration-bom') } @@ -171,6 +171,7 @@ allprojects { mavenBom "org.springframework.kafka:spring-kafka-bom:$springKafkaVersion" mavenBom "org.springframework.data:spring-data-bom:$springDataVersion" mavenBom "org.springframework:spring-framework-bom:$springVersion" + mavenBom "org.springframework.ws:spring-ws-bom:$springWsVersion" } } @@ -1023,14 +1024,14 @@ project('spring-integration-ws') { api project(':spring-integration-core') api 'org.springframework:spring-oxm' api 'org.springframework:spring-webmvc' - api("org.springframework.ws:spring-ws-core:$springWsVersion") { + api('org.springframework.ws:spring-ws-core') { exclude group: 'org.springframework' } providedImplementation "com.sun.xml.bind:jaxb-impl:$jaxbVersion" testImplementation "com.thoughtworks.xstream:xstream:$xstreamVersion" - testImplementation("org.springframework.ws:spring-ws-support:$springWsVersion") { + testImplementation('org.springframework.ws:spring-ws-support') { exclude group: 'org.springframework' } testImplementation 'org.springframework:spring-jms' @@ -1046,10 +1047,10 @@ project('spring-integration-xml') { dependencies { api project(':spring-integration-core') api 'org.springframework:spring-oxm' - api("org.springframework.ws:spring-xml:$springWsVersion") { + api('org.springframework.ws:spring-xml') { exclude group: 'org.springframework' } - optionalApi("org.springframework.ws:spring-ws-core:$springWsVersion") { + optionalApi('org.springframework.ws:spring-ws-core') { exclude group: 'org.springframework' } diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/SmtpTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/SmtpTests.java index 450b3fe4ca..732a9e0a16 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/SmtpTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/SmtpTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2016-2022 the original author or authors. + * Copyright 2016-2023 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. @@ -81,7 +81,7 @@ public class SmtpTests { assertThat(message.getFrom()).containsOnly(new InternetAddress("foo@bar")); assertThat(message.getRecipients(RecipientType.TO)).containsOnly(new InternetAddress("bar@baz")); assertThat(message.getSubject()).isEqualTo("foo"); - assertThat(message.getContent()).asString().isEqualTo("foo\r\n"); + assertThat(message.getContent()).asString().isEqualTo("foo"); } } diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/dsl/MailTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/dsl/MailTests.java index ac0db77fe8..70ea57cb4f 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/dsl/MailTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/dsl/MailTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2022 the original author or authors. + * Copyright 2014-2023 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. @@ -129,7 +129,7 @@ public class MailTests { assertThat(message.getFrom()).containsOnly(new InternetAddress("foo@bar")); assertThat(message.getRecipients(RecipientType.TO)).containsOnly(new InternetAddress("bar@baz")); assertThat(message.getSubject()).isEqualTo("foo"); - assertThat(message.getContent()).asString().isEqualTo("foo\r\n"); + assertThat(message.getContent()).asString().isEqualTo("foo"); }