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

Upgrade to Mockito-2.10.0 and appropriate fixes

Browse Source
This commit is contained in:
Artem Bilan
2017-09-21 15:46:21 -04:00
parent e8fc589c5d
commit 6ce495e427
66 changed files with 213 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
advanced/advanced-testing-examples/pom.xml
View File

@@ -129,7 +129,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

24
advanced/advanced-testing-examples/src/test/java/org/springframework/integration/samples/advance/testing/jms/JmsMockTests.java
View File

@@ -18,8 +18,11 @@ package org.springframework.integration.samples.advance.testing.jms;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.BDDMockito.given;
import static org.mockito.Matchers.anyString;
import static org.mockito.BDDMockito.willAnswer;
import static org.mockito.BDDMockito.willReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -93,19 +96,16 @@ public class JmsMockTests {
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);
willReturn(new SimpleMessageConverter())
.given(this.mockJmsTemplate).getMessageConverter();
willReturn(message)
.given(this.mockJmsTemplate).receiveSelected(isNull());
given(message.getText())
.willAnswer(new Answer<String>() {
@Override
public String answer(InvocationOnMock invocation) throws Throwable {
return testMessageHolder.get();
}
});
willAnswer((Answer<String>) invocation -> testMessageHolder.get())
.given(message).getText();
}
/**

6
advanced/dynamic-ftp/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
advanced/dynamic-tcp-client/pom.xml
View File

@@ -110,7 +110,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
applications/cafe-scripted/pom.xml
View File

@@ -175,7 +175,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -217,14 +217,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
applications/cafe/cafe-amqp/pom.xml
View File

@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
applications/cafe/cafe-jms/pom.xml
View File

@@ -67,7 +67,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.13.4</version>
<version>5.15.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
<version>5.13.4</version>
<version>5.15.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -158,7 +158,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -200,14 +200,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
applications/cafe/cafe-si/pom.xml
View File

@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
applications/file-split-ftp/pom.xml
View File

@@ -167,7 +167,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -239,14 +239,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java
View File

@@ -17,10 +17,10 @@
package org.springframework.integration.samples.filesplit;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.BDDMockito.given;
import static org.mockito.BDDMockito.willThrow;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;

6
applications/loan-broker/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
applications/loanshark/pom.xml
View File

@@ -591,7 +591,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -648,14 +648,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
applications/stomp-chat/pom.xml
View File

@@ -132,7 +132,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -193,14 +193,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/amqp/pom.xml
View File

@@ -129,7 +129,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/barrier/pom.xml
View File

@@ -143,7 +143,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -204,14 +204,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/control-bus/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/enricher/pom.xml
View File

@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/feed/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/file/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/ftp/pom.xml
View File

@@ -142,7 +142,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -207,14 +207,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/helloworld/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/http/pom.xml
View File

@@ -240,7 +240,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -297,14 +297,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/jdbc/pom.xml
View File

@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
basic/jms/pom.xml
View File

@@ -89,7 +89,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-broker</artifactId>
<version>5.13.4</version>
<version>5.15.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-kahadb-store</artifactId>
<version>5.13.4</version>
<version>5.15.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -157,7 +157,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -210,14 +210,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/jmx/pom.xml
View File

@@ -117,7 +117,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -159,14 +159,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/jpa/pom.xml
View File

@@ -181,7 +181,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -242,14 +242,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
basic/kafka/pom.xml
View File

@@ -71,7 +71,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-kafka</artifactId>
<version>3.0.0.M1</version>
<version>3.0.0.M2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
<version>2.0.0.M3</version>
<version>2.0.0.RC1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -211,14 +211,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/mail/pom.xml
View File

@@ -141,7 +141,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -183,14 +183,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/mongodb/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/mqtt/pom.xml
View File

@@ -121,7 +121,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/oddeven/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/quote/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/sftp/pom.xml
View File

@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/splunk/pom.xml
View File

@@ -122,7 +122,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -183,14 +183,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/tcp-amqp/pom.xml
View File

@@ -141,7 +141,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -183,14 +183,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/tcp-client-server/pom.xml
View File

@@ -129,7 +129,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/testing-examples/pom.xml
View File

@@ -139,7 +139,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -192,14 +192,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/twitter/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/web-sockets/pom.xml
View File

@@ -110,7 +110,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/ws-inbound-gateway/pom.xml
View File

@@ -160,7 +160,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -217,14 +217,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/ws-outbound-gateway/pom.xml
View File

@@ -117,7 +117,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -159,14 +159,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/xml/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
basic/xmpp/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

7
build.gradle
View File

@@ -205,7 +205,7 @@ subprojects { subproject ->
junitVersion = '4.12'
jythonVersion = '2.5.3'
log4jVersion = '2.7'
mockitoVersion = '1.10.19'
mockitoVersion = '2.10.0'
openJpaVersion = '2.4.0'
oracleDriverVersion = '11.2.0.3'
postgresVersion = '42.0.0'
@@ -250,7 +250,7 @@ subprojects { subproject ->
}
// enable all compiler warnings; individual projects may customize further
ext.xLintArg = '-Xlint:all,-options'
ext.xLintArg = '-Xlint:all,-options,-processing'
[compileJava, compileTestJava]*.options*.compilerArgs = [xLintArg]
jacocoTestReport {
@@ -800,9 +800,6 @@ project('jpa') {
testCompile 'org.springframework.boot:spring-boot-starter-test'
}
//Suppress openjpa annotation processor warnings
compileTestJava.options.compilerArgs = ["${xLintArg},-processing"]
/* bootRun {
main = 'org.springframework.integration.samples.jpa.Main'
}*/

