From 6ce495e427ac98a8cce2c23af306775566a96c34 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 21 Sep 2017 15:46:21 -0400 Subject: [PATCH] Upgrade to Mockito-2.10.0 and appropriate fixes --- advanced/advanced-testing-examples/pom.xml | 6 ++--- .../advance/testing/jms/JmsMockTests.java | 24 +++++++++---------- advanced/dynamic-ftp/pom.xml | 6 ++--- advanced/dynamic-tcp-client/pom.xml | 6 ++--- applications/cafe-scripted/pom.xml | 6 ++--- applications/cafe/cafe-amqp/pom.xml | 6 ++--- applications/cafe/cafe-jms/pom.xml | 10 ++++---- applications/cafe/cafe-si/pom.xml | 6 ++--- applications/file-split-ftp/pom.xml | 6 ++--- .../samples/filesplit/ApplicationTests.java | 4 ++-- applications/loan-broker/pom.xml | 6 ++--- applications/loanshark/pom.xml | 6 ++--- applications/stomp-chat/pom.xml | 6 ++--- basic/amqp/pom.xml | 6 ++--- basic/barrier/pom.xml | 6 ++--- basic/control-bus/pom.xml | 6 ++--- basic/enricher/pom.xml | 6 ++--- basic/feed/pom.xml | 6 ++--- basic/file/pom.xml | 6 ++--- basic/ftp/pom.xml | 6 ++--- basic/helloworld/pom.xml | 6 ++--- basic/http/pom.xml | 6 ++--- basic/jdbc/pom.xml | 6 ++--- basic/jms/pom.xml | 10 ++++---- basic/jmx/pom.xml | 6 ++--- basic/jpa/pom.xml | 6 ++--- basic/kafka/pom.xml | 10 ++++---- basic/mail/pom.xml | 6 ++--- basic/mongodb/pom.xml | 6 ++--- basic/mqtt/pom.xml | 6 ++--- basic/oddeven/pom.xml | 6 ++--- basic/quote/pom.xml | 6 ++--- basic/sftp/pom.xml | 6 ++--- basic/splunk/pom.xml | 6 ++--- basic/tcp-amqp/pom.xml | 6 ++--- basic/tcp-client-server/pom.xml | 6 ++--- basic/testing-examples/pom.xml | 6 ++--- basic/twitter/pom.xml | 6 ++--- basic/web-sockets/pom.xml | 6 ++--- basic/ws-inbound-gateway/pom.xml | 6 ++--- basic/ws-outbound-gateway/pom.xml | 6 ++--- basic/xml/pom.xml | 6 ++--- basic/xmpp/pom.xml | 6 ++--- build.gradle | 7 ++---- dsl/cafe-dsl/pom.xml | 6 ++--- dsl/kafka-dsl/pom.xml | 8 +++---- dsl/pom.xml | 6 ++--- dsl/si4demo/pom.xml | 6 ++--- intermediate/async-gateway/pom.xml | 6 ++--- intermediate/dynamic-poller/pom.xml | 6 ++--- intermediate/errorhandling/pom.xml | 6 ++--- intermediate/file-processing/pom.xml | 6 ++--- intermediate/mail-attachments/pom.xml | 6 ++--- intermediate/monitoring/pom.xml | 6 ++--- intermediate/multipart-http/pom.xml | 6 ++--- intermediate/rest-http/pom.xml | 10 ++++---- .../samples/rest/RestHttpClientTest.java | 4 ++-- intermediate/retry-and-more/pom.xml | 6 ++--- .../splitter-aggregator-reaper/pom.xml | 6 ++--- intermediate/stored-procedures-derby/pom.xml | 6 ++--- intermediate/stored-procedures-ms/pom.xml | 6 ++--- intermediate/stored-procedures-oracle/pom.xml | 6 ++--- .../stored-procedures-postgresql/pom.xml | 6 ++--- .../tcp-client-server-multiplex/pom.xml | 6 ++--- intermediate/travel/pom.xml | 6 ++--- intermediate/tx-synch/pom.xml | 6 ++--- 66 files changed, 213 insertions(+), 216 deletions(-) diff --git a/advanced/advanced-testing-examples/pom.xml b/advanced/advanced-testing-examples/pom.xml index d63b2bed..e0823f92 100644 --- a/advanced/advanced-testing-examples/pom.xml +++ b/advanced/advanced-testing-examples/pom.xml @@ -129,7 +129,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -171,14 +171,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom 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 41790b38..b1ba356d 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 @@ -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() { - - @Override - public String answer(InvocationOnMock invocation) throws Throwable { - return testMessageHolder.get(); - } - - }); + willAnswer((Answer) invocation -> testMessageHolder.get()) + .given(message).getText(); } /** diff --git a/advanced/dynamic-ftp/pom.xml b/advanced/dynamic-ftp/pom.xml index e0887e2f..a68850b6 100644 --- a/advanced/dynamic-ftp/pom.xml +++ b/advanced/dynamic-ftp/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/advanced/dynamic-tcp-client/pom.xml b/advanced/dynamic-tcp-client/pom.xml index c036e561..0951bfc5 100644 --- a/advanced/dynamic-tcp-client/pom.xml +++ b/advanced/dynamic-tcp-client/pom.xml @@ -110,7 +110,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -171,14 +171,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/applications/cafe-scripted/pom.xml b/applications/cafe-scripted/pom.xml index 63b5d066..3b6374b4 100644 --- a/applications/cafe-scripted/pom.xml +++ b/applications/cafe-scripted/pom.xml @@ -175,7 +175,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -217,14 +217,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/applications/cafe/cafe-amqp/pom.xml b/applications/cafe/cafe-amqp/pom.xml index 26597d0c..50ae3f8e 100644 --- a/applications/cafe/cafe-amqp/pom.xml +++ b/applications/cafe/cafe-amqp/pom.xml @@ -118,7 +118,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -160,14 +160,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/applications/cafe/cafe-jms/pom.xml b/applications/cafe/cafe-jms/pom.xml index f3bd655b..7187445b 100644 --- a/applications/cafe/cafe-jms/pom.xml +++ b/applications/cafe/cafe-jms/pom.xml @@ -67,7 +67,7 @@ org.apache.activemq activemq-broker - 5.13.4 + 5.15.0 compile @@ -79,7 +79,7 @@ org.apache.activemq activemq-kahadb-store - 5.13.4 + 5.15.0 compile @@ -158,7 +158,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -200,14 +200,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/applications/cafe/cafe-si/pom.xml b/applications/cafe/cafe-si/pom.xml index 9dcbf82e..8d697a59 100644 --- a/applications/cafe/cafe-si/pom.xml +++ b/applications/cafe/cafe-si/pom.xml @@ -118,7 +118,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -160,14 +160,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/applications/file-split-ftp/pom.xml b/applications/file-split-ftp/pom.xml index ad95b3d0..3326c369 100644 --- a/applications/file-split-ftp/pom.xml +++ b/applications/file-split-ftp/pom.xml @@ -167,7 +167,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -239,14 +239,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java b/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java index 3b3b49d0..1e7f57d8 100644 --- a/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java +++ b/applications/file-split-ftp/src/test/java/org/springframework/integration/samples/filesplit/ApplicationTests.java @@ -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; diff --git a/applications/loan-broker/pom.xml b/applications/loan-broker/pom.xml index c402d94d..c5d00079 100644 --- a/applications/loan-broker/pom.xml +++ b/applications/loan-broker/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/applications/loanshark/pom.xml b/applications/loanshark/pom.xml index 89bbc43f..cce17884 100644 --- a/applications/loanshark/pom.xml +++ b/applications/loanshark/pom.xml @@ -591,7 +591,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -648,14 +648,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/applications/stomp-chat/pom.xml b/applications/stomp-chat/pom.xml index 541c03bf..b97f3cea 100644 --- a/applications/stomp-chat/pom.xml +++ b/applications/stomp-chat/pom.xml @@ -132,7 +132,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -193,14 +193,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/amqp/pom.xml b/basic/amqp/pom.xml index 9b1ad36f..27518baa 100644 --- a/basic/amqp/pom.xml +++ b/basic/amqp/pom.xml @@ -129,7 +129,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -171,14 +171,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/barrier/pom.xml b/basic/barrier/pom.xml index a9df13e9..65c2358d 100644 --- a/basic/barrier/pom.xml +++ b/basic/barrier/pom.xml @@ -143,7 +143,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -204,14 +204,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/control-bus/pom.xml b/basic/control-bus/pom.xml index 23bd4e05..b8409b1c 100644 --- a/basic/control-bus/pom.xml +++ b/basic/control-bus/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/enricher/pom.xml b/basic/enricher/pom.xml index ccb490e8..187c6758 100644 --- a/basic/enricher/pom.xml +++ b/basic/enricher/pom.xml @@ -118,7 +118,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -160,14 +160,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/feed/pom.xml b/basic/feed/pom.xml index 36754137..35d7d45b 100644 --- a/basic/feed/pom.xml +++ b/basic/feed/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/file/pom.xml b/basic/file/pom.xml index 3c950a7d..c46de86a 100644 --- a/basic/file/pom.xml +++ b/basic/file/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/ftp/pom.xml b/basic/ftp/pom.xml index e4c050ee..761ad58a 100644 --- a/basic/ftp/pom.xml +++ b/basic/ftp/pom.xml @@ -142,7 +142,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -207,14 +207,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/helloworld/pom.xml b/basic/helloworld/pom.xml index be1d3245..dd545c90 100644 --- a/basic/helloworld/pom.xml +++ b/basic/helloworld/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/http/pom.xml b/basic/http/pom.xml index c05ada4a..4e8a1c94 100644 --- a/basic/http/pom.xml +++ b/basic/http/pom.xml @@ -240,7 +240,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -297,14 +297,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/jdbc/pom.xml b/basic/jdbc/pom.xml index 98c7f4db..c3737e20 100644 --- a/basic/jdbc/pom.xml +++ b/basic/jdbc/pom.xml @@ -118,7 +118,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -160,14 +160,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/jms/pom.xml b/basic/jms/pom.xml index d7f17bf1..671e4285 100644 --- a/basic/jms/pom.xml +++ b/basic/jms/pom.xml @@ -89,7 +89,7 @@ org.apache.activemq activemq-broker - 5.13.4 + 5.15.0 compile @@ -101,7 +101,7 @@ org.apache.activemq activemq-kahadb-store - 5.13.4 + 5.15.0 compile @@ -157,7 +157,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -210,14 +210,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/jmx/pom.xml b/basic/jmx/pom.xml index 6412136b..eceb278a 100644 --- a/basic/jmx/pom.xml +++ b/basic/jmx/pom.xml @@ -117,7 +117,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -159,14 +159,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/jpa/pom.xml b/basic/jpa/pom.xml index 2e5e58f4..5f7a5ee1 100644 --- a/basic/jpa/pom.xml +++ b/basic/jpa/pom.xml @@ -181,7 +181,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -242,14 +242,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/kafka/pom.xml b/basic/kafka/pom.xml index c2fefec5..cbc978ce 100644 --- a/basic/kafka/pom.xml +++ b/basic/kafka/pom.xml @@ -71,7 +71,7 @@ org.springframework.integration spring-integration-kafka - 3.0.0.M1 + 3.0.0.M2 compile @@ -98,7 +98,7 @@ org.springframework.kafka spring-kafka - 2.0.0.M3 + 2.0.0.RC1 compile @@ -150,7 +150,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -211,14 +211,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/mail/pom.xml b/basic/mail/pom.xml index bb5a82fb..3fdd2b9d 100644 --- a/basic/mail/pom.xml +++ b/basic/mail/pom.xml @@ -141,7 +141,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -183,14 +183,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/mongodb/pom.xml b/basic/mongodb/pom.xml index 4780fbc0..da1ba629 100644 --- a/basic/mongodb/pom.xml +++ b/basic/mongodb/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/mqtt/pom.xml b/basic/mqtt/pom.xml index 4c013817..8bd452c7 100644 --- a/basic/mqtt/pom.xml +++ b/basic/mqtt/pom.xml @@ -121,7 +121,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -171,14 +171,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/oddeven/pom.xml b/basic/oddeven/pom.xml index e2a6e2e3..81d46a13 100644 --- a/basic/oddeven/pom.xml +++ b/basic/oddeven/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/quote/pom.xml b/basic/quote/pom.xml index 0ee2c16f..614b09f7 100644 --- a/basic/quote/pom.xml +++ b/basic/quote/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/sftp/pom.xml b/basic/sftp/pom.xml index 41d5d515..172d5c84 100644 --- a/basic/sftp/pom.xml +++ b/basic/sftp/pom.xml @@ -118,7 +118,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -160,14 +160,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/splunk/pom.xml b/basic/splunk/pom.xml index a5488c23..5d8fcc07 100644 --- a/basic/splunk/pom.xml +++ b/basic/splunk/pom.xml @@ -122,7 +122,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -183,14 +183,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/tcp-amqp/pom.xml b/basic/tcp-amqp/pom.xml index abf3f66b..d83578ce 100644 --- a/basic/tcp-amqp/pom.xml +++ b/basic/tcp-amqp/pom.xml @@ -141,7 +141,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -183,14 +183,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/tcp-client-server/pom.xml b/basic/tcp-client-server/pom.xml index f00167b3..0a57e852 100644 --- a/basic/tcp-client-server/pom.xml +++ b/basic/tcp-client-server/pom.xml @@ -129,7 +129,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -171,14 +171,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/testing-examples/pom.xml b/basic/testing-examples/pom.xml index 18b8f49f..ed4bbc07 100644 --- a/basic/testing-examples/pom.xml +++ b/basic/testing-examples/pom.xml @@ -139,7 +139,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -192,14 +192,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/twitter/pom.xml b/basic/twitter/pom.xml index f32f8c75..6b7585c6 100644 --- a/basic/twitter/pom.xml +++ b/basic/twitter/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/web-sockets/pom.xml b/basic/web-sockets/pom.xml index 8dac35bf..521c752d 100644 --- a/basic/web-sockets/pom.xml +++ b/basic/web-sockets/pom.xml @@ -110,7 +110,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -171,14 +171,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/ws-inbound-gateway/pom.xml b/basic/ws-inbound-gateway/pom.xml index 8b2fa15f..4d6b5379 100644 --- a/basic/ws-inbound-gateway/pom.xml +++ b/basic/ws-inbound-gateway/pom.xml @@ -160,7 +160,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -217,14 +217,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/ws-outbound-gateway/pom.xml b/basic/ws-outbound-gateway/pom.xml index 509dba31..9da85fa3 100644 --- a/basic/ws-outbound-gateway/pom.xml +++ b/basic/ws-outbound-gateway/pom.xml @@ -117,7 +117,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -159,14 +159,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/xml/pom.xml b/basic/xml/pom.xml index fc97b777..fc8fb357 100644 --- a/basic/xml/pom.xml +++ b/basic/xml/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/basic/xmpp/pom.xml b/basic/xmpp/pom.xml index 6bf95a85..4fa335f3 100644 --- a/basic/xmpp/pom.xml +++ b/basic/xmpp/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/build.gradle b/build.gradle index 4451c7d3..af6a76a2 100644 --- a/build.gradle +++ b/build.gradle @@ -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' }*/ diff --git a/dsl/cafe-dsl/pom.xml b/dsl/cafe-dsl/pom.xml index 860b6c8b..4985c58b 100644 --- a/dsl/cafe-dsl/pom.xml +++ b/dsl/cafe-dsl/pom.xml @@ -134,7 +134,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -195,14 +195,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/dsl/kafka-dsl/pom.xml b/dsl/kafka-dsl/pom.xml index b86bbe4d..87f833cc 100644 --- a/dsl/kafka-dsl/pom.xml +++ b/dsl/kafka-dsl/pom.xml @@ -82,7 +82,7 @@ org.springframework.integration spring-integration-kafka - 3.0.0.M1 + 3.0.0.M2 compile @@ -134,7 +134,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -195,14 +195,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/dsl/pom.xml b/dsl/pom.xml index 1b7a4dd3..5dcca5e7 100644 --- a/dsl/pom.xml +++ b/dsl/pom.xml @@ -81,7 +81,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -123,14 +123,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/dsl/si4demo/pom.xml b/dsl/si4demo/pom.xml index 50ac539d..9c358479 100644 --- a/dsl/si4demo/pom.xml +++ b/dsl/si4demo/pom.xml @@ -190,7 +190,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -251,14 +251,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/async-gateway/pom.xml b/intermediate/async-gateway/pom.xml index ff7b5e6c..d4f5b7f0 100644 --- a/intermediate/async-gateway/pom.xml +++ b/intermediate/async-gateway/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/dynamic-poller/pom.xml b/intermediate/dynamic-poller/pom.xml index 6770f3cd..65e7cb51 100644 --- a/intermediate/dynamic-poller/pom.xml +++ b/intermediate/dynamic-poller/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/errorhandling/pom.xml b/intermediate/errorhandling/pom.xml index be8fea22..563cfbd0 100644 --- a/intermediate/errorhandling/pom.xml +++ b/intermediate/errorhandling/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/file-processing/pom.xml b/intermediate/file-processing/pom.xml index 19ca8143..2ba4f1ef 100644 --- a/intermediate/file-processing/pom.xml +++ b/intermediate/file-processing/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/mail-attachments/pom.xml b/intermediate/mail-attachments/pom.xml index b235e581..736a0bf0 100644 --- a/intermediate/mail-attachments/pom.xml +++ b/intermediate/mail-attachments/pom.xml @@ -153,7 +153,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -218,14 +218,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/monitoring/pom.xml b/intermediate/monitoring/pom.xml index a081f036..bb240dd4 100644 --- a/intermediate/monitoring/pom.xml +++ b/intermediate/monitoring/pom.xml @@ -199,7 +199,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -256,14 +256,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/multipart-http/pom.xml b/intermediate/multipart-http/pom.xml index c670317c..90a18c5f 100644 --- a/intermediate/multipart-http/pom.xml +++ b/intermediate/multipart-http/pom.xml @@ -201,7 +201,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -258,14 +258,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/rest-http/pom.xml b/intermediate/rest-http/pom.xml index 6f82dcdc..e92adbe4 100644 --- a/intermediate/rest-http/pom.xml +++ b/intermediate/rest-http/pom.xml @@ -208,7 +208,7 @@ org.springframework.security spring-security-web - 4.2.2.RELEASE + 5.0.0.M4 compile @@ -228,7 +228,7 @@ org.springframework.security spring-security-config - 4.2.2.RELEASE + 5.0.0.M4 compile @@ -316,7 +316,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -373,14 +373,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java b/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java index 3bf164df..a4d6853a 100644 --- a/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java +++ b/intermediate/rest-http/src/test/java/org/springframework/integration/samples/rest/RestHttpClientTest.java @@ -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); diff --git a/intermediate/retry-and-more/pom.xml b/intermediate/retry-and-more/pom.xml index da636dd3..214787b9 100644 --- a/intermediate/retry-and-more/pom.xml +++ b/intermediate/retry-and-more/pom.xml @@ -99,7 +99,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 compile @@ -181,14 +181,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/splitter-aggregator-reaper/pom.xml b/intermediate/splitter-aggregator-reaper/pom.xml index 1d9bafb9..332032b7 100644 --- a/intermediate/splitter-aggregator-reaper/pom.xml +++ b/intermediate/splitter-aggregator-reaper/pom.xml @@ -118,7 +118,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -160,14 +160,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/stored-procedures-derby/pom.xml b/intermediate/stored-procedures-derby/pom.xml index cfd5659c..89322699 100644 --- a/intermediate/stored-procedures-derby/pom.xml +++ b/intermediate/stored-procedures-derby/pom.xml @@ -118,7 +118,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -160,14 +160,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/stored-procedures-ms/pom.xml b/intermediate/stored-procedures-ms/pom.xml index db45cd64..13288904 100644 --- a/intermediate/stored-procedures-ms/pom.xml +++ b/intermediate/stored-procedures-ms/pom.xml @@ -130,7 +130,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -172,14 +172,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/stored-procedures-oracle/pom.xml b/intermediate/stored-procedures-oracle/pom.xml index ef09a596..22b9140f 100644 --- a/intermediate/stored-procedures-oracle/pom.xml +++ b/intermediate/stored-procedures-oracle/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -148,14 +148,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/stored-procedures-postgresql/pom.xml b/intermediate/stored-procedures-postgresql/pom.xml index 7a4b1c63..4d31d067 100644 --- a/intermediate/stored-procedures-postgresql/pom.xml +++ b/intermediate/stored-procedures-postgresql/pom.xml @@ -142,7 +142,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -184,14 +184,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/tcp-client-server-multiplex/pom.xml b/intermediate/tcp-client-server-multiplex/pom.xml index 6a5274cc..6926c1f6 100644 --- a/intermediate/tcp-client-server-multiplex/pom.xml +++ b/intermediate/tcp-client-server-multiplex/pom.xml @@ -106,7 +106,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -159,14 +159,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/travel/pom.xml b/intermediate/travel/pom.xml index 0871bb6f..1ebb0efa 100644 --- a/intermediate/travel/pom.xml +++ b/intermediate/travel/pom.xml @@ -128,7 +128,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -170,14 +170,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom diff --git a/intermediate/tx-synch/pom.xml b/intermediate/tx-synch/pom.xml index a6ad6748..07706b6e 100644 --- a/intermediate/tx-synch/pom.xml +++ b/intermediate/tx-synch/pom.xml @@ -129,7 +129,7 @@ org.mockito mockito-core - 1.10.19 + 2.10.0 test @@ -171,14 +171,14 @@ org.springframework.integration spring-integration-bom - 5.0.0.M6 + 5.0.0.M7 import pom org.springframework spring-framework-bom - 5.0.0.RC3 + 5.0.0.RC4 import pom