From b768443d6b834cc8436432b7d38d841387985cbf Mon Sep 17 00:00:00 2001
From: damodartk <133252079+damodartk@users.noreply.github.com>
Date: Wed, 30 Aug 2023 12:17:30 -0500
Subject: [PATCH 1/5] Jenkinsfile

---
 Jenkinsfile | 93 ++++++++++++++++++++---------------------------------
 1 file changed, 35 insertions(+), 58 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 5ebf9def9..d254b2bdb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,60 +1,37 @@
-
 pipeline{
-    tools{
-        jdk 'myjava'
-        maven 'mymaven'
-    }
-	agent any
-      stages{
-           stage('Checkout'){
-	    
-               steps{
-		 echo 'cloning..'
-                 git 'https://github.com/Sonal0409/DevOpsClassCodes.git'
-              }
-          }
-          stage('Compile'){
-             
-              steps{
-                  echo 'compiling..'
-                  sh 'mvn compile'
-	      }
-          }
-          stage('CodeReview'){
-		  
-              steps{
-		    
-		  echo 'codeReview'
-                  sh 'mvn pmd:pmd'
-              }
-          }
-           stage('UnitTest'){
-		  
-              steps{
-	         echo 'Testing'
-                  sh 'mvn test'
-              }
-               post {
-               success {
-                   junit 'target/surefire-reports/*.xml'
-               }
-           }	
-          }
-           stage('MetricCheck'){
-              
-              steps{
-                  sh 'mvn cobertura:cobertura -Dcobertura.report.format=xml'
-              }
-              
-          }
-          stage('Package'){
-		  
-              steps{
-		  
-                  sh 'mvn package'
-              }
-          }
-	     
-          
-      }
+        tools{
+        maven 'Maven394'
+}
+        agent{
+                label 'Agent'
+}
+        stages{
+
+        stage('fetch code'){
+                steps{
+                git 'https://github.com/Sonal0409/DevOpsClassCodes.git'
+
+}
+}
+        stage('clean'){
+                steps{
+                        sh 'mvn clean'
+}
+}
+        stage('compile'){
+                steps{
+                        sh 'mvn compile'
+}
+}
+
+        stage('test'){
+                steps{
+                        sh 'mvn test'
+}
+}
+        stage('package'){
+                steps{
+                        sh 'mvn package'
+}
+}
 }

From 71d1219e99487f2479768505f53d33207dfc980d Mon Sep 17 00:00:00 2001
From: damodartk <133252079+damodartk@users.noreply.github.com>
Date: Wed, 30 Aug 2023 12:26:06 -0500
Subject: [PATCH 2/5] Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index d254b2bdb..51ce19a61 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,3 +35,4 @@ pipeline{
 }
 }
 }
+}

From 260e5395f64da29f6d9c2f6c58a0a8fe03253d85 Mon Sep 17 00:00:00 2001
From: damodartk <133252079+damodartk@users.noreply.github.com>
Date: Mon, 4 Sep 2023 22:09:48 -0500
Subject: [PATCH 3/5] Create dockerfile

---
 dockerfile | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 dockerfile

diff --git a/dockerfile b/dockerfile
new file mode 100644
index 000000000..f9bc001e7
--- /dev/null
+++ b/dockerfile
@@ -0,0 +1,4 @@
+FROM tomcat
+ADD addressbook.war /usr/local/tomcat/webapps
+EXPOSE 8080
+CMD ["catalina.sh", "run"]

From 1a91a01cedeb3328c39e07eed85e3de849c79ed3 Mon Sep 17 00:00:00 2001
From: damodartk <133252079+damodartk@users.noreply.github.com>
Date: Tue, 5 Sep 2023 12:06:52 -0500
Subject: [PATCH 4/5] Update dockerfile

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

diff --git a/dockerfile b/dockerfile
index f9bc001e7..01de9d20b 100644
--- a/dockerfile
+++ b/dockerfile
@@ -1,4 +1,4 @@
 FROM tomcat
-ADD addressbook.war /usr/local/tomcat/webapps
+ADD addressbook.war /usr/local/tomcat/webapps/
 EXPOSE 8080
 CMD ["catalina.sh", "run"]

From 9cedf7c091f07ad0144e6cc8b48870bfa0c43ad8 Mon Sep 17 00:00:00 2001
From: damodartk <133252079+damodartk@users.noreply.github.com>
Date: Tue, 5 Sep 2023 12:09:19 -0500
Subject: [PATCH 5/5] Update dockerfile

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

diff --git a/dockerfile b/dockerfile
index 01de9d20b..19a6f3834 100644
--- a/dockerfile
+++ b/dockerfile
@@ -1,4 +1,4 @@
-FROM tomcat
+FROM tomcat:9
 ADD addressbook.war /usr/local/tomcat/webapps/
 EXPOSE 8080
 CMD ["catalina.sh", "run"]