Merge pull request #181 from Spring-Framework-Java-Apps/master

deployment

Author: thomaswoehlke

etc/TODO.md

@@ -90,3 +90,5 @@ Fixed #122, Fixed #123, Fixed #127, Fixed #130, Fixed #152, Fixed #153, Fixed #1
 
 Fixed #129 
 Fixed #126
+
+https://developer.okta.com/blog/2019/03/28/test-java-spring-boot-junit5

pom.xml

@@ -379,6 +379,10 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
             <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>org.junit.vintage</groupId>
                     <artifactId>junit-vintage-engine</artifactId>
@@ -861,6 +865,17 @@
                         </systemPropertyVariables>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <configuration>
+                        <skipTests>${skipTests}</skipTests>
+                        <systemPropertyVariables>
+                            <spring.profiles.active>default</spring.profiles.active>
+                            <skipIntegrationTests>${skipTests}</skipIntegrationTests>
+                        </systemPropertyVariables>
+                    </configuration>
+                </plugin>
             </plugins>
         </build>
     </profile>

run.sh

@@ -7,7 +7,7 @@ function runDev() {
 }
 
 function runTest() {
-    ./mvnw -B -DskipTests=false  clean dependency:list install --file pom.xml
+    ./mvnw -B -DskipTests=false clean dependency:list install --file pom.xml
 }
 
 function runGithubTestBuild() {
@@ -19,10 +19,14 @@ function setupHeroku() {
     heroku ps -a simpleworklist
 }
 
-function buildLikeHeroku() {
+function buildLikeHerokuWithSite() {
    ./mvnw -DskipTests clean dependency:list install site site:deploy
 }
 
+function buildLikeHeroku() {
+   ./mvnw -DskipTests clean dependency:list install
+}
+
 function runHerokuLocal() {
     buildLikeHeroku
     heroku ps -a simpleworklist
@@ -33,10 +37,10 @@ function runHerokuLocal() {
 function main() {
     #runGithubTestBuild
     #setupHeroku
-    buildLikeHeroku
+    #buildLikeHeroku
     #runHerokuLocal
     #runDev
-    #runTest
+    runTest
 }
 
 main