From c111877e5d8ba6963c822e187a820ce4f1c9c753 Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Wed, 8 May 2019 16:04:31 -0700
Subject: [PATCH 01/15] commented out agent

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 691468166..7a63d36c1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,11 +5,13 @@ pipeline {
   stages {
 
     stage('Test') {
+      /*
       agent {
         node {
           label 'tester'
         }
       }
+      */
       steps {
         sh 'mvn test'
       }

From a20db52cca985e26fdbbbf1fb3da3068e45d5de3 Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Wed, 8 May 2019 16:07:23 -0700
Subject: [PATCH 02/15] removed all slaves

---
 Jenkinsfile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7a63d36c1..89663277a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
 #!/bin/env groovy
 pipeline {
-  agent none
+  agent any 
 
   stages {
 
@@ -17,24 +17,30 @@ pipeline {
       }
     }
     stage('Deploy to Artifactory') {
+      /*
       agent  {
         node {
           label 'tester'
         }
       }
+      */
       steps {
-        sh ''
+       // sh ''
+	echo 'NOT YET IMPLEMENTED'
       }
     }
 
     stage('Deploy to QA') {
+      /*
       agent {
         node {
           label 'tester'
         }
       }
+      */
       steps {
-        sh ''
+        //sh ''
+	echo 'NOT YET IMPLEMENTED'
       }
     }
   }

From 02fd19e324a05d9a328e59130dc86f14b3c1a570 Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Wed, 8 May 2019 17:08:47 -0700
Subject: [PATCH 03/15] Add artifactory distribution to pom

---
 pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index 31725653e..805331570 100644
--- a/pom.xml
+++ b/pom.xml
@@ -420,6 +420,12 @@
     </reporting>
 
     <distributionManagement>
+        <snapshotRepository>
+          <id>snapshots</id>
+          <name>localhost.localdomain-snapshots</name>
+          <url>http://192.168.0.49:8081/artifactory/libs-snapshot-local</url>
+        </snapshotRepository>
+	<!--
         <snapshotRepository>
             <id>snapshots</id>
             <url>http://nexus:8081/nexus/content/repositories/snapshots</url>
@@ -428,6 +434,7 @@
             <id>releases</id>
             <url>http://nexus:8081/nexus/content/repositories/releases</url>
         </repository>
+	-->
     </distributionManagement>
 
     <url>demopetclinic</url>

From bf68821935f46c9cf5e016b5ebb063899374aa1b Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Wed, 8 May 2019 20:43:19 -0700
Subject: [PATCH 04/15] change ip of artifactory server

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 805331570..7c948708d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -423,7 +423,7 @@
         <snapshotRepository>
           <id>snapshots</id>
           <name>localhost.localdomain-snapshots</name>
-          <url>http://192.168.0.49:8081/artifactory/libs-snapshot-local</url>
+          <url>http://10.0.0.97:8081/artifactory/libs-snapshot-local</url>
         </snapshotRepository>
 	<!--
         <snapshotRepository>

From 637293a3e390252da5012ae4b8241c9c8e5ba79f Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Wed, 8 May 2019 20:50:54 -0700
Subject: [PATCH 05/15] added Deploy Step to JenkinsFile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 89663277a..767cdf9a5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
       }
       */
       steps {
-        sh 'mvn test'
+        sh 'mvn deploy'
       }
     }
     stage('Deploy to Artifactory') {

From 01e89ae070f67de9091139c4a2aafcad740fc019 Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Wed, 8 May 2019 23:40:09 -0700
Subject: [PATCH 06/15] Added slave back for mvn deploy

---
 Jenkinsfile | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 767cdf9a5..f3efedfc7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,18 +4,6 @@ pipeline {
 
   stages {
 
-    stage('Test') {
-      /*
-      agent {
-        node {
-          label 'tester'
-        }
-      }
-      */
-      steps {
-        sh 'mvn deploy'
-      }
-    }
     stage('Deploy to Artifactory') {
       /*
       agent  {
@@ -26,7 +14,7 @@ pipeline {
       */
       steps {
        // sh ''
-	echo 'NOT YET IMPLEMENTED'
+        sh 'mvn deploy'
       }
     }
 

From 8469b1f2818040f67bb967d46ac8bb9bf2fc19fb Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Wed, 8 May 2019 23:45:18 -0700
Subject: [PATCH 07/15] uncommented slave node

---
 Jenkinsfile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f3efedfc7..d2378dc80 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -5,13 +5,11 @@ pipeline {
   stages {
 
     stage('Deploy to Artifactory') {
-      /*
       agent  {
         node {
           label 'tester'
         }
       }
-      */
       steps {
        // sh ''
         sh 'mvn deploy'

From 3b911bd9e563e2a453d3824bd2b8e45a3eebb613 Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Wed, 8 May 2019 23:51:16 -0700
Subject: [PATCH 08/15] changed any to none in jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index d2378dc80..80c1e0676 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
 #!/bin/env groovy
 pipeline {
-  agent any 
+  agent none 
 
   stages {
 

From 86983ed558f22551ef293e1c37be2044986825be Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Thu, 9 May 2019 11:29:11 -0700
Subject: [PATCH 09/15] changed ip in pom

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7c948708d..805331570 100644
--- a/pom.xml
+++ b/pom.xml
@@ -423,7 +423,7 @@
         <snapshotRepository>
           <id>snapshots</id>
           <name>localhost.localdomain-snapshots</name>
-          <url>http://10.0.0.97:8081/artifactory/libs-snapshot-local</url>
+          <url>http://192.168.0.49:8081/artifactory/libs-snapshot-local</url>
         </snapshotRepository>
 	<!--
         <snapshotRepository>

From 8638a7c8db457de0cd54f99caa59bcd81d503b50 Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Thu, 9 May 2019 11:52:10 -0700
Subject: [PATCH 10/15] pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 805331570..769b1ed66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -423,7 +423,7 @@
         <snapshotRepository>
           <id>snapshots</id>
           <name>localhost.localdomain-snapshots</name>
-          <url>http://192.168.0.49:8081/artifactory/libs-snapshot-local</url>
+          <url>http://192.168.0.18:8081/artifactory/libs-snapshot-local</url>
         </snapshotRepository>
 	<!--
         <snapshotRepository>

From 20410638605d2315e16b2cc2a0fcb29fde541461 Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Thu, 9 May 2019 12:31:02 -0700
Subject: [PATCH 11/15] Testing ssh to tomcat server

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 80c1e0676..3e2aa5a0d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,16 +17,14 @@ pipeline {
     }
 
     stage('Deploy to QA') {
-      /*
       agent {
         node {
           label 'tester'
         }
       }
-      */
       steps {
-        //sh ''
-	echo 'NOT YET IMPLEMENTED'
+        sh 'ssh -p 2223 vagrant@192.168.0.18'
+        sh 'sudo systemctl status tomcat'
       }
     }
   }

From ae19cced5fe6e7f3e8bb524d9bcd8e79ebcba340 Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Thu, 9 May 2019 12:45:43 -0700
Subject: [PATCH 12/15] testing scp and ssh

---
 Jenkinsfile | 4 ++--
 test.sh     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 test.sh

diff --git a/Jenkinsfile b/Jenkinsfile
index 3e2aa5a0d..3b857dd56 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,8 +23,8 @@ pipeline {
         }
       }
       steps {
-        sh 'ssh -p 2223 vagrant@192.168.0.18'
-        sh 'sudo systemctl status tomcat'
+        sh 'scp -P 2223 -r test.sh vagrant@192.168.0.18:/home/vagrant/.'
+        sh 'ssh -p 2223 vagrant@192.168.0.18 < test.sh'
       }
     }
   }
diff --git a/test.sh b/test.sh
new file mode 100644
index 000000000..1cd42a7bf
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo 'TESTING JF' >> jfile.txt

From 9731ff7a678caaab4295cba48bd6db8c1b2d68c3 Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Thu, 9 May 2019 13:22:40 -0700
Subject: [PATCH 13/15] Added script to deploy to tomcat

---
 Jenkinsfile |  4 ++--
 script.sh   | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 script.sh

diff --git a/Jenkinsfile b/Jenkinsfile
index 3b857dd56..cb4a50378 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -23,8 +23,8 @@ pipeline {
         }
       }
       steps {
-        sh 'scp -P 2223 -r test.sh vagrant@192.168.0.18:/home/vagrant/.'
-        sh 'ssh -p 2223 vagrant@192.168.0.18 < test.sh'
+        sh 'scp -P 2223 -r script.sh vagrant@192.168.0.18:/home/vagrant/.'
+        sh 'ssh -p 2223 vagrant@192.168.0.18 < script.sh'
       }
     }
   }
diff --git a/script.sh b/script.sh
new file mode 100644
index 000000000..c29f01c30
--- /dev/null
+++ b/script.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+wget http://192.168.0.18:8081/artifactory/libs-snapshot-local/org/springframework/samples/spring-petclinic/maven-metadata.xml
+VERSION=$(cat maven-metadata.xml | grep -m 1 -oP '(?<=<version>).*(?=</version>)')
+rm -f maven-metadata.xml
+wget http://192.168.0.18:8081/artifactory/libs-snapshot-local/org/springframework/samples/spring-petclinic/$VERSION/maven-metadata.xml
+ 
+AID=$(cat maven-metadata.xml | grep -m 1 -oP '(?<=<artifactId>).*(?=</artifactId>)')
+VALUE=$(cat maven-metadata.xml | grep -m 1 -oP '(?<=<value>).*(?=</value>)')
+echo $AID-$VALUE.war > version
+#echo "curl \"http://192.168.0.56:8081/repository/maven-snapshots/org/springframework/samples/spring-petclinic/$VERSION/" > command
+
+echo "curl \"http://192.168.0.18:8081/artifactory/libs-snapshot-local/org/springframework/samples/spring-petclinic/$VERSION/" > command
+
+paste -d '' command version > firsthalf
+echo "\" -o /usr/share/tomcat/webapps/petclinic.war" > secondhalf
+paste -d '' firsthalf secondhalf > fullcmd
+chmod 755 fullcmd
+./fullcmd
+service tomcat restart
+#rm -f command firsthalf fullcmd maven-metadata.xml secondhalf version
+rm -f command firsthalf maven-metadata.xml secondhalf version

From 0f96483a3a5b789c80474c38ee3db7d5edcfb0c0 Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Thu, 9 May 2019 13:25:03 -0700
Subject: [PATCH 14/15] added sudo to script

---
 script.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/script.sh b/script.sh
index c29f01c30..9833c9285 100644
--- a/script.sh
+++ b/script.sh
@@ -15,8 +15,8 @@ echo "curl \"http://192.168.0.18:8081/artifactory/libs-snapshot-local/org/spring
 paste -d '' command version > firsthalf
 echo "\" -o /usr/share/tomcat/webapps/petclinic.war" > secondhalf
 paste -d '' firsthalf secondhalf > fullcmd
-chmod 755 fullcmd
-./fullcmd
-service tomcat restart
+sudo chmod 755 fullcmd
+sudo ./fullcmd
+sudo service tomcat restart
 #rm -f command firsthalf fullcmd maven-metadata.xml secondhalf version
 rm -f command firsthalf maven-metadata.xml secondhalf version

From ef90db678bdd8c7d02d3645a2dba3ddce846b285 Mon Sep 17 00:00:00 2001
From: Jordan A <jordana@Jordans-MacBook-Pro.local>
Date: Thu, 9 May 2019 13:36:06 -0700
Subject: [PATCH 15/15] empty