From 2e1a289efb8865130807c6a0c7afc35652499c95 Mon Sep 17 00:00:00 2001
From: Rossen Stoyanchev <rstoyanchev@pivotal.io>
Date: Tue, 28 Apr 2020 08:01:41 +0100
Subject: [PATCH] Upgrade Gradle 5.6 -> 5.6.4 and propdeps plugin

---
 build.gradle                                          |  3 +--
 gradle/wrapper/gradle-wrapper.properties              |  2 +-
 .../webflow/test/SearchFlowExecutionTests.java        | 11 +++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 780fecf1..1a3dcd36 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
 		maven { url "https://repo.spring.io/plugins-release" }
 	}
 	dependencies {
-		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
+		classpath("io.spring.gradle:propdeps-plugin:0.0.9.RELEASE")
 		classpath("io.spring.gradle:spring-io-plugin:0.0.8.RELEASE")
 		classpath("org.asciidoctor:asciidoctor-gradle-plugin:1.5.9.2")
 		classpath "org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16"
@@ -412,5 +412,4 @@ configure(rootProject) {
 		archives schemaZip
 		archives distZip
 	}
-
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ef9a9e05..5028f28f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/spring-webflow/src/test/java/org/springframework/webflow/test/SearchFlowExecutionTests.java b/spring-webflow/src/test/java/org/springframework/webflow/test/SearchFlowExecutionTests.java
index 0eb461de..9913d7d3 100644
--- a/spring-webflow/src/test/java/org/springframework/webflow/test/SearchFlowExecutionTests.java
+++ b/spring-webflow/src/test/java/org/springframework/webflow/test/SearchFlowExecutionTests.java
@@ -15,12 +15,11 @@
  */
 package org.springframework.webflow.test;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
+
 import org.springframework.webflow.config.FlowDefinitionResource;
 import org.springframework.webflow.config.FlowDefinitionResourceFactory;
 import org.springframework.webflow.context.ExternalContext;
@@ -38,14 +37,14 @@ public class SearchFlowExecutionTests extends AbstractXmlFlowExecutionTests {
 		return resourceFactory.createClassPathResource("search-flow.xml", getClass());
 	}
 
-	@Test
+	@Test
 	public void testStartFlow() {
 		ExternalContext context = new MockExternalContext();
 		startFlow(null, context);
 		assertCurrentStateEquals("enterCriteria");
 	}
 
-	@Test
+	@Test
 	public void testCriteriaSubmitSuccess() {
 		startFlow(null, new MockExternalContext());
 		MockExternalContext context = new MockExternalContext();
@@ -57,7 +56,7 @@ public class SearchFlowExecutionTests extends AbstractXmlFlowExecutionTests {
 		assertResponseWrittenEquals("searchResults", context);
 	}
 
-	@Test
+	@Test
 	public void testNewSearch() {
 		startFlow(null, new MockExternalContext());
 		MockExternalContext context = new MockExternalContext();
@@ -73,7 +72,7 @@ public class SearchFlowExecutionTests extends AbstractXmlFlowExecutionTests {
 		assertResponseWrittenEquals("searchCriteria", context);
 	}
 
-	@Test
+	@Test
 	public void testSelectValidResult() {
 		startFlow(null, new MockExternalContext());
 		MockExternalContext context = new MockExternalContext();