Upgrade Gradle; move to SNAPSHOTs

basic/barrier/src/main/java/org/springframework/integration/samples/barrier/Application.java

@@ -34,7 +34,7 @@ import org.springframework.context.annotation.ImportResource;
 @ImportResource("/META-INF/spring/integration/server-context.xml")
 public class Application {
 
-	public static void main(String[] args) throws Exception {
+	public static void main(String[] args) {
 		ConfigurableApplicationContext server = SpringApplication.run(Application.class, args);
 
 		runClient(args);

basic/barrier/src/main/java/org/springframework/integration/samples/barrier2/ErrorHandlingApplication.java

@@ -32,7 +32,7 @@ import org.springframework.context.annotation.ImportResource;
 @ImportResource("/META-INF/spring/integration/errorhandling-context.xml")
 public class ErrorHandlingApplication {
 
-	public static void main(String[] args) throws Exception {
+	public static void main(String[] args) {
 		ConfigurableApplicationContext test = new SpringApplicationBuilder(ErrorHandlingApplication.class)
 				.web(WebApplicationType.NONE)
 				.run(args);

basic/barrier/src/test/java/org/springframework/integration/samples/barrier/ApplicationTests.java

@@ -20,8 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.Collections;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -30,13 +29,13 @@ import org.springframework.integration.channel.QueueChannel;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.support.GenericMessage;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Gary Russell
+ * @author Artem Bilan
+ *
  * @since 4.2
  */
-@RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = Application.class)
 public class ApplicationTests {
 
@@ -47,7 +46,7 @@ public class ApplicationTests {
 	AbstractMessageChannel release;
 
 	@Test
-	public void contextLoads() throws InterruptedException {
+	public void contextLoads() {
 		QueueChannel replies = new QueueChannel();
 		receiveChannel.send(
 				new GenericMessage<>("A,B,C", Collections.singletonMap(MessageHeaders.REPLY_CHANNEL, replies)));

build.gradle

@@ -210,12 +210,12 @@ subprojects { subproject ->
 			postgresVersion = '42.2.9'
 			subethasmtpVersion = '1.2'
 			slf4jVersion = '1.7.25'
-			springCloudVersion ='2020.0.0-M2'
-			springIntegrationVersion = '5.4.0-M1'
+			springCloudVersion ='2020.0.0-SNAPSHOT'
+			springIntegrationVersion = '5.4.0-SNAPSHOT'
 			springIntegrationSocialTwiterVersion = '1.0.1.BUILD-SNAPSHOT'
 			springIntegrationSplunkVersion = '1.2.0.BUILD-SNAPSHOT'
-			springVersion = '5.3.0-M1'
-			springSecurityVersion = '5.4.0-M1'
+			springVersion = '5.3.0-SNAPSHOT'
+			springSecurityVersion = '5.4.0-SNAPSHOT'
 			springWebFlowVersion = '2.3.3.RELEASE'
 			testcontainersVersion = '1.13.0'
 			tilesJspVersion = '2.2.1'

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

gradlew.bat

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%