Merge pull request #11592 from eugenp/JAVA-8794

JAVA-8794: Upgrade to Spring Boot 2.6.1

spring-web-modules/spring-mvc-basics-5/src/main/resources/application.properties

@@ -1 +1,3 @@
 server.servlet.context-path=/spring-mvc-basics
+
+spring.mvc.pathmatch.matching-strategy=ant-path-matcher

spring-web-modules/spring-mvc-basics/src/main/resources/application.properties

@@ -1,7 +1,8 @@
 server.servlet.context-path=/spring-mvc-basics
 
 ### Content Negotiation (already defined programatically)
-spring.mvc.pathmatch.use-suffix-pattern=true
 #spring.mvc.contentnegotiation.favor-path-extension=true
 #spring.mvc.contentnegotiation.favor-parameter=true
 #spring.mvc.contentnegotiation.parameter-name=mediaType
+spring.mvc.pathmatch.use-suffix-pattern=true
+spring.mvc.pathmatch.matching-strategy=ant-path-matcher

spring-web-modules/spring-resttemplate/pom.xml

@@ -108,11 +108,6 @@
             <version>${com.squareup.okhttp3.version}</version>
         </dependency>
         <!-- test scoped -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>