diff --git a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java index 63ed056e..5bd459c5 100644 --- a/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java +++ b/advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java @@ -35,6 +35,7 @@ import org.apache.log4j.Logger; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -89,6 +90,7 @@ public class JmsMockTests { @Before public void setup() throws JMSException { + Mockito.reset(this.mockJmsTemplate); TextMessage message = mock(TextMessage.class); when(this.mockJmsTemplate.getMessageConverter()).thenReturn(new SimpleMessageConverter()); when(this.mockJmsTemplate.receiveSelected(anyString())).thenReturn(message); diff --git a/build.gradle b/build.gradle index 1c452900..19245df4 100644 --- a/build.gradle +++ b/build.gradle @@ -217,8 +217,8 @@ subprojects { subproject -> springIntegrationVersion = '5.0.0.BUILD-SNAPSHOT' springIntegrationKafkaVersion = '3.0.0.M1' springIntegrationSplunkVersion = '1.1.0.RELEASE' - springKafkaVersion = '2.0.0.M1' - springVersion = '5.0.0.BUILD-SNAPSHOT' + springKafkaVersion = '2.0.0.M2' + springVersion = '5.0.0.RC1' springSecurityVersion = '4.2.2.RELEASE' springWebFlowVersion = '2.3.3.RELEASE' tilesJspVersion = '2.2.1'