Migrated modules to parent-boot-2 usign spring-boot 2.1:

spring-mvc-forms-thymeleaf
spring-rest
spring-rest-angular
spring-rest-query-language
spring-rest-shell
spring-rest-simple
spring-rest-template
spring-resttemplate
spring-security-mvc-boot
spring-security-openid
spring-security-sso
spring-security-thymeleaf

spring-mvc-forms-thymeleaf/pom.xml

@@ -9,10 +9,10 @@
     <description>spring forms examples using thymeleaf</description>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

spring-rest-angular/pom.xml

@@ -8,10 +8,10 @@
     <packaging>war</packaging>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

spring-rest-angular/src/main/java/org/baeldung/web/main/Application.java

@@ -6,12 +6,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.filter.ShallowEtagHeaderFilter;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @SpringBootApplication
 @EnableAutoConfiguration
 @Import(PersistenceConfig.class)
-public class Application extends WebMvcConfigurerAdapter {
+public class Application implements WebMvcConfigurer {
 
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);

spring-rest-angular/src/test/java/org/baeldung/web/service/StudentServiceIntegrationTest.java

@@ -1,62 +1,66 @@
 package org.baeldung.web.service;
 
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsCollectionContaining.hasItems;
+import static org.hamcrest.core.IsEqual.equalTo;
+
 import org.apache.commons.lang3.RandomStringUtils;
 import org.baeldung.web.main.Application;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.boot.web.server.LocalServerPort;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsCollectionContaining.hasItems;
-import static org.hamcrest.core.IsEqual.equalTo;
-
 @RunWith(SpringRunner.class)
-@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.DEFINED_PORT)
+@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT)
 public class StudentServiceIntegrationTest {
+    
+    @LocalServerPort
+    int port;
 
-    private static final String ENDPOINT = "http://localhost:8080/student/get";
+    private static final String ENDPOINT = "http://localhost:%s/student/get";
 
     @Test
     public void givenRequestForStudents_whenPageIsOne_expectContainsNames() {
-        given().params("page", "0", "size", "2").get(ENDPOINT).then().assertThat()
+        given().params("page", "0", "size", "2").get(String.format(ENDPOINT, port)).then().assertThat()
           .body("content.name", hasItems("Bryan", "Ben"));
     }
 
     @Test
     public void givenRequestForStudents_whenSizeIsTwo_expectTwoItems() {
-        given().params("page", "0", "size", "2").get(ENDPOINT).then().assertThat().body("size", equalTo(2));
+        given().params("page", "0", "size", "2").get(String.format(ENDPOINT, port)).then().assertThat().body("size", equalTo(2));
     }
 
     @Test
     public void givenRequestForStudents_whenSizeIsTwo_expectNumberOfElementsTwo() {
-        given().params("page", "0", "size", "2").get(ENDPOINT).then().assertThat().body("numberOfElements", equalTo(2));
+        given().params("page", "0", "size", "2").get(String.format(ENDPOINT, port)).then().assertThat().body("numberOfElements", equalTo(2));
     }
 
     @Test
     public void givenRequestForStudents_whenResourcesAreRetrievedPaged_thenExpect200() {
-        given().params("page", "0", "size", "2").get(ENDPOINT).then().statusCode(200);
+        given().params("page", "0", "size", "2").get(String.format(ENDPOINT, port)).then().statusCode(200);
     }
 
     @Test
     public void givenRequestForStudents_whenPageOfResourcesAreRetrievedOutOfBounds_thenExpect500() {
-        given().params("page", "1000", "size", "2").get(ENDPOINT).then().statusCode(500);
+        given().params("page", "1000", "size", "2").get(String.format(ENDPOINT, port)).then().statusCode(500);
     }
 
     @Test
     public void givenRequestForStudents_whenPageNotValid_thenExpect500() {
-        given().params("page", RandomStringUtils.randomNumeric(5), "size", "2").get(ENDPOINT).then().statusCode(500);
+        given().params("page", RandomStringUtils.randomNumeric(5), "size", "2").get(String.format(ENDPOINT, port)).then().statusCode(500);
     }
 
     @Test
     public void givenRequestForStudents_whenPageSizeIsFive_expectFiveItems() {
-        given().params("page", "0", "size", "5").get(ENDPOINT).then().body("content.size()", is(5));
+        given().params("page", "0", "size", "5").get(String.format(ENDPOINT, port)).then().body("content.size()", is(5));
     }
 
     @Test
     public void givenResourcesExist_whenFirstPageIsRetrieved_thenPageContainsResources() {
-        given().params("page", "0", "size", "2").get(ENDPOINT).then().assertThat().body("first", equalTo(true));
+        given().params("page", "0", "size", "2").get(String.format(ENDPOINT, port)).then().assertThat().body("first", equalTo(true));
     }
 }

spring-rest-query-language/pom.xml

@@ -7,10 +7,10 @@
     <packaging>war</packaging>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

spring-rest-shell/pom.xml

@@ -8,10 +8,10 @@
     <description>A simple project to demonstrate Spring REST Shell features.</description>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

spring-rest-simple/pom.xml

@@ -8,10 +8,10 @@
     <packaging>war</packaging>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

spring-rest-template/pom.xml

@@ -8,10 +8,10 @@
     <packaging>jar</packaging>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

spring-rest/pom.xml

@@ -7,10 +7,10 @@
     <packaging>war</packaging>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

spring-rest/src/main/java/com/baeldung/resttemplate/lists/client/EmployeeClient.java

