From 06d3213e082e50a79486d1bade34100b74f6c461 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 11 Apr 2019 11:32:38 -0400 Subject: [PATCH] Upgrade dependencies --- build.gradle | 42 +++++++++---------- .../matcher/MockitoMessageMatchersTests.java | 33 +++++++++------ 2 files changed, 41 insertions(+), 34 deletions(-) diff --git a/build.gradle b/build.gradle index 1def8d1a14..07e4351ca2 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { plugins { id 'org.sonarqube' version '2.7' id 'org.asciidoctor.convert' version '1.5.10' - id 'org.ajoberstar.grgit' version '3.0.0' + id 'org.ajoberstar.grgit' version '3.1.1' } description = 'Spring Integration' @@ -89,61 +89,61 @@ subprojects { subproject -> ext { activeMqVersion = '5.15.9' apacheSshdVersion = '2.2.0' - aspectjVersion = '1.9.2' - assertjVersion = '3.12.0' + aspectjVersion = '1.9.3' + assertjVersion = '3.12.2' assertkVersion = '0.13' awaitilityVersion = '3.1.6' boonVersion = '0.34' - commonsDbcp2Version = '2.5.0' + commonsDbcp2Version = '2.6.0' commonsIoVersion = '2.6' commonsNetVersion = '3.6' - curatorVersion = '4.1.0' + curatorVersion = '4.2.0' derbyVersion = '10.14.2.0' ftpServerVersion = '1.1.1' googleJsr305Version = '3.0.2' groovyVersion = '2.5.6' hamcrestVersion = '2.1' - hazelcastVersion = '3.11.1' - hibernateVersion = '5.4.1.Final' + hazelcastVersion = '3.12' + hibernateVersion = '5.4.2.Final' hsqldbVersion = '2.4.1' - h2Version = '1.4.197' + h2Version = '1.4.199' jackson2Version = '2.9.8' javaxActivationVersion = '1.2.0' javaxMailVersion = '1.6.2' jmsApiVersion = '2.0.1' - jpa21ApiVersion = '1.0.0.Final' + jpa21ApiVersion = '1.0.2.Final' jpaApiVersion = '2.2.1' - jrubyVersion = '9.2.6.0' + jrubyVersion = '9.2.7.0' jschVersion = '0.1.55' jsonpathVersion = '2.4.0' junit4Version = '4.12' - junitJupiterVersion = '5.4.0' - junitPlatformVersion = '1.4.0' + junitJupiterVersion = '5.4.1' + junitPlatformVersion = '1.4.1' jythonVersion = '2.7.0' kryoShadedVersion = '4.0.2' lettuceVersion = '5.1.6.RELEASE' log4jVersion = '2.11.2' - micrometerVersion = '1.1.3' - mockitoVersion = '2.24.0' + micrometerVersion = '1.1.4' + mockitoVersion = '2.26.0' mysqlVersion = '8.0.15' pahoMqttClientVersion = '1.2.0' postgresVersion = '42.2.5' - reactorNettyVersion = '0.8.5.RELEASE' - reactorVersion = '3.2.6.RELEASE' - resilience4jVersion = '0.13.2' + reactorNettyVersion = '0.8.6.RELEASE' + reactorVersion = '3.2.8.RELEASE' + resilience4jVersion = '0.14.1' romeToolsVersion = '1.12.0' servletApiVersion = '4.0.1' - smackVersion = '4.3.1' + smackVersion = '4.3.3' springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.2.0.M1' springDataJpaVersion = '2.2.0.M3' springDataMongoVersion = '2.2.0.M3' springDataRedisVersion = '2.2.0.M3' springGemfireVersion = '2.2.0.M3' - springSecurityVersion = '5.2.0.M1' + springSecurityVersion = '5.2.0.BUILD-SNAPSHOT' springRetryVersion = '1.2.4.RELEASE' springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.M1' springWsVersion = '3.0.7.RELEASE' - tomcatVersion = "9.0.16" + tomcatVersion = "9.0.17" xstreamVersion = '1.4.11.1' } @@ -154,7 +154,7 @@ subprojects { subproject -> } jacoco { - toolVersion = "0.8.2" + toolVersion = "0.8.3" } // dependencies that are common across all java projects diff --git a/spring-integration-test-support/src/test/java/org/springframework/integration/test/matcher/MockitoMessageMatchersTests.java b/spring-integration-test-support/src/test/java/org/springframework/integration/test/matcher/MockitoMessageMatchersTests.java index 412ea7f7d1..6a50da35d7 100644 --- a/spring-integration-test-support/src/test/java/org/springframework/integration/test/matcher/MockitoMessageMatchersTests.java +++ b/spring-integration-test-support/src/test/java/org/springframework/integration/test/matcher/MockitoMessageMatchersTests.java @@ -17,6 +17,7 @@ package org.springframework.integration.test.matcher; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -27,7 +28,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.exceptions.verification.junit.ArgumentsAreDifferent; +import org.mockito.exceptions.verification.opentest4j.ArgumentsAreDifferent; import org.mockito.junit.MockitoJUnitRunner; import org.springframework.messaging.Message; @@ -39,6 +40,7 @@ import org.springframework.messaging.support.MessageBuilder; * @author Alex Peters * @author Iwein Fuld * @author Gunnar Hillert + * @author Artem Bilan * */ @RunWith(MockitoJUnitRunner.Silent.class) @@ -60,37 +62,42 @@ public class MockitoMessageMatchersTests { @Before public void setUp() { - message = MessageBuilder.withPayload(SOME_PAYLOAD).setHeader(SOME_HEADER_KEY, - SOME_HEADER_VALUE).build(); + this.message = + MessageBuilder.withPayload(SOME_PAYLOAD) + .setHeader(SOME_HEADER_KEY, SOME_HEADER_VALUE) + .build(); } @Test public void anyMatcher_withVerifyArgumentMatcherAndEqualPayload_matching() { - handler.handleMessage(message); - verify(handler).handleMessage(MockitoMessageMatchers.messageWithPayload(SOME_PAYLOAD)); - verify(handler) + this.handler.handleMessage(this.message); + verify(this.handler).handleMessage(MockitoMessageMatchers.messageWithPayload(SOME_PAYLOAD)); + verify(this.handler) .handleMessage(MockitoMessageMatchers.messageWithPayload(Matchers.is(Matchers.instanceOf(Date.class)))); } - @Test(expected = ArgumentsAreDifferent.class) + @Test public void anyMatcher_withVerifyAndDifferentPayload_notMatching() { - handler.handleMessage(message); - verify(handler).handleMessage(MockitoMessageMatchers.messageWithPayload(Matchers.nullValue())); + this.handler.handleMessage(this.message); + assertThatExceptionOfType(ArgumentsAreDifferent.class) + .isThrownBy(() -> + verify(this.handler) + .handleMessage(MockitoMessageMatchers.messageWithPayload(Matchers.nullValue()))); } @Test public void anyMatcher_withWhenArgumentMatcherAndEqualPayload_matching() { - when(channel.send(MockitoMessageMatchers.messageWithPayload(SOME_PAYLOAD))).thenReturn(true); - assertThat(channel.send(message)).isTrue(); + when(this.channel.send(MockitoMessageMatchers.messageWithPayload(SOME_PAYLOAD))).thenReturn(true); + assertThat(channel.send(this.message)).isTrue(); } @Test public void anyMatcher_withWhenAndDifferentPayload_notMatching() { - when(channel.send( + when(this.channel.send( MockitoMessageMatchers.messageWithHeaderEntry(SOME_HEADER_KEY, Matchers.is(Matchers.instanceOf(Short.class))))) .thenReturn(true); - assertThat(channel.send(message)).isFalse(); + assertThat(this.channel.send(this.message)).isFalse(); } }