JAVA-5875: Upgrade Spring Boot to 2.5.1 (#10956)
* JAVA-5875: Upgrade Spring Boot to 2.5.1 * JAVA-5875: Leave jta module on Spring Boot 2.4.7 * JAVA-5875: Update spring-boot-persistence-mongodb to use embedded Mongo 3.0 * JAVA-5875: Leave spring-data-dynamodb on Spring Boot 2.4.7 * JAVA-5875: ErrorController#getErrorPath has been removed * JAVA-5875: Fix SQL Script DataSource Initialization * JAVA-5875: ErrorController#getErrorPath has been removed * JAVA-5875: Fix RepositoryRestConfigurer * JAVA-5875: Fix issues caused by rest-assured upgrade * JAVA-5875: Upgrade spring-cloud-dependencies to 2020.0.3 * JAVA-5875: Leave spring-boot-keycloak on Spring Boot 2.4.7 * JAVA-5875: Fix data.sql script initialization * JAVA-5875: Leave spring-security-legacy-oidc on Spring Boot 2.4.7 * JAVA-5875: Fix data.sql script initialization * JAVA-5875: Fix data.sql script initialization * JAVA-5875: Update de.flapdoodle.embed.mongo dependency * JAVA-5875: Upgrade spring-cloud-dependencies to 2020.0.3 * JAVA-5875: Update Spring Cloud dependencies * JAVA-5875: Update cloud dependencies * JAVA-5875: Defer datasource initialization * JAVA-5875: Fix rest assured version * JAVA-5875: Fix Spring Batch serialization issue * JAVA-5875: Update Spring Cloud Stream version * JAVA-5875: Update Spring Kafka version * JAVA-5875: Leave spring-zuul-rate-limiting on Spring Boot 2.4.7 Co-authored-by: Krzysztof Woyke <krzysztof.woyke.sp@lhsystems.com>
This commit is contained in:
@@ -126,11 +126,6 @@
|
||||
<groupId>org.apache.httpcomponents</groupId>
|
||||
<artifactId>httpclient</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.codehaus.groovy</groupId>
|
||||
<artifactId>groovy-all</artifactId>
|
||||
<version>${groovy.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.tomakehurst</groupId>
|
||||
<artifactId>wiremock</artifactId>
|
||||
@@ -180,7 +175,6 @@
|
||||
<joda-time.version>2.9.6</joda-time.version>
|
||||
<msg-simple.version>1.1</msg-simple.version>
|
||||
<btf.version>1.2</btf.version>
|
||||
<groovy.version>2.4.7</groovy.version>
|
||||
<wiremock.version>2.4.1</wiremock.version>
|
||||
<scribejava.version>2.5.3</scribejava.version>
|
||||
</properties>
|
||||
|
||||
@@ -25,7 +25,7 @@ public class BasicPreemtiveAuthenticationLiveTest {
|
||||
get(SVC_URL).then()
|
||||
.assertThat()
|
||||
.statusCode(HttpStatus.OK.value())
|
||||
.content(containsString("<form"), containsString("action=\"login\""));
|
||||
.body(containsString("<form"), containsString("action=\"login\""));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -37,7 +37,7 @@ public class BasicPreemtiveAuthenticationLiveTest {
|
||||
.then()
|
||||
.assertThat()
|
||||
.statusCode(HttpStatus.OK.value())
|
||||
.content(containsString("<form"), containsString("action=\"login\""));
|
||||
.body(containsString("<form"), containsString("action=\"login\""));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -35,6 +35,6 @@ public class DigestAuthenticationLiveTest {
|
||||
.then()
|
||||
.assertThat()
|
||||
.statusCode(HttpStatus.OK.value())
|
||||
.content(containsString("This is the body of the sample view"));
|
||||
.body(containsString("This is the body of the sample view"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ public class FormAuthenticationLiveTest {
|
||||
get(SVC_URL).then()
|
||||
.assertThat()
|
||||
.statusCode(HttpStatus.OK.value())
|
||||
.content(containsString("<form"), containsString("action=\"perform_login\""));
|
||||
.body(containsString("<form"), containsString("action=\"perform_login\""));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -40,7 +40,7 @@ public class FormAuthenticationLiveTest {
|
||||
.then()
|
||||
.assertThat()
|
||||
.statusCode(HttpStatus.OK.value())
|
||||
.content(containsString("<form"), containsString("action=\"perform_login\""));
|
||||
.body(containsString("<form"), containsString("action=\"perform_login\""));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -52,6 +52,6 @@ public class FormAuthenticationLiveTest {
|
||||
.then()
|
||||
.assertThat()
|
||||
.statusCode(HttpStatus.OK.value())
|
||||
.content(isEmptyString());
|
||||
.body(isEmptyString());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ public class FormAutoconfAuthenticationLiveTest {
|
||||
get(SVC_URL).then()
|
||||
.assertThat()
|
||||
.statusCode(HttpStatus.OK.value())
|
||||
.content(containsString("<form"), containsString("action=\"login\""));
|
||||
.body(containsString("<form"), containsString("action=\"login\""));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user