6
dsl/cafe-dsl/pom.xml
View File

@@ -134,7 +134,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -195,14 +195,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

8
dsl/kafka-dsl/pom.xml
View File

@@ -82,7 +82,7 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-kafka</artifactId>
<version>3.0.0.M1</version>
<version>3.0.0.M2</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -134,7 +134,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -195,14 +195,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
dsl/pom.xml
View File

@@ -81,7 +81,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -123,14 +123,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
dsl/si4demo/pom.xml
View File

@@ -190,7 +190,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -251,14 +251,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/async-gateway/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/dynamic-poller/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/errorhandling/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/file-processing/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/mail-attachments/pom.xml
View File

@@ -153,7 +153,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -218,14 +218,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/monitoring/pom.xml
View File

@@ -199,7 +199,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -256,14 +256,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/multipart-http/pom.xml
View File

@@ -201,7 +201,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -258,14 +258,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

10
intermediate/rest-http/pom.xml
View File

@@ -208,7 +208,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-web</artifactId>
<version>4.2.2.RELEASE</version>
<version>5.0.0.M4</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -228,7 +228,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-config</artifactId>
<version>4.2.2.RELEASE</version>
<version>5.0.0.M4</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -316,7 +316,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -373,14 +373,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

4
intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java
View File

@@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.StringWriter;
import java.util.Base64;
import java.util.HashMap;
import java.util.Map;
@@ -40,7 +41,6 @@ import org.springframework.http.ResponseEntity;
import org.springframework.http.client.ClientHttpRequest;
import org.springframework.integration.samples.rest.domain.EmployeeList;
import org.springframework.oxm.jaxb.Jaxb2Marshaller;
import org.springframework.security.crypto.codec.Base64;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.client.HttpMessageConverterExtractor;
@@ -141,7 +141,7 @@ public class RestHttpClientTest {
String password = "spring";
String combinedUsernamePassword = username+":"+password;
byte[] base64Token = Base64.encode(combinedUsernamePassword.getBytes());
byte[] base64Token = Base64.getEncoder().encode(combinedUsernamePassword.getBytes());
String base64EncodedToken = new String (base64Token);
//adding Authorization header for HTTP Basic authentication
headers.add("Authorization","Basic "+base64EncodedToken);

6
intermediate/retry-and-more/pom.xml
View File

@@ -99,7 +99,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
@@ -181,14 +181,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/splitter-aggregator-reaper/pom.xml
View File

@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/stored-procedures-derby/pom.xml
View File

@@ -118,7 +118,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -160,14 +160,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/stored-procedures-ms/pom.xml
View File

@@ -130,7 +130,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -172,14 +172,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/stored-procedures-oracle/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -148,14 +148,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/stored-procedures-postgresql/pom.xml
View File

@@ -142,7 +142,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -184,14 +184,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/tcp-client-server-multiplex/pom.xml
View File

@@ -106,7 +106,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -159,14 +159,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/travel/pom.xml
View File

@@ -128,7 +128,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -170,14 +170,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>

6
intermediate/tx-synch/pom.xml
View File

@@ -129,7 +129,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.10.19</version>
<version>2.10.0</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -171,14 +171,14 @@
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-bom</artifactId>
<version>5.0.0.M6</version>
<version>5.0.0.M7</version>
<scope>import</scope>
<type>pom</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.0.0.RC3</version>
<version>5.0.0.RC4</version>
<scope>import</scope>
<type>pom</type>
</dependency>