diff --git a/build.gradle b/build.gradle index e9c06b16d2..9bedfd624a 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ plugins { 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.31.4' apply false + id 'com.jfrog.artifactory' version '4.31.9' 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' @@ -65,15 +65,15 @@ ext { ftpServerVersion = '1.2.0' graalvmVersion = '22.3.1' greenmailVersion = '2.0.0' - groovyVersion = '4.0.10' + groovyVersion = '4.0.11' hamcrestVersion = '2.2' - hazelcastVersion = '5.2.2' + hazelcastVersion = '5.2.3' hibernateVersion = '6.1.7.Final' hsqldbVersion = '2.7.1' h2Version = '2.1.214' jacksonVersion = '2.14.2' jaxbVersion = '4.0.2' - jcifsVersion = '2.1.33' + jcifsVersion = '2.1.34' jeroMqVersion = '0.5.3' jmsApiVersion = '3.1.0' jpaApiVersion = '3.1.0' @@ -84,31 +84,31 @@ ext { jythonVersion = '2.7.3' kotlinCoroutinesVersion = '1.6.4' kryoVersion = '5.3.0' - lettuceVersion = '6.2.3.RELEASE' + lettuceVersion = '6.2.4.RELEASE' log4jVersion = '2.19.0' mailVersion = '1.0.0' - micrometerTracingVersion = '1.0.3' - micrometerVersion = '1.10.5' + micrometerTracingVersion = '1.0.4' + micrometerVersion = '1.10.6' mockitoVersion = '4.10.0' mongoDriverVersion = '4.8.2' mysqlVersion = '8.0.32' pahoMqttClientVersion = '1.2.5' postgresVersion = '42.5.4' r2dbch2Version = '1.0.0.RELEASE' - reactorVersion = '2022.0.5' + reactorVersion = '2022.0.6' resilience4jVersion = '1.7.1' romeToolsVersion = '1.18.0' rsocketVersion = '1.1.3' servletApiVersion = '6.0.0' smackVersion = '4.4.6' - springAmqpVersion = '3.0.3' - springDataVersion = '2022.0.4' + springAmqpVersion = '3.0.4' + springDataVersion = '2022.0.5' springGraphqlVersion = '1.1.3' - springKafkaVersion = '3.0.5' + springKafkaVersion = '3.0.6' springRetryVersion = '2.0.1' - springSecurityVersion = '6.0.2' - springVersion = '6.0.7' - springWsVersion = '4.0.1' + springSecurityVersion = '6.0.3' + springVersion = '6.0.8' + springWsVersion = '4.0.3' testcontainersVersion = '1.17.6' tomcatVersion = '10.1.7' xmlUnitVersion = '2.9.1' diff --git a/gradle/docs.gradle b/gradle/docs.gradle index 6884e9979f..864d20a16a 100644 --- a/gradle/docs.gradle +++ b/gradle/docs.gradle @@ -1,6 +1,6 @@ ext { - backendVersion = '0.0.3' - micrometerDocsVersion='1.0.0' + backendVersion = '0.0.5' + micrometerDocsVersion='1.0.1' } configurations { diff --git a/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionFactoryWithCIFSContextTests.java b/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionFactoryWithCIFSContextTests.java index a0f91747d6..80af20b325 100644 --- a/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionFactoryWithCIFSContextTests.java +++ b/spring-integration-smb/src/test/java/org/springframework/integration/smb/session/SmbSessionFactoryWithCIFSContextTests.java @@ -23,6 +23,7 @@ import java.io.OutputStream; import jcifs.CIFSContext; import jcifs.context.SingletonContext; import jcifs.smb.SmbFile; +import jcifs.util.Strings; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -88,10 +89,9 @@ public class SmbSessionFactoryWithCIFSContextTests extends AbstractBaseTests { class TestSmbSessionFactory extends SmbSessionFactory { - private CIFSContext context; + private final CIFSContext context; protected TestSmbSessionFactory(CIFSContext _context) { - assertThat(_context).as("CIFSContext object is null.").isNotNull(); this.context = _context; } @@ -101,7 +101,8 @@ public class SmbSessionFactoryWithCIFSContextTests extends AbstractBaseTests { // test for a constructor with a CIFSContext SmbShare smbShare = new SmbShare(this, this.context); assertThat(smbShare).as("SmbShare object is null.").isNotNull(); - assertThat(smbShare.toString()).isEqualTo("smb://sambaguest:sambaguest@localhost:445/smb-share/"); + assertThat(smbShare.toString()) + .isEqualTo(Strings.maskSecretValue("smb://sambaguest:sambaguest@localhost:445/smb-share/")); // the rest has been copied from SmbSendingMessageHandlerTests when(smbSession.remove(Mockito.anyString())).thenReturn(true);