@@ -43,7 +43,7 @@ public class EmployeeClient
 
         ResponseEntity<List<Employee>> response =
                 restTemplate.exchange(
-                        "http://localhost:8080/spring-rest/employees/",
+                        "http://localhost:8082/spring-rest/employees/",
                         HttpMethod.GET,
                         null,
                         new ParameterizedTypeReference<List<Employee>>(){});
@@ -61,7 +61,7 @@ public class EmployeeClient
 
         EmployeeList response =
                 restTemplate.getForObject(
-                        "http://localhost:8080/spring-rest/employees/v2",
+                        "http://localhost:8082/spring-rest/employees/v2",
                         EmployeeList.class);
 
         List<Employee> employees = response.getEmployees();
@@ -80,7 +80,7 @@ public class EmployeeClient
         newEmployees.add(new Employee(4, "CEO"));
 
         restTemplate.postForObject(
-                "http://localhost:8080/spring-rest/employees/",
+                "http://localhost:8082/spring-rest/employees/",
                 newEmployees,
                 ResponseEntity.class);
     }
@@ -94,7 +94,7 @@ public class EmployeeClient
         newEmployees.add(new Employee(4, "CEO"));
 
         restTemplate.postForObject(
-                "http://localhost:8080/spring-rest/employees/v2/",
+                "http://localhost:8082/spring-rest/employees/v2/",
                 new EmployeeList(newEmployees),
                 ResponseEntity.class);
     }

spring-rest/src/main/java/com/baeldung/sampleapp/web/controller/advice/JsonpControllerAdvice.java

@@ -1,13 +0,0 @@
-package com.baeldung.sampleapp.web.controller.advice;
-
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.servlet.mvc.method.annotation.AbstractJsonpResponseBodyAdvice;
-
-@ControllerAdvice
-public class JsonpControllerAdvice extends AbstractJsonpResponseBodyAdvice {
-
-    public JsonpControllerAdvice() {
-        super("callback");
-    }
-
-}

spring-rest/src/main/java/com/baeldung/web/upload/app/UploadApplication.java

@@ -9,9 +9,9 @@ import org.springframework.context.annotation.ComponentScan;
 @EnableAutoConfiguration
 @ComponentScan("com.baeldung.web.upload")
 @SpringBootApplication
-public class Application extends SpringBootServletInitializer {
+public class UploadApplication extends SpringBootServletInitializer {
 
     public static void main(final String[] args) {
-        SpringApplication.run(Application.class, args);
+        SpringApplication.run(UploadApplication.class, args);
     }
 }

spring-rest/src/test/java/com/baeldung/SpringContextIntegrationTest.java

@@ -14,7 +14,7 @@ import com.baeldung.web.log.app.Application;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = { CustomApplication.class, ImageApplication.class, PropertyEditorApplication.class,
-		ResponseHeadersApplication.class, Application.class, com.baeldung.web.upload.app.Application.class,
+		ResponseHeadersApplication.class, Application.class, com.baeldung.web.upload.app.UploadApplication.class,
 		MainApplication.class})
 public class SpringContextIntegrationTest {
 

spring-resttemplate/pom.xml

@@ -8,10 +8,10 @@
     <packaging>war</packaging>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

spring-security-mvc-boot/pom.xml

@@ -11,10 +11,10 @@
     <description>Spring Security MVC Boot</description>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
@@ -36,7 +36,7 @@
         </dependency>
         <dependency>
             <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity4</artifactId>
+            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

spring-security-mvc-boot/src/main/resources/templates/private.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"
-      xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity3">
+      xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
 <head>
     <title>Private</title>
 </head>

spring-security-openid/pom.xml

@@ -9,10 +9,10 @@
     <description>Spring OpenID sample project</description>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

spring-security-sso/pom.xml

@@ -9,10 +9,10 @@
     <packaging>pom</packaging>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <modules>
@@ -24,7 +24,7 @@
     <properties>
         <rest-assured.version>3.1.0</rest-assured.version>
         <oauth.version>2.3.3.RELEASE</oauth.version>        
-        <oauth-auto.version>2.0.1.RELEASE</oauth-auto.version>    
+        <oauth-auto.version>2.1.1.RELEASE</oauth-auto.version>    
     </properties>  
         
 </project>

spring-security-sso/spring-security-sso-ui-2/pom.xml

@@ -37,7 +37,7 @@
 
         <dependency>
             <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity4</artifactId>
+            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
         </dependency>
 
     </dependencies>

spring-security-sso/spring-security-sso-ui/pom.xml

@@ -38,7 +38,7 @@
 
         <dependency>
             <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity4</artifactId>
+            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
         </dependency>
 
     </dependencies>

spring-security-thymeleaf/pom.xml

@@ -11,10 +11,10 @@
     <description>Spring Security with Thymeleaf tutorial</description>
 
     <parent>
-        <artifactId>parent-boot-2.0-temp</artifactId>
+        <artifactId>parent-boot-2</artifactId>
         <groupId>com.baeldung</groupId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2.0-temp</relativePath>
+        <relativePath>../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>
@@ -43,7 +43,7 @@
         </dependency>
         <dependency>
             <groupId>org.thymeleaf.extras</groupId>
-            <artifactId>thymeleaf-extras-springsecurity4</artifactId>
+            <artifactId>thymeleaf-extras-springsecurity5</artifactId>
         </dependency>
     </dependencies>