Merge pull request #309 from Spring-Framework-Java-Apps/2_3_29_SNAPSHOT

2 3 29 snapshot

Author: thomaswoehlke

pom.xml

@@ -10,14 +10,14 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.7.RELEASE</version>
+        <version>2.4.1</version>
     </parent>
 
     <scm>
         <connection>scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git</connection>
         <developerConnection>scm:git:git@github.com:Spring-Framework-Java-Apps/simpleworklist.git</developerConnection>
         <url>https://github.com/Spring-Framework-Java-Apps/simpleworklist/tree/${project.scm.tag}</url>
-        <tag>branch-2.3-MVC</tag>
+        <tag>master</tag>
     </scm>
 
     <name>simpleworklist</name>
@@ -115,13 +115,15 @@
 
         <!-- Spring Boot and Spring Frameworks -->
         <spring-boot-maven-plugin.version>${project.parent.version}</spring-boot-maven-plugin.version>
-        <spring-data-releasetrain.version>Neumann-SR6</spring-data-releasetrain.version>
-        <spring-session-bom.version>Dragonfruit-SR1</spring-session-bom.version>
+        <!--
+        <spring-data-releasetrain.version>2020.0.2</spring-data-releasetrain.version>
+        <spring-session-bom.version>2020.0.1</spring-session-bom.version>
+        -->
 
         <!-- Unit and Integration Testing -->
         <xmlunit.version>2.6.4</xmlunit.version>
         <xmlunit2.version>2.7.0</xmlunit2.version>
-        <htmlunit.version>2.43.0</htmlunit.version>
+        <htmlunit.version>2.45.0</htmlunit.version>
         <hamcrest.version>2.2</hamcrest.version>
         <jsoup.version>1.13.1</jsoup.version>
         <skipTests>true</skipTests>

src/main/resources/application.yml

@@ -84,12 +84,12 @@ org:
         strengthBCryptPasswordEncoder: 10
 ---
 spring:
-  profiles: default
+  profile: default
   datasource:
     url: jdbc:postgresql://localdbhost:5432/simpleworklist
 ---
 spring:
-  profiles: developing
+  profile: developing
   datasource:
     url: jdbc:postgresql://localdbhost:5432/simpleworklist_developing
   jpa:
@@ -98,7 +98,7 @@ spring:
       #ddl-auto: create-drop
 ---
 spring:
-  profiles: travis
+  profile: travis
   datasource:
     url: jdbc:postgresql://localdbhost:5432/simpleworklist_travis
     continue-on-error: true
@@ -112,7 +112,7 @@ server:
     enabled: false
 ---
 spring:
-  profiles: testing
+  profile: testing
   datasource:
     url: jdbc:postgresql://localdbhost:5432/simpleworklist_testing
   jpa:
@@ -147,7 +147,7 @@ logging:
               impl: DEBUG
 ---
 spring:
-  profiles: qa
+  profile: qa
   datasource:
     url: jdbc:postgresql://localdbhost:5432/simpleworklist_qa
     continue-on-error: true
@@ -183,7 +183,7 @@ logging:
             impl: DEBUG
 ---
 spring:
-  profiles: heroku
+  profile: heroku
   datasource:
     url: jdbc:postgresql://localdbhost:5432/simpleworklist_heroku
     continue-on-error: true