From 7fe68986816b16b18ec29d1b9992287e40e2b438 Mon Sep 17 00:00:00 2001
From: JenniferAbouJaoudi
 <43418483+JenniferAbouJaoudi@users.noreply.github.com>
Date: Fri, 13 Mar 2020 16:31:25 -0400
Subject: [PATCH 1/5] Added Jenkinsfile

---
 Jenkinsfile | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index aa8bd283e..4fa8c17eb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,10 +1,29 @@
 pipeline {
-    agent any
-    stages {
-        stage('Build') {
-            steps {
-                sh './mvnw package' 
-            }
-        }
+  agent any
+  stages {
+    stage('Build') {
+      steps {
+        sh './mvnw package'
+      }
     }
-}
+
+    stage('Test') {
+      steps {
+        sh 'mvn test'
+      }
+    }
+
+    stage('Package') {
+      steps {
+        sh 'mvn package'
+      }
+    }
+
+    stage('Deploy') {
+      steps {
+        sh 'when { branch \'master\'}'
+      }
+    }
+
+  }
+}
\ No newline at end of file

From 62cee9a3c85ad6b7559b40b1ed0cce88be727e95 Mon Sep 17 00:00:00 2001
From: JenniferAbouJaoudi
 <43418483+JenniferAbouJaoudi@users.noreply.github.com>
Date: Fri, 13 Mar 2020 16:40:14 -0400
Subject: [PATCH 2/5] Added Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4fa8c17eb..73a687dfc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,7 @@ pipeline {
 
     stage('Deploy') {
       steps {
-        sh 'when { branch \'master\'}'
+        sh 'when { branch master}'
       }
     }
 

From dd16c1e6e249ea484c2e9a7a8a9a3eb3cfb61d9d Mon Sep 17 00:00:00 2001
From: JenniferAbouJaoudi
 <43418483+JenniferAbouJaoudi@users.noreply.github.com>
Date: Fri, 13 Mar 2020 16:50:08 -0400
Subject: [PATCH 3/5] Added Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 73a687dfc..4fa8c17eb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,7 @@ pipeline {
 
     stage('Deploy') {
       steps {
-        sh 'when { branch master}'
+        sh 'when { branch \'master\'}'
       }
     }
 

From 2890fb57fc03917feec4d95f473d1002e0330e69 Mon Sep 17 00:00:00 2001
From: JenniferAbouJaoudi
 <43418483+JenniferAbouJaoudi@users.noreply.github.com>
Date: Fri, 13 Mar 2020 16:53:29 -0400
Subject: [PATCH 4/5] Update Jenkinsfile

---
 Jenkinsfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4fa8c17eb..326002b71 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -20,10 +20,12 @@ pipeline {
     }
 
     stage('Deploy') {
+      when {
+      branch 'master'}
       steps {
-        sh 'when { branch \'master\'}'
+        sh 'do-non-master.sh'
       }
     }
 
   }
-}
\ No newline at end of file
+}

From 3cec742a13176c412049dbb43e65699cdb4b7b23 Mon Sep 17 00:00:00 2001
From: JenniferAbouJaoudi
 <43418483+JenniferAbouJaoudi@users.noreply.github.com>
Date: Fri, 13 Mar 2020 20:17:55 -0400
Subject: [PATCH 5/5] Added Jenkinsfile

---
 Jenkinsfile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 326002b71..f610a3a21 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,11 +21,12 @@ pipeline {
 
     stage('Deploy') {
       when {
-      branch 'master'}
+        branch 'master'
+      }
       steps {
-        sh 'do-non-master.sh'
+        sh 'mvn deploy'
       }
     }
 
   }
-}
+}
\ No newline at end of file