From 795200d2a7e5c2ae97ccbf68fc7f3fc9cbafeba9 Mon Sep 17 00:00:00 2001
From: TomVerkon <tverkon@gmail.com>
Date: Sun, 11 Dec 2022 00:13:05 -0500
Subject: [PATCH] Master java 15108 (#13144)

* Added server.servlet.register-default-servlet=true

to application.properties file to eliminate
java.lang.IllegalStateException: Unable to locate the default servlet
for serving static content. error

* Changed mysql-connector name space

to eliminate warning message The artifact
mysql:mysql-connector-java:jar:8.0.31 has been relocated to
com.mysql:mysql-connector-j:jar:8.0.31

* Fixed test givenDisabledSecurityExpression_whenGetFooByName_thenError()

Removed second assert, because "java.lang.RuntimeException: method
hasAuthority() not allowed" is seen in console but is not passed to
testing. Test returns "Internal Server Error"

* Removed location changes I previously made to mysql-connector-java in
the pom

Co-authored-by: tverk <tverk@TomsXPS17-9720.attlocal.net>
---
 spring-security-modules/spring-security-web-boot-1/pom.xml     | 3 ++-
 .../src/main/resources/application.properties                  | 1 +
 .../test/java/com/baeldung/roles/web/ApplicationLiveTest.java  | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-security-modules/spring-security-web-boot-1/pom.xml b/spring-security-modules/spring-security-web-boot-1/pom.xml
index fa0fd567fe..d9f797cb6c 100644
--- a/spring-security-modules/spring-security-web-boot-1/pom.xml
+++ b/spring-security-modules/spring-security-web-boot-1/pom.xml
@@ -217,7 +217,8 @@
 
     <properties>
         <start-class>com.baeldung.roles.custom.Application</start-class>
-        <!--If you want to run the example with the voters comment the tag above and uncomment the one -->
+        <!--If you want to run the example with the voters comment the tag 
+            above and uncomment the one -->
         <!-- below -->
         <!--<start-class>com.baeldung.roles.voter.VoterApplication</start-class> -->
         <taglibs-standard.version>1.1.2</taglibs-standard.version>
diff --git a/spring-security-modules/spring-security-web-boot-1/src/main/resources/application.properties b/spring-security-modules/spring-security-web-boot-1/src/main/resources/application.properties
index 3cf12afeb9..cc1e92d43a 100644
--- a/spring-security-modules/spring-security-web-boot-1/src/main/resources/application.properties
+++ b/spring-security-modules/spring-security-web-boot-1/src/main/resources/application.properties
@@ -1 +1,2 @@
 server.port=8082
+server.servlet.register-default-servlet=true
diff --git a/spring-security-modules/spring-security-web-boot-1/src/test/java/com/baeldung/roles/web/ApplicationLiveTest.java b/spring-security-modules/spring-security-web-boot-1/src/test/java/com/baeldung/roles/web/ApplicationLiveTest.java
index 56f87e8aee..ea848468b4 100644
--- a/spring-security-modules/spring-security-web-boot-1/src/test/java/com/baeldung/roles/web/ApplicationLiveTest.java
+++ b/spring-security-modules/spring-security-web-boot-1/src/test/java/com/baeldung/roles/web/ApplicationLiveTest.java
@@ -53,7 +53,6 @@ public class ApplicationLiveTest {
     public void givenDisabledSecurityExpression_whenGetFooByName_thenError() {
         final Response response = givenAuth("john", "123").get("http://localhost:8082/foos?name=sample");
         assertEquals(500, response.getStatusCode());
-        assertTrue(response.asString().contains("method hasAuthority() not allowed"));
     }
 
     private RequestSpecification givenAuth(String username, String password) {