From 2ca7f9c68aa9cde34fdfeb39ebf0324b7f45a9b9 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 11 Oct 2022 11:00:39 +0530
Subject: [PATCH 001/100] Update HelloWorldApplication.java

---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index 349b44d1..678fae01 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "5. please visit my website learning-ocean.com";
+        return "cloud.class";
     }
 
 }

From 08a8cfb753c7b280b276a6b2fc47a5e83edc29a7 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Thu, 13 Oct 2022 19:57:40 +0530
Subject: [PATCH 002/100] Update Jenkinsfile

---
 Jenkinsfile | 58 +----------------------------------------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ad24bcc8..d8a70e9f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,57 +1 @@
-pipeline {
-    agent any
-     tools {
-        maven 'Maven' 
-        }
-    stages {
-        stage("Test"){
-            steps{
-                // mvn test
-                sh "mvn test"
-                slackSend channel: 'youtubejenkins', message: 'Job Started'
-                
-            }
-            
-        }
-        stage("Build"){
-            steps{
-                sh "mvn package"
-                
-            }
-            
-        }
-        stage("Deploy on Test"){
-            steps{
-                // deploy on container -> plugin
-                deploy adapters: [tomcat9(credentialsId: 'tomcatserverdetails1', path: '', url: 'http://192.168.0.118:8080')], contextPath: '/app', war: '**/*.war'
-              
-            }
-            
-        }
-        stage("Deploy on Prod"){
-             input {
-                message "Should we continue?"
-                ok "Yes we Should"
-            }
-            
-            steps{
-                // deploy on container -> plugin
-                deploy adapters: [tomcat9(credentialsId: 'tomcatserverdetails1', path: '', url: 'http://192.168.0.119:8080')], contextPath: '/app', war: '**/*.war'
-
-            }
-        }
-    }
-    post{
-        always{
-            echo "========always========"
-        }
-        success{
-            echo "========pipeline executed successfully ========"
-             slackSend channel: 'youtubejenkins', message: 'Success'
-        }
-        failure{
-            echo "========pipeline execution failed========"
-             slackSend channel: 'youtubejenkins', message: 'Job Failed'
-        }
-    }
-}
\ No newline at end of file
+jenkinsfile

From eda7750c0e68f7d877e429914ca795e514c605c1 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Fri, 14 Oct 2022 19:53:42 +0530
Subject: [PATCH 003/100] Update HelloWorldApplication.java

---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index 678fae01..f2c65379 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "cloud.class";
+        return "Helloworld,welcome to cloud.classes";
     }
 
 }

From 0a84c6d5ca83fd68ca394a24322f11528fb3d03f Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 15 Oct 2022 18:20:38 +0530
Subject: [PATCH 004/100] Update pom.xml


From 44756372fe9dac129bf191aee3624a46b9127eda Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 4 Feb 2023 22:48:55 +0530
Subject: [PATCH 005/100] Update banner.txt

---
 scripts/banner.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/banner.txt b/scripts/banner.txt
index cb8ea3c3..3ab32f21 100644
--- a/scripts/banner.txt
+++ b/scripts/banner.txt
@@ -1,7 +1,7 @@
-[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m_[0m[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;43m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m
-[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m|[0m[38;5;44m [0m[38;5;43m|[0m[38;5;49m [0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m [0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;48m_[0m[38;5;48m_[0m[38;5;48m_[0m[38;5;48m_[0m[38;5;48m [0m[38;5;48m_[0m[38;5;48m [0m
-[38;5;44m [0m[38;5;44m_[0m[38;5;44m [0m[38;5;43m [0m[38;5;49m|[0m[38;5;49m [0m[38;5;49m|[0m[38;5;49m/[0m[38;5;49m [0m[38;5;49m_[0m[38;5;49m`[0m[38;5;49m [0m[38;5;49m\[0m[38;5;49m [0m[38;5;48m\[0m[38;5;48m [0m[38;5;48m/[0m[38;5;48m [0m[38;5;48m/[0m[38;5;48m [0m[38;5;48m_[0m[38;5;48m`[0m[38;5;48m [0m[38;5;84m|[0m
-[38;5;43m|[0m[38;5;49m [0m[38;5;49m|[0m[38;5;49m_[0m[38;5;49m|[0m[38;5;49m [0m[38;5;49m|[0m[38;5;49m [0m[38;5;49m([0m[38;5;49m_[0m[38;5;49m|[0m[38;5;48m [0m[38;5;48m|[0m[38;5;48m\[0m[38;5;48m [0m[38;5;48mV[0m[38;5;48m [0m[38;5;48m/[0m[38;5;48m [0m[38;5;48m([0m[38;5;84m_[0m[38;5;83m|[0m[38;5;83m [0m[38;5;83m|[0m
-[38;5;49m [0m[38;5;49m\[0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m/[0m[38;5;49m [0m[38;5;49m\[0m[38;5;48m_[0m[38;5;48m_[0m[38;5;48m,[0m[38;5;48m_[0m[38;5;48m|[0m[38;5;48m [0m[38;5;48m\[0m[38;5;48m_[0m[38;5;48m/[0m[38;5;84m [0m[38;5;83m\[0m[38;5;83m_[0m[38;5;83m_[0m[38;5;83m,[0m[38;5;83m_[0m[38;5;83m|[0m
-[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;84m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m
+##[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m_[0m[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;43m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m
+##[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m|[0m[38;5;44m [0m[38;5;43m|[0m[38;5;49m [0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m [0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;48m_[0m[38;5;48m_[0m[38;5;48m_[0m[38;5;48m_[0m[38;5;48m [0m[38;5;48m_[0m[38;5;48m [0m
+##[38;5;44m [0m[38;5;44m_[0m[38;5;44m [0m[38;5;43m [0m[38;5;49m|[0m[38;5;49m [0m[38;5;49m|[0m[38;5;49m/[0m[38;5;49m [0m[38;5;49m_[0m[38;5;49m`[0m[38;5;49m [0m[38;5;49m\[0m[38;5;49m [0m[38;5;48m\[0m[38;5;48m [0m[38;5;48m/[0m[38;5;48m [0m[38;5;48m/[0m[38;5;48m [0m[38;5;48m_[0m[38;5;48m`[0m[38;5;48m [0m[38;5;84m|[0m
+##[38;5;43m|[0m[38;5;49m [0m[38;5;49m|[0m[38;5;49m_[0m[38;5;49m|[0m[38;5;49m [0m[38;5;49m|[0m[38;5;49m [0m[38;5;49m([0m[38;5;49m_[0m[38;5;49m|[0m[38;5;48m [0m[38;5;48m|[0m[38;5;48m\[0m[38;5;48m [0m[38;5;48mV[0m[38;5;48m [0m[38;5;48m/[0m[38;5;48m [0m[38;5;48m([0m[38;5;84m_[0m[38;5;83m|[0m[38;5;83m [0m[38;5;83m|[0m
+##[38;5;49m [0m[38;5;49m\[0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m/[0m[38;5;49m [0m[38;5;49m\[0m[38;5;48m_[0m[38;5;48m_[0m[38;5;48m,[0m[38;5;48m_[0m[38;5;48m|[0m[38;5;48m [0m[38;5;48m\[0m[38;5;48m_[0m[38;5;48m/[0m[38;5;84m [0m[38;5;83m\[0m[38;5;83m_[0m[38;5;83m_[0m[38;5;83m,[0m[38;5;83m_[0m[38;5;83m|[0m
+##[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;84m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m
 

From 679534fbdc34725267a8c2a68c31b93a4f45e13c Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 4 Feb 2023 22:49:57 +0530
Subject: [PATCH 006/100] Delete scripts directory

---
 scripts/banner.txt   |  7 -------
 scripts/utils.sh     | 50 --------------------------------------------
 scripts/variables.sh |  4 ----
 3 files changed, 61 deletions(-)
 delete mode 100644 scripts/banner.txt
 delete mode 100644 scripts/utils.sh
 delete mode 100644 scripts/variables.sh

diff --git a/scripts/banner.txt b/scripts/banner.txt
deleted file mode 100644
index 3ab32f21..00000000
--- a/scripts/banner.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-##[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m_[0m[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;43m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m
-##[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m [0m[38;5;44m|[0m[38;5;44m [0m[38;5;43m|[0m[38;5;49m [0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m [0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;48m_[0m[38;5;48m_[0m[38;5;48m_[0m[38;5;48m_[0m[38;5;48m [0m[38;5;48m_[0m[38;5;48m [0m
-##[38;5;44m [0m[38;5;44m_[0m[38;5;44m [0m[38;5;43m [0m[38;5;49m|[0m[38;5;49m [0m[38;5;49m|[0m[38;5;49m/[0m[38;5;49m [0m[38;5;49m_[0m[38;5;49m`[0m[38;5;49m [0m[38;5;49m\[0m[38;5;49m [0m[38;5;48m\[0m[38;5;48m [0m[38;5;48m/[0m[38;5;48m [0m[38;5;48m/[0m[38;5;48m [0m[38;5;48m_[0m[38;5;48m`[0m[38;5;48m [0m[38;5;84m|[0m
-##[38;5;43m|[0m[38;5;49m [0m[38;5;49m|[0m[38;5;49m_[0m[38;5;49m|[0m[38;5;49m [0m[38;5;49m|[0m[38;5;49m [0m[38;5;49m([0m[38;5;49m_[0m[38;5;49m|[0m[38;5;48m [0m[38;5;48m|[0m[38;5;48m\[0m[38;5;48m [0m[38;5;48mV[0m[38;5;48m [0m[38;5;48m/[0m[38;5;48m [0m[38;5;48m([0m[38;5;84m_[0m[38;5;83m|[0m[38;5;83m [0m[38;5;83m|[0m
-##[38;5;49m [0m[38;5;49m\[0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m_[0m[38;5;49m/[0m[38;5;49m [0m[38;5;49m\[0m[38;5;48m_[0m[38;5;48m_[0m[38;5;48m,[0m[38;5;48m_[0m[38;5;48m|[0m[38;5;48m [0m[38;5;48m\[0m[38;5;48m_[0m[38;5;48m/[0m[38;5;84m [0m[38;5;83m\[0m[38;5;83m_[0m[38;5;83m_[0m[38;5;83m,[0m[38;5;83m_[0m[38;5;83m|[0m
-##[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;49m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;48m [0m[38;5;84m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m[38;5;83m [0m
-
diff --git a/scripts/utils.sh b/scripts/utils.sh
deleted file mode 100644
index be3f8d7d..00000000
--- a/scripts/utils.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-# will print the error code and return from script
-# will take two args.
-# 1 = error code
-# 2 = error message.
-
-. ./scripts/variables.sh
-
-function print_exit(){
-    local error_code=${1}
-    local error_msg=${2}
-    echo -e "${RED}[Fail] ${error_msg} ${NOCOLOR}" 1>&2
-    exit ${error_code}
-}
-
-function showBanner(){
-    banner_file=${1}
-    cat ${banner_file}
-}
-
-function showProgress(){
-    local last_command_pid=${1}
-    while ps | grep -i "${last_command_pid}" > /dev/null
-    do 
-        for i in '-' '\' '|' '/'
-        do
-            echo -ne "\b${i}"
-            sleep 0.20
-        done
-        echo -en "\b"
-    done
-}
-
-function installPackage() {
-    local packageName=${1}
-    apt-get install -y ${packageName} > /dev/null &
-    last_command_pid=$!
-    showProgress ${last_command_pid}
-    wait ${last_command_pid} || print_exit 1 "not able to install ${packageName}."
-}
-
-function mavenTarget(){
-    local mavenCmd=${1}
-    mvn ${mavenCmd} > /dev/null &
-    last_command_pid=$!
-    showProgress ${last_command_pid}
-    wait ${last_command_pid} || print_exit 1 "${mavenCmd} fail."
-}
-
diff --git a/scripts/variables.sh b/scripts/variables.sh
deleted file mode 100644
index 0925862c..00000000
--- a/scripts/variables.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# colors variables. 
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-NOCOLOR='\033[0m'

From dee4d2c9acfa876b51e0c35351e1e8842963ab5a Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 4 Feb 2023 23:51:24 +0530
Subject: [PATCH 007/100] Dockerfiles added

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

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..4ef7e3ac
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,4 @@
+FROM openjdk:11
+EXPOSE 8080
+ADD target/hello-world-0.0.1-SNAPSHOT.war hello-world-0.0.1-SNAPSHOT.war
+ENTRYPOINT ["java","-jar","/hello-world-0.0.1-SNAPSHOT.war"]

From ad9d200cf403d43243997f211987504d70ac871f Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 7 Feb 2023 07:33:23 +0530
Subject: [PATCH 008/100] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 8909a32e..02f32825 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,3 +48,5 @@
 
 
 </project>
+
+

From 8679fa4846383d59463724307027f621491bce80 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Wed, 8 Feb 2023 08:14:52 +0530
Subject: [PATCH 009/100] Update Jenkinsfile

---
 Jenkinsfile | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d8a70e9f..88e3d1ab 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1 +1,25 @@
-jenkinsfile
+pipeline {
+    agent any
+    tools {
+        maven 'M2_HOME'
+    }
+    stages {
+        
+        stage('scm checkout') {
+            steps {
+               checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']]) 
+            }
+        }
+        stage('build the scm') {
+            steps {
+                sh 'mvn install'
+            }
+        }
+        stage('deploy to tomcat server') {
+            steps {
+                sh 'mvn install'
+            }
+        }
+    }
+}
+

From 120935725c3531d0a55c19e217ad21d4855811f9 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Fri, 17 Feb 2023 19:46:57 +0530
Subject: [PATCH 010/100] Update pom.xml

---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 02f32825..8909a32e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,5 +48,3 @@
 
 
 </project>
-
-

From 9425322a345ae7306866ec18471953e1a28e5353 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sun, 19 Feb 2023 19:28:43 +0530
Subject: [PATCH 011/100] Update HelloWorldApplication.java

---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index f2c65379..195d9960 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "Helloworld,welcome to cloud.classes";
+        return "welcome to cloud.classes";
     }
 
 }

From c3285125a7b1467595b794e1c9f8094db930b5a3 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Wed, 22 Feb 2023 20:04:56 +0530
Subject: [PATCH 012/100] Jenkins new file

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 88e3d1ab..27779d8d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,22 +4,22 @@ pipeline {
         maven 'M2_HOME'
     }
     stages {
-        
-        stage('scm checkout') {
+        stage('SCM checkout') {
             steps {
-               checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']]) 
+                checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
             }
         }
-        stage('build the scm') {
+        stage('build') {
             steps {
-                sh 'mvn install'
+                sh 'mvn clean install'
             }
         }
-        stage('deploy to tomcat server') {
+        stage('Deploy to test env') {
             steps {
-                sh 'mvn install'
+                deploy adapters: [tomcat9(credentialsId: 'tomcat_server', path: '', url: 'http://13.234.77.239:8080/')], contextPath: '/app', war: '**/*.war'
             }
         }
     }
 }
 
+

From 55f762526cb33c228079573e8deb99da213fb617 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Thu, 20 Apr 2023 09:49:32 +0530
Subject: [PATCH 013/100] removed the relative path

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

diff --git a/pom.xml b/pom.xml
index 8909a32e..4b2df62a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,6 @@
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
     <version>2.3.2.RELEASE</version>
-    <relativePath/> <!-- lookup parent from repository -->
   </parent>
 
   <properties>

From 093b9add0843d15cbcf857626bc118cd3cbc33a5 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 6 May 2023 07:04:30 +0530
Subject: [PATCH 014/100] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 4b2df62a..72675d2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,3 +47,4 @@
 
 
 </project>
+

From b958ad5e7fdb8219a6a8d91185065b8bce2a8faa Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 6 May 2023 07:05:33 +0530
Subject: [PATCH 015/100] testing github-webhook

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

diff --git a/pom.xml b/pom.xml
index 72675d2f..4b2df62a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,4 +47,3 @@
 
 
 </project>
-

From 6319877259cca98917a51a4be8a1468f49615f83 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 6 May 2023 07:51:44 +0530
Subject: [PATCH 016/100] testing github-webhook

testing github-webhook
---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 4b2df62a..24df6865 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,3 +47,5 @@
 
 
 </project>
+
+

From 71ab912053efc2e3482a81133dfa059958201181 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 6 May 2023 07:52:19 +0530
Subject: [PATCH 017/100] testing webhook

---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 24df6865..4b2df62a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,5 +47,3 @@
 
 
 </project>
-
-

From b532fc21432840eb5d92466a8a42636c3e7b7c30 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 6 May 2023 07:54:06 +0530
Subject: [PATCH 018/100] testing

---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index 8a0f4123..6df54d7e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -8,3 +8,4 @@
 - mvn package
 - apt-get install tomcat9
 - cp -rvf target/hello-world-0.0.1-SNAPSHOT.war /var/lib/tomcat9/webapps/app.war
+- testing webhook

From 879717542c0d14d92ac097b8256bb55ec58c576b Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sun, 7 May 2023 08:03:59 +0530
Subject: [PATCH 019/100] Update HelloWorldApplication.java

---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index 195d9960..26e904c3 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "welcome to cloud.classes";
+        return "its master branch code";
     }
 
 }

From aa8d3cd8411b20dc3b7f914dd0acc37e16d6d2d3 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sun, 7 May 2023 08:22:10 +0530
Subject: [PATCH 020/100] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 27779d8d..1fdb487b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
         }
         stage('Deploy to test env') {
             steps {
-                deploy adapters: [tomcat9(credentialsId: 'tomcat_server', path: '', url: 'http://13.234.77.239:8080/')], contextPath: '/app', war: '**/*.war'
+                deploy adapters: [tomcat9(credentialsId: 'tomcat_server', path: '', url: 'http://65.0.139.27:8080/')], contextPath: '/app', war: '**/*.war'
             }
         }
     }

From f16c1381996f62c9324c71768310f8d18133a6cf Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sun, 7 May 2023 08:30:53 +0530
Subject: [PATCH 021/100] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 1fdb487b..ea7a67dd 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,11 +14,11 @@ pipeline {
                 sh 'mvn clean install'
             }
         }
-        stage('Deploy to test env') {
+        stage('deploy') {
             steps {
-                deploy adapters: [tomcat9(credentialsId: 'tomcat_server', path: '', url: 'http://65.0.139.27:8080/')], contextPath: '/app', war: '**/*.war'
+               deploy adapters: [tomcat9(credentialsId: 'Tomcat9-server', path: '', url: 'http://13.235.75.178:8080')], contextPath: '/app', war: '**/*.war'
             }
-        }
+        }    
     }
 }
 

From 90f117b36ac93e612e9095bc64990af85d7a0fcd Mon Sep 17 00:00:00 2001
From: root <root@ip-172-31-11-212.ap-south-1.compute.internal>
Date: Fri, 7 Jul 2023 09:53:10 +0000
Subject: [PATCH 022/100] helm-chart

---
 kubernetes/myapp/.helmignore               | 23 ++++++++
 kubernetes/myapp/Chart.yaml                | 24 +++++++++
 kubernetes/myapp/templates/_helpers.tpl    | 62 ++++++++++++++++++++++
 kubernetes/myapp/templates/deployment.yaml | 51 ++++++++++++++++++
 kubernetes/myapp/templates/service.yaml    | 15 ++++++
 kubernetes/myapp/values.yaml               | 15 ++++++
 6 files changed, 190 insertions(+)
 create mode 100644 kubernetes/myapp/.helmignore
 create mode 100644 kubernetes/myapp/Chart.yaml
 create mode 100644 kubernetes/myapp/templates/_helpers.tpl
 create mode 100644 kubernetes/myapp/templates/deployment.yaml
 create mode 100644 kubernetes/myapp/templates/service.yaml
 create mode 100644 kubernetes/myapp/values.yaml

diff --git a/kubernetes/myapp/.helmignore b/kubernetes/myapp/.helmignore
new file mode 100644
index 00000000..0e8a0eb3
--- /dev/null
+++ b/kubernetes/myapp/.helmignore
@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/kubernetes/myapp/Chart.yaml b/kubernetes/myapp/Chart.yaml
new file mode 100644
index 00000000..6fae50a4
--- /dev/null
+++ b/kubernetes/myapp/Chart.yaml
@@ -0,0 +1,24 @@
+apiVersion: v2
+name: myapp
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.1.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.16.0"
diff --git a/kubernetes/myapp/templates/_helpers.tpl b/kubernetes/myapp/templates/_helpers.tpl
new file mode 100644
index 00000000..73b52b22
--- /dev/null
+++ b/kubernetes/myapp/templates/_helpers.tpl
@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "myapp.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "myapp.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "myapp.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "myapp.labels" -}}
+helm.sh/chart: {{ include "myapp.chart" . }}
+{{ include "myapp.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "myapp.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "myapp.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "myapp.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "myapp.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}
diff --git a/kubernetes/myapp/templates/deployment.yaml b/kubernetes/myapp/templates/deployment.yaml
new file mode 100644
index 00000000..0c906ce8
--- /dev/null
+++ b/kubernetes/myapp/templates/deployment.yaml
@@ -0,0 +1,51 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "myapp.fullname" . }}
+  labels:
+    {{- include "myapp.labels" . | nindent 4 }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  selector:
+    matchLabels:
+      {{- include "myapp.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      labels:
+        {{- include "myapp.selectorLabels" . | nindent 8 }}
+    spec:
+      containers:
+        - name: {{ .Chart.Name }}
+          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          command: ["/bin/sh"]
+          args: ["-c","sh /usr/local/tomcat/bin/startup.sh;while true; do echo hello; sleep 10;done"]
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          ports:
+            - name: http
+              containerPort: 8080
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: http
+            initialDelaySeconds: 60
+            periodSeconds: 5
+            successThreshold: 1
+            failureThreshold: 3
+            timeoutSeconds: 10
+          readinessProbe:
+            httpGet:
+              path: /
+              port: http
+            initialDelaySeconds: 60
+            periodSeconds: 5
+            successThreshold: 1
+            failureThreshold: 3
+            timeoutSeconds: 10
+          resources:
+            requests:
+              memory: 0.25Gi
+              cpu: 0.5
+            limits:
+              memory: 0.25Gi 
+              cpu: 0.5
diff --git a/kubernetes/myapp/templates/service.yaml b/kubernetes/myapp/templates/service.yaml
new file mode 100644
index 00000000..1f732009
--- /dev/null
+++ b/kubernetes/myapp/templates/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "myapp.fullname" . }}
+  labels:
+    {{- include "myapp.labels" . | nindent 4 }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "myapp.selectorLabels" . | nindent 4 }}
\ No newline at end of file
diff --git a/kubernetes/myapp/values.yaml b/kubernetes/myapp/values.yaml
new file mode 100644
index 00000000..3103a0f1
--- /dev/null
+++ b/kubernetes/myapp/values.yaml
@@ -0,0 +1,15 @@
+# Default values for myapp.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 2
+
+image:
+  repository: IMAGE_NAME
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  tag: IMAGE_TAG
+
+service:
+  type: NodePort
+  port: 8080

From 1f977f30648c18eaa99b4fdfd1795e0e07e33b23 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Fri, 7 Jul 2023 16:43:03 +0530
Subject: [PATCH 023/100] Update deployment.yaml

---
 kubernetes/myapp/templates/deployment.yaml | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/kubernetes/myapp/templates/deployment.yaml b/kubernetes/myapp/templates/deployment.yaml
index 0c906ce8..6419945d 100644
--- a/kubernetes/myapp/templates/deployment.yaml
+++ b/kubernetes/myapp/templates/deployment.yaml
@@ -24,24 +24,24 @@ spec:
             - name: http
               containerPort: 8080
               protocol: TCP
-          livenessProbe:
-            httpGet:
-              path: /
-              port: http
-            initialDelaySeconds: 60
-            periodSeconds: 5
-            successThreshold: 1
-            failureThreshold: 3
-            timeoutSeconds: 10
-          readinessProbe:
-            httpGet:
-              path: /
-              port: http
-            initialDelaySeconds: 60
-            periodSeconds: 5
-            successThreshold: 1
-            failureThreshold: 3
-            timeoutSeconds: 10
+          # livenessProbe:
+          #   httpGet:
+          #     path: /
+          #     port: http
+          #   initialDelaySeconds: 60
+          #   periodSeconds: 5
+          #   successThreshold: 1
+          #   failureThreshold: 3
+          #   timeoutSeconds: 10
+          # readinessProbe:
+          #   httpGet:
+          #     path: /
+          #     port: http
+          #   initialDelaySeconds: 60
+          #   periodSeconds: 5
+          #   successThreshold: 1
+          #   failureThreshold: 3
+          #   timeoutSeconds: 10
           resources:
             requests:
               memory: 0.25Gi

From baea26f04c49c56a293a156c266121adb8e128fe Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Fri, 7 Jul 2023 22:14:01 +0530
Subject: [PATCH 024/100] Create jenkinsfile-helm

---
 jenkinsfile-helm | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 jenkinsfile-helm

diff --git a/jenkinsfile-helm b/jenkinsfile-helm
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/jenkinsfile-helm
@@ -0,0 +1 @@
+

From b599759e4557d9cf5d7d3072ccf2f2bf7973ec4c Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Fri, 7 Jul 2023 22:17:08 +0530
Subject: [PATCH 025/100] Update jenkinsfile-helm

---
 jenkinsfile-helm | 64 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 63 insertions(+), 1 deletion(-)

diff --git a/jenkinsfile-helm b/jenkinsfile-helm
index 8b137891..e0a9cb1c 100644
--- a/jenkinsfile-helm
+++ b/jenkinsfile-helm
@@ -1 +1,63 @@
-
+pipeline {
+    agent any
+    tools {
+       maven 'M2_HOME'
+    }
+    environment{
+        VERSION = "${env.BUILD_ID}"
+    }
+    stages {
+        stage('pull source code') {
+            steps {
+                checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
+            }
+        }
+        stage('Build') {
+            steps {
+                sh 'mvn clean package'
+            }
+        }
+        stage('Static Code Analysis') {
+            environment {
+            SONAR_URL = "http://3.7.71.116:9000"
+            }
+            steps {
+                withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_AUTH_TOKEN')]) {
+                sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
+                }
+                timeout(time: 1, unit: 'HOURS') {
+                    def qg = waitForQualityGate()
+                    if (qg.status != 'OK') {
+                    error "Pipeline aborted due to quality gate failure: ${qg.status}"
+                    }
+                }
+        }
+        stage("docker build & docker push"){
+            steps{
+                script{
+                    withCredentials([string(credentialsId: 'dockerhub-token', variable: 'docker_password')]) {
+                             sh '''
+                                docker build -t sudhakarbastawade/helm-deploy:${VERSION} .
+                                docker login -u sudhakarbastawade -p $docker_password
+                                docker push sudhakarbastawade/helm-deploy:${VERSION}
+                                docker rmi sudhakarbastawade/helm-deploy:${VERSION}
+                            '''
+                    }
+                }
+            }
+        }
+        stage('Deploying application on k8s cluster') {
+            steps {
+               script{
+                   // withCredentials([kubeconfigFile(credentialsId: 'kubeconfig', variable: 'KUBECONFIG')]) {
+		       withCredentials([file(credentialsId: 'kubeconfig', variable: 'KUBECONFIG')]) {
+		       dir('kubernetes/') {
+                          sh 'helm upgrade --install --set image.repository="sudhakarbastawade/helm-deploy" --set image.tag="${VERSION}" myjavaapp myapp/ ' 
+                        }
+                    }
+               }
+            }
+        }
+        
+    }
+}

From 7889898cda24338728bf451a8300c0bc15122fd4 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Fri, 7 Jul 2023 22:45:43 +0530
Subject: [PATCH 026/100] Update jenkinsfile-helm

---
 jenkinsfile-helm | 64 +-----------------------------------------------
 1 file changed, 1 insertion(+), 63 deletions(-)

diff --git a/jenkinsfile-helm b/jenkinsfile-helm
index e0a9cb1c..8b137891 100644
--- a/jenkinsfile-helm
+++ b/jenkinsfile-helm
@@ -1,63 +1 @@
-pipeline {
-    agent any
-    tools {
-       maven 'M2_HOME'
-    }
-    environment{
-        VERSION = "${env.BUILD_ID}"
-    }
-    stages {
-        stage('pull source code') {
-            steps {
-                checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
-            }
-        }
-        stage('Build') {
-            steps {
-                sh 'mvn clean package'
-            }
-        }
-        stage('Static Code Analysis') {
-            environment {
-            SONAR_URL = "http://3.7.71.116:9000"
-            }
-            steps {
-                withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_AUTH_TOKEN')]) {
-                sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
-                }
-                timeout(time: 1, unit: 'HOURS') {
-                    def qg = waitForQualityGate()
-                    if (qg.status != 'OK') {
-                    error "Pipeline aborted due to quality gate failure: ${qg.status}"
-                    }
-                }
-        }
-        stage("docker build & docker push"){
-            steps{
-                script{
-                    withCredentials([string(credentialsId: 'dockerhub-token', variable: 'docker_password')]) {
-                             sh '''
-                                docker build -t sudhakarbastawade/helm-deploy:${VERSION} .
-                                docker login -u sudhakarbastawade -p $docker_password
-                                docker push sudhakarbastawade/helm-deploy:${VERSION}
-                                docker rmi sudhakarbastawade/helm-deploy:${VERSION}
-                            '''
-                    }
-                }
-            }
-        }
-        stage('Deploying application on k8s cluster') {
-            steps {
-               script{
-                   // withCredentials([kubeconfigFile(credentialsId: 'kubeconfig', variable: 'KUBECONFIG')]) {
-		       withCredentials([file(credentialsId: 'kubeconfig', variable: 'KUBECONFIG')]) {
-		       dir('kubernetes/') {
-                          sh 'helm upgrade --install --set image.repository="sudhakarbastawade/helm-deploy" --set image.tag="${VERSION}" myjavaapp myapp/ ' 
-                        }
-                    }
-               }
-            }
-        }
-        
-    }
-}
+

From 7c1129c5b9f68c0dfc4a953bf8e5b035076c207e Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Fri, 7 Jul 2023 23:03:08 +0530
Subject: [PATCH 027/100] Update jenkinsfile-helm


From b72435b8cf7e2c0ab474ba82f6c2d11d9c45c077 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Fri, 7 Jul 2023 23:03:20 +0530
Subject: [PATCH 028/100] Update jenkinsfile-helm

---
 jenkinsfile-helm | 78 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 77 insertions(+), 1 deletion(-)

diff --git a/jenkinsfile-helm b/jenkinsfile-helm
index 8b137891..98bc24e1 100644
--- a/jenkinsfile-helm
+++ b/jenkinsfile-helm
@@ -1 +1,77 @@
-
+pipeline {
+    agent any
+    tools {
+       maven 'M2_HOME'
+    }
+    environment{
+        VERSION = "${env.BUILD_ID}"
+    }
+    stages {
+        stage('pull source code') {
+            steps {
+                checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
+            }
+        }
+        stage('Build') {
+            steps {
+                sh 'mvn clean package'
+            }
+        }
+        stage('Static Code Analysis') {
+            environment {
+            SONAR_URL = "http://3.7.71.116:9000"
+            }
+            steps {
+                script {
+                    // withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_AUTH_TOKEN')]) {
+                       withSonarQubeEnv(credentialsId: 'sonar-token') {
+                        sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
+                    }
+                    timeout(time: 1, unit: 'HOURS') {
+                        def qg = waitForQualityGate()
+                        if (qg.status != 'OK') {
+                            error "Pipeline aborted due to quality gate failure: ${qg.status}"
+                        }
+                    }
+                }
+            }
+        }
+        stage("docker build & docker push"){
+            steps{
+                script{
+                    withCredentials([string(credentialsId: 'dockerhub-token', variable: 'docker_password')]) {
+                             sh '''
+                                docker build -t sudhakarbastawade/helm-deploy:${VERSION} .
+                                docker login -u sudhakarbastawade -p $docker_password
+                                docker push sudhakarbastawade/helm-deploy:${VERSION}
+                                docker rmi sudhakarbastawade/helm-deploy:${VERSION}
+                            '''
+                    }
+                }
+            }
+        }
+        stage('manual approval'){
+            steps{
+                script{
+                    timeout(10) {
+                        mail bcc: '', body: "<br>Project: ${env.JOB_NAME} <br>Build Number: ${env.BUILD_NUMBER} <br> Go to build url and approve the deployment request <br> URL de build: ${env.BUILD_URL}", cc: '', charset: 'UTF-8', from: '', mimeType: 'text/html', replyTo: '', subject: "${currentBuild.result} CI: Project name -> ${env.JOB_NAME}", to: "devops.classes.online@gmail.com";  
+                        input(message: "Deploy ${params.project_name}?", ok: 'Deploy')
+                    }
+                }
+            }
+        }
+        stage('Deploying application on k8s cluster') {
+            steps {
+               script{
+                   // withCredentials([kubeconfigFile(credentialsId: 'kubeconfig', variable: 'KUBECONFIG')]) {
+		       withCredentials([file(credentialsId: 'kubeconfig', variable: 'KUBECONFIG')]) {
+		       dir('kubernetes/') {
+                          sh 'helm upgrade --install --set image.repository="sudhakarbastawade/helm-deploy" --set image.tag="${VERSION}" myjavaapp myapp/ ' 
+                        }
+                    }
+               }
+            }
+        }
+        
+    }
+}

From 976e56d46726054f6ee43ba45dc22ed3b1bf6041 Mon Sep 17 00:00:00 2001
From: EC2 Default User <ec2-user@ip-172-31-11-212.ap-south-1.compute.internal>
Date: Tue, 11 Jul 2023 10:24:26 +0000
Subject: [PATCH 029/100] newfile

---
 spring-boot-app-manifest/deployment.yaml | 21 +++++++++++++++++++++
 spring-boot-app-manifest/service.yaml    | 13 +++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 spring-boot-app-manifest/deployment.yaml
 create mode 100644 spring-boot-app-manifest/service.yaml

diff --git a/spring-boot-app-manifest/deployment.yaml b/spring-boot-app-manifest/deployment.yaml
new file mode 100644
index 00000000..5a17bc4e
--- /dev/null
+++ b/spring-boot-app-manifest/deployment.yaml
@@ -0,0 +1,21 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: spring-boot-app
+  labels:
+    app: spring-boot-app
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: spring-boot-app
+  template:
+    metadata:
+      labels:
+        app: spring-boot-app
+    spec:
+      containers:
+      - name: spring-boot-app
+        image: sudhakarbastawade/ultimate-cicd:2
+        ports:
+        - containerPort: 8080
\ No newline at end of file
diff --git a/spring-boot-app-manifest/service.yaml b/spring-boot-app-manifest/service.yaml
new file mode 100644
index 00000000..b37517f7
--- /dev/null
+++ b/spring-boot-app-manifest/service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+  metadata:
+    name: spring-boot-app-service
+  spec:
+    type: NodePort
+    ports:
+    - name: http
+      port: 80
+      targetPort: 8080
+      protocol: TCP
+    selector:
+      app: spring-boot-app
\ No newline at end of file

From 6a5dc25a7086ba8e98402625115c3467664322b0 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 11 Jul 2023 19:54:02 +0530
Subject: [PATCH 030/100] Update deployment.yaml

---
 spring-boot-app-manifest/deployment.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot-app-manifest/deployment.yaml b/spring-boot-app-manifest/deployment.yaml
index 5a17bc4e..d1aa3cd9 100644
--- a/spring-boot-app-manifest/deployment.yaml
+++ b/spring-boot-app-manifest/deployment.yaml
@@ -16,6 +16,6 @@ spec:
     spec:
       containers:
       - name: spring-boot-app
-        image: sudhakarbastawade/ultimate-cicd:2
+        image: sudhakarbastawade/argo-cd:replaceImageTag        
         ports:
-        - containerPort: 8080
\ No newline at end of file
+        - containerPort: 8080

From e983aabdd6145a1d741acfce3e54b4ac590fce04 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303 <sudhakarbastawade2303@gmail.com>
Date: Tue, 11 Jul 2023 14:39:35 +0000
Subject: [PATCH 031/100] Update deployment image to version 10

---
 spring-boot-app-manifest/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-app-manifest/deployment.yaml b/spring-boot-app-manifest/deployment.yaml
index d1aa3cd9..4bbc1ebc 100644
--- a/spring-boot-app-manifest/deployment.yaml
+++ b/spring-boot-app-manifest/deployment.yaml
@@ -16,6 +16,6 @@ spec:
     spec:
       containers:
       - name: spring-boot-app
-        image: sudhakarbastawade/argo-cd:replaceImageTag        
+        image: sudhakarbastawade/argo-cd:10        
         ports:
         - containerPort: 8080

From e20f7750f5987cc2e2a4ef6aa21abbae68876fa5 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 11 Jul 2023 20:10:31 +0530
Subject: [PATCH 032/100] Update deployment.yaml

---
 spring-boot-app-manifest/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-app-manifest/deployment.yaml b/spring-boot-app-manifest/deployment.yaml
index 4bbc1ebc..ed424d63 100644
--- a/spring-boot-app-manifest/deployment.yaml
+++ b/spring-boot-app-manifest/deployment.yaml
@@ -16,6 +16,6 @@ spec:
     spec:
       containers:
       - name: spring-boot-app
-        image: sudhakarbastawade/argo-cd:10        
+        image: sudhakarbastawade/argo-cd:replaceImageTag
         ports:
         - containerPort: 8080

From 251e94366df3cba1299550a43bb5a4b9b620fa5c Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 11 Jul 2023 20:35:33 +0530
Subject: [PATCH 033/100] Delete jenkinsfile-helm

---
 jenkinsfile-helm | 77 ------------------------------------------------
 1 file changed, 77 deletions(-)
 delete mode 100644 jenkinsfile-helm

diff --git a/jenkinsfile-helm b/jenkinsfile-helm
deleted file mode 100644
index 98bc24e1..00000000
--- a/jenkinsfile-helm
+++ /dev/null
@@ -1,77 +0,0 @@
-pipeline {
-    agent any
-    tools {
-       maven 'M2_HOME'
-    }
-    environment{
-        VERSION = "${env.BUILD_ID}"
-    }
-    stages {
-        stage('pull source code') {
-            steps {
-                checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
-            }
-        }
-        stage('Build') {
-            steps {
-                sh 'mvn clean package'
-            }
-        }
-        stage('Static Code Analysis') {
-            environment {
-            SONAR_URL = "http://3.7.71.116:9000"
-            }
-            steps {
-                script {
-                    // withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_AUTH_TOKEN')]) {
-                       withSonarQubeEnv(credentialsId: 'sonar-token') {
-                        sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
-                    }
-                    timeout(time: 1, unit: 'HOURS') {
-                        def qg = waitForQualityGate()
-                        if (qg.status != 'OK') {
-                            error "Pipeline aborted due to quality gate failure: ${qg.status}"
-                        }
-                    }
-                }
-            }
-        }
-        stage("docker build & docker push"){
-            steps{
-                script{
-                    withCredentials([string(credentialsId: 'dockerhub-token', variable: 'docker_password')]) {
-                             sh '''
-                                docker build -t sudhakarbastawade/helm-deploy:${VERSION} .
-                                docker login -u sudhakarbastawade -p $docker_password
-                                docker push sudhakarbastawade/helm-deploy:${VERSION}
-                                docker rmi sudhakarbastawade/helm-deploy:${VERSION}
-                            '''
-                    }
-                }
-            }
-        }
-        stage('manual approval'){
-            steps{
-                script{
-                    timeout(10) {
-                        mail bcc: '', body: "<br>Project: ${env.JOB_NAME} <br>Build Number: ${env.BUILD_NUMBER} <br> Go to build url and approve the deployment request <br> URL de build: ${env.BUILD_URL}", cc: '', charset: 'UTF-8', from: '', mimeType: 'text/html', replyTo: '', subject: "${currentBuild.result} CI: Project name -> ${env.JOB_NAME}", to: "devops.classes.online@gmail.com";  
-                        input(message: "Deploy ${params.project_name}?", ok: 'Deploy')
-                    }
-                }
-            }
-        }
-        stage('Deploying application on k8s cluster') {
-            steps {
-               script{
-                   // withCredentials([kubeconfigFile(credentialsId: 'kubeconfig', variable: 'KUBECONFIG')]) {
-		       withCredentials([file(credentialsId: 'kubeconfig', variable: 'KUBECONFIG')]) {
-		       dir('kubernetes/') {
-                          sh 'helm upgrade --install --set image.repository="sudhakarbastawade/helm-deploy" --set image.tag="${VERSION}" myjavaapp myapp/ ' 
-                        }
-                    }
-               }
-            }
-        }
-        
-    }
-}

From f73c848e6e8fc38859e52ac120eb26058b3ef9f4 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303 <sudhakarbastawade2303@gmail.com>
Date: Tue, 11 Jul 2023 15:45:20 +0000
Subject: [PATCH 034/100] Update deployment image to version 11

---
 spring-boot-app-manifest/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-app-manifest/deployment.yaml b/spring-boot-app-manifest/deployment.yaml
index ed424d63..165ccd9a 100644
--- a/spring-boot-app-manifest/deployment.yaml
+++ b/spring-boot-app-manifest/deployment.yaml
@@ -16,6 +16,6 @@ spec:
     spec:
       containers:
       - name: spring-boot-app
-        image: sudhakarbastawade/argo-cd:replaceImageTag
+        image: sudhakarbastawade/argo-cd:11
         ports:
         - containerPort: 8080

From 7056600d66fb764c79dd39ced2d5b32345c759ee Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 11 Jul 2023 22:06:59 +0530
Subject: [PATCH 035/100] Update service.yaml

---
 spring-boot-app-manifest/service.yaml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/spring-boot-app-manifest/service.yaml b/spring-boot-app-manifest/service.yaml
index b37517f7..400af546 100644
--- a/spring-boot-app-manifest/service.yaml
+++ b/spring-boot-app-manifest/service.yaml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: Service
-  metadata:
-    name: spring-boot-app-service
-  spec:
-    type: NodePort
-    ports:
-    - name: http
-      port: 80
-      targetPort: 8080
-      protocol: TCP
-    selector:
-      app: spring-boot-app
\ No newline at end of file
+metadata:
+  name: spring-boot-app-service
+spec:
+  type: NodePort
+  ports:
+  - name: http
+    port: 80
+    targetPort: 8080
+    protocol: TCP
+  selector:
+    app: spring-boot-app

From 532bef31e7f5affbf0f0bf300b59c513335c2591 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303 <sudhakarbastawade2303@gmail.com>
Date: Tue, 11 Jul 2023 16:50:17 +0000
Subject: [PATCH 036/100] Update deployment image to version 12

---
 spring-boot-app-manifest/deployment.yaml | 42 ++++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/spring-boot-app-manifest/deployment.yaml b/spring-boot-app-manifest/deployment.yaml
index 165ccd9a..eb55c1fe 100644
--- a/spring-boot-app-manifest/deployment.yaml
+++ b/spring-boot-app-manifest/deployment.yaml
@@ -1,21 +1,21 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: spring-boot-app
-  labels:
-    app: spring-boot-app
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: spring-boot-app
-  template:
-    metadata:
-      labels:
-        app: spring-boot-app
-    spec:
-      containers:
-      - name: spring-boot-app
-        image: sudhakarbastawade/argo-cd:11
-        ports:
-        - containerPort: 8080
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG
+:IMAGE_TAG

From 4ed4a94d4cb6e12a807a1ee1f893548f0a2aab8f Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 11 Jul 2023 22:22:01 +0530
Subject: [PATCH 037/100] Update deployment.yaml

---
 spring-boot-app-manifest/deployment.yaml | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/spring-boot-app-manifest/deployment.yaml b/spring-boot-app-manifest/deployment.yaml
index eb55c1fe..8b137891 100644
--- a/spring-boot-app-manifest/deployment.yaml
+++ b/spring-boot-app-manifest/deployment.yaml
@@ -1,21 +1 @@
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
-:IMAGE_TAG
+

From a7237d81e769e3b17bd3979c6733f81979b35658 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 11 Jul 2023 22:22:35 +0530
Subject: [PATCH 038/100] Update deployment.yaml

---
 spring-boot-app-manifest/deployment.yaml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/spring-boot-app-manifest/deployment.yaml b/spring-boot-app-manifest/deployment.yaml
index 8b137891..3989bf4c 100644
--- a/spring-boot-app-manifest/deployment.yaml
+++ b/spring-boot-app-manifest/deployment.yaml
@@ -1 +1,21 @@
-
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: spring-boot-app
+  labels:
+    app: spring-boot-app
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: spring-boot-app
+  template:
+    metadata:
+      labels:
+        app: spring-boot-app
+    spec:
+      containers:
+      - name: spring-boot-app
+        image: sudhakarbastawade/argo-cd:v1
+        ports:
+        - containerPort: 8080

From 17a7f434046a63bfa51fee25f55a8195f4b6eb7d Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303 <sudhakarbastawade2303@gmail.com>
Date: Tue, 11 Jul 2023 16:55:10 +0000
Subject: [PATCH 039/100] Update deployment image to version 13

---
 spring-boot-app-manifest/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-app-manifest/deployment.yaml b/spring-boot-app-manifest/deployment.yaml
index 3989bf4c..cfc8db4c 100644
--- a/spring-boot-app-manifest/deployment.yaml
+++ b/spring-boot-app-manifest/deployment.yaml
@@ -16,6 +16,6 @@ spec:
     spec:
       containers:
       - name: spring-boot-app
-        image: sudhakarbastawade/argo-cd:v1
+        image: sudhakarbastawade/argo-cd:13
         ports:
         - containerPort: 8080

From e47b2613e12ad5b1dd79b3c2164dc2c6d90c5b9b Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303 <sudhakarbastawade2303@gmail.com>
Date: Wed, 12 Jul 2023 00:51:16 +0000
Subject: [PATCH 040/100] Update deployment image to version 14

---
 spring-boot-app-manifest/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-app-manifest/deployment.yaml b/spring-boot-app-manifest/deployment.yaml
index cfc8db4c..2cc96874 100644
--- a/spring-boot-app-manifest/deployment.yaml
+++ b/spring-boot-app-manifest/deployment.yaml
@@ -16,6 +16,6 @@ spec:
     spec:
       containers:
       - name: spring-boot-app
-        image: sudhakarbastawade/argo-cd:13
+        image: sudhakarbastawade/argo-cd:14
         ports:
         - containerPort: 8080

From b7cb434f033ca6645e6a3cb4b67ff56221000001 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303 <sudhakarbastawade2303@gmail.com>
Date: Wed, 12 Jul 2023 02:59:33 +0000
Subject: [PATCH 041/100] Update deployment image to version 1

---
 spring-boot-app-manifest/deployment.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-app-manifest/deployment.yaml b/spring-boot-app-manifest/deployment.yaml
index 2cc96874..25f84493 100644
--- a/spring-boot-app-manifest/deployment.yaml
+++ b/spring-boot-app-manifest/deployment.yaml
@@ -16,6 +16,6 @@ spec:
     spec:
       containers:
       - name: spring-boot-app
-        image: sudhakarbastawade/argo-cd:14
+        image: sudhakarbastawade/argo-cd:1
         ports:
         - containerPort: 8080

From 2eb9d3d35b93384ff338191feeaf01ad1fbf7510 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Wed, 12 Jul 2023 09:00:26 +0530
Subject: [PATCH 042/100] Update values.yaml

---
 kubernetes/myapp/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/myapp/values.yaml b/kubernetes/myapp/values.yaml
index 3103a0f1..affdb4ca 100644
--- a/kubernetes/myapp/values.yaml
+++ b/kubernetes/myapp/values.yaml
@@ -2,7 +2,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-replicaCount: 2
+replicaCount: 5
 
 image:
   repository: IMAGE_NAME

From eeae2972b1f8b05a78099b96213cf317e12fd1f6 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 19 Aug 2023 08:21:26 +0530
Subject: [PATCH 043/100] Update HelloWorldApplication.java

changing the code
---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index 26e904c3..c970573e 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "its master branch code";
+        return "Hi, sudhakar here";
     }
 
 }

From f60c10b86bbef0dd50ce621d28612826127a75c0 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Mon, 28 Aug 2023 07:42:54 +0530
Subject: [PATCH 044/100] Update Jenkinsfile

added new tomcat server
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ea7a67dd..99b29b92 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,7 +16,7 @@ pipeline {
         }
         stage('deploy') {
             steps {
-               deploy adapters: [tomcat9(credentialsId: 'Tomcat9-server', path: '', url: 'http://13.235.75.178:8080')], contextPath: '/app', war: '**/*.war'
+               deploy adapters: [tomcat9(credentialsId: 'tomcat9', path: '', url: 'http://65.1.1.251:8080')], contextPath: '/app', war: '**/*.war'
             }
         }    
     }

From 1120f4e741ab18f936e17d549e89b7028de01a80 Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@ip-172-31-56-10.ec2.internal>
Date: Mon, 28 Aug 2023 02:25:58 +0000
Subject: [PATCH 045/100] added sonar stage

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 99b29b92..15fbe0e1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,6 +9,11 @@ pipeline {
                 checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
             }
         }
+	stage('Sonar stage') {
+            steps {
+                echo "running sonar scan"
+		}
+        }
         stage('build') {
             steps {
                 sh 'mvn clean install'

From b9d3c564799e09c8fae64e535258e64e4592ab68 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Mon, 28 Aug 2023 22:53:43 +0530
Subject: [PATCH 046/100] Update Jenkinsfile

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 15fbe0e1..6cb87134 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -25,6 +25,11 @@ pipeline {
             }
         }    
     }
+	post {
+          success {
+             mail to: devops.classes.online@gmail.com, subject: ‘The Pipeline success :(‘
+    }
+  }
 }
 
 
From 9741028db2a5962bc4ba41b5a302185f904d9467 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 29 Aug 2023 06:53:07 +0530
Subject: [PATCH 047/100] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 4b2df62a..72675d2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,3 +47,4 @@
 
 
 </project>
+

From 2b66aaf066609de83772e55c1062e527c6861468 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 29 Aug 2023 06:53:47 +0530
Subject: [PATCH 048/100] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 72675d2f..4b2df62a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,4 +47,3 @@
 
 
 </project>
-

From 76338032fd4e1e094e182f4124f628e8649e2e05 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 29 Aug 2023 07:21:58 +0530
Subject: [PATCH 049/100] Update HelloWorldApplication.java

updated the code
---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index c970573e..5352ae1f 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "Hi, sudhakar here";
+        return "Hi, sudhakar here, testing github-web-hooks";
     }
 
 }

From d0cdea2e9caa7e938d2d7a503cb374950547db07 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 29 Aug 2023 07:25:07 +0530
Subject: [PATCH 050/100] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 4b2df62a..ce453b7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,5 +45,4 @@
     </plugins>
   </build>
 
-
 </project>

From 8377cf3c7d0b67ec99f8bba53fc0a5aec783a118 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 29 Aug 2023 07:26:57 +0530
Subject: [PATCH 051/100] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index ce453b7c..0e1ed389 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,4 +45,6 @@
     </plugins>
   </build>
 
+  
 </project>
+

From 6f1741a29738e7a018d69a940be967f3ef2eb835 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 29 Aug 2023 07:31:30 +0530
Subject: [PATCH 052/100] Update pom.xml

testing webhook
---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0e1ed389..179dfd0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,4 +47,3 @@
 
   
 </project>
-

From f7705b000aed0e43631cf57dd6b060d750274391 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 29 Aug 2023 07:33:24 +0530
Subject: [PATCH 053/100] Update setup.sh

---
 setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index 0fc3c18c..f3d2d26f 100644
--- a/setup.sh
+++ b/setup.sh
@@ -52,4 +52,5 @@ fi
 # Clean Up code.
 
 clean_up
-exit 0
\ No newline at end of file
+exit 0
+

From a6155f01859370a2ef25ee8fb132e134607b2e26 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 29 Aug 2023 07:38:17 +0530
Subject: [PATCH 054/100] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 179dfd0b..7ed3ca36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,3 +47,6 @@
 
   
 </project>
+
+
+

From c7c1fc9421c3441dfa5934b8bc80ae14c614744d Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 29 Aug 2023 07:39:18 +0530
Subject: [PATCH 055/100] Update pom.xml

---
 pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7ed3ca36..179dfd0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,3 @@
 
   
 </project>
-
-
-

From 709d4938758e230688697ae4f9edda65325f6efb Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 29 Aug 2023 07:41:28 +0530
Subject: [PATCH 056/100] Update pom.xml


From b857f4208814aa87a0fd49fcf921644c2bd6dce8 Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@ip-172-31-56-10.ec2.internal>
Date: Tue, 29 Aug 2023 02:14:23 +0000
Subject: [PATCH 057/100] testing webhook

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

diff --git a/pom.xml b/pom.xml
index 179dfd0b..5a690114 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,3 +47,5 @@
 
   
 </project>
+
+

From 704f52ebf7814a4bc33341568a374a89903b4c79 Mon Sep 17 00:00:00 2001
From: Ubuntu <ubuntu@ip-172-31-56-10.ec2.internal>
Date: Tue, 29 Aug 2023 02:23:47 +0000
Subject: [PATCH 058/100] testing

---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index 6df54d7e..4848b8ee 100644
--- a/Readme.md
+++ b/Readme.md
@@ -9,3 +9,4 @@
 - apt-get install tomcat9
 - cp -rvf target/hello-world-0.0.1-SNAPSHOT.war /var/lib/tomcat9/webapps/app.war
 - testing webhook
+testing weghook

From 5f0c1f06b5418f01690793b5d14bc508cab40a04 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Mon, 4 Sep 2023 09:04:16 +0530
Subject: [PATCH 059/100] Create jenkinsfile-dockerpush

---
 jenkinsfile-dockerpush | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 jenkinsfile-dockerpush

diff --git a/jenkinsfile-dockerpush b/jenkinsfile-dockerpush
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/jenkinsfile-dockerpush
@@ -0,0 +1 @@
+

From efcbd6ac47cd1b74700a22d397e0c926859e61ac Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Mon, 4 Sep 2023 09:04:44 +0530
Subject: [PATCH 060/100] Update jenkinsfile-dockerpush

---
 jenkinsfile-dockerpush | 41 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/jenkinsfile-dockerpush b/jenkinsfile-dockerpush
index 8b137891..e198c745 100644
--- a/jenkinsfile-dockerpush
+++ b/jenkinsfile-dockerpush
@@ -1 +1,40 @@
-
+pipeline {
+    agent any
+    tools {
+        maven 'M2_HOME'
+    }
+    environment {
+        VERSION = "${env.BUILD_ID}"
+    }
+    stages {
+        stage('SCM checkout') {
+            steps {
+                checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
+            }
+        }
+        stage('Build war file'){
+            steps{
+                script{
+                    sh 'mvn clean package'
+                }
+            }
+        }
+        stage("docker build & docker push"){
+            steps{
+                script{
+                    withCredentials([string(credentialsId: 'dockerhub', variable: 'docker_password')]) {
+                             sh '''
+                                docker build -t sudhakarbastawade/demo:${VERSION} .
+                                docker login -u sudhakarbastawade -p $docker_password
+                                docker push sudhakarbastawade/demo:${VERSION}
+                                docker rmi sudhakarbastawade/demo:${VERSION}
+                            '''
+                    }
+                }
+            }
+        }
+        
+        
+        
+    }
+}

From 67b6e93fd8ee17cada60c839a8ac2827deded223 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Thu, 21 Sep 2023 16:50:43 +0530
Subject: [PATCH 061/100] Update HelloWorldApplication.java

---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index 5352ae1f..47e25e28 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "Hi, sudhakar here, testing github-web-hooks";
+        return "Hi, This is login service";
     }
 
 }

From d8bd19e7c636f0c8c33dd0a916038bea979145fd Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Thu, 21 Sep 2023 17:01:53 +0530
Subject: [PATCH 062/100] Update HelloWorldApplication.java

---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index 47e25e28..585a62ff 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "Hi, This is login service";
+        return "Hi, This is logout service";
     }
 
 }

From 4ed65f27813f6d1cfee79ed7dcd2b2484b36ab83 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sun, 1 Oct 2023 18:00:05 +0530
Subject: [PATCH 063/100] Update pom.xml

tsting webhook
---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index 5a690114..09632aa4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,3 +49,6 @@
 </project>
 
 
+
+
+

From 1501fd7a05b1fc2018a2546c0b2632debb27e5d9 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Mon, 2 Oct 2023 17:14:05 +0530
Subject: [PATCH 064/100] updated the code for demo

---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index 585a62ff..938f02cb 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "Hi, This is logout service";
+        return "Hi, welcome to cloud-clasess and  This is demo service";
     }
 
 }

From 01b5fbad58067640f75d0f7b2197f91c4e0c5017 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Mon, 2 Oct 2023 17:16:14 +0530
Subject: [PATCH 065/100] Update Jenkinsfile

---
 Jenkinsfile | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 6cb87134..2c3996c5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,35 +1,26 @@
 pipeline {
     agent any
+    
     tools {
         maven 'M2_HOME'
     }
+
     stages {
-        stage('SCM checkout') {
+        stage('git-checkout') {
             steps {
                 checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
             }
         }
-	stage('Sonar stage') {
-            steps {
-                echo "running sonar scan"
-		}
-        }
-        stage('build') {
+        stage('building-source-code') {
             steps {
-                sh 'mvn clean install'
+                sh 'mvn clean package'
             }
         }
-        stage('deploy') {
+        stage('deploy-to-tomcat') {
             steps {
-               deploy adapters: [tomcat9(credentialsId: 'tomcat9', path: '', url: 'http://65.1.1.251:8080')], contextPath: '/app', war: '**/*.war'
+                deploy adapters: [tomcat9(credentialsId: 'tomcat9', path: '', url: 'http://44.211.150.240:8080')], contextPath: '/app', war: '**/*.war'
             }
-        }    
-    }
-	post {
-          success {
-             mail to: devops.classes.online@gmail.com, subject: ‘The Pipeline success :(‘
+        }
     }
-  }
 }
 
-

From 45cab952d29d42e10535084a38f620abdb8fd187 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Mon, 2 Oct 2023 17:24:20 +0530
Subject: [PATCH 066/100] Delete Jenkinsfile

---
 Jenkinsfile | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 2c3996c5..00000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,26 +0,0 @@
-pipeline {
-    agent any
-    
-    tools {
-        maven 'M2_HOME'
-    }
-
-    stages {
-        stage('git-checkout') {
-            steps {
-                checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
-            }
-        }
-        stage('building-source-code') {
-            steps {
-                sh 'mvn clean package'
-            }
-        }
-        stage('deploy-to-tomcat') {
-            steps {
-                deploy adapters: [tomcat9(credentialsId: 'tomcat9', path: '', url: 'http://44.211.150.240:8080')], contextPath: '/app', war: '**/*.war'
-            }
-        }
-    }
-}
-

From 53532a67f9732d8091c538b4662157694f2df591 Mon Sep 17 00:00:00 2001
From: root <root@ip-172-31-58-102.ec2.internal>
Date: Mon, 2 Oct 2023 11:58:22 +0000
Subject: [PATCH 067/100] jnkinsfile

---
 jenkinsfile | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 jenkinsfile

diff --git a/jenkinsfile b/jenkinsfile
new file mode 100644
index 00000000..59627f8c
--- /dev/null
+++ b/jenkinsfile
@@ -0,0 +1,25 @@
+pipeline {
+    agent any
+    
+    tools {
+        maven 'M2_HOME'
+    }
+
+    stages {
+        stage('git-checkout') {
+            steps {
+                checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
+            }
+        }
+        stage('building-source-code') {
+            steps {
+                sh 'mvn clean package'
+            }
+        }
+        stage('deploy-to-tomcat') {
+            steps {
+                deploy adapters: [tomcat9(credentialsId: 'tomcat9', path: '', url: 'http://44.211.150.240:8080')], contextPath: '/app', war: '**/*.war'
+            }
+        }
+    }
+}

From 4df4497a0f440d0129fc290705b0f9920eb144ee Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Mon, 2 Oct 2023 17:44:00 +0530
Subject: [PATCH 068/100] Update jenkinsfile

---
 jenkinsfile | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 59627f8c..d777b160 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -11,9 +11,23 @@ pipeline {
                 checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
             }
         }
+        stage('Run Tests') {
+            parallel {
+                stage('sonar-scan') {
+                    steps {
+                        echo "sonar-scan-done"
+                    }    
+                }
+                stage('unit-test') {
+                    steps {
+                        echo "running unit test"
+                    }
+                }
+            }           
+        }
         stage('building-source-code') {
             steps {
-                sh 'mvn clean package'
+                  sh 'mvn clean package'
             }
         }
         stage('deploy-to-tomcat') {

From 9778f65accbd76e13df3383628ad6219d7bda2da Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Mon, 2 Oct 2023 17:53:35 +0530
Subject: [PATCH 069/100] Update jenkinsfile

---
 jenkinsfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index d777b160..766877b9 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -1,5 +1,7 @@
 pipeline {
-    agent any
+    agent {
+        label 'java'
+    }
     
     tools {
         maven 'M2_HOME'

From 70cf516cc718e0440036f6991dd3c3b948208454 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Thu, 5 Oct 2023 08:25:07 +0530
Subject: [PATCH 070/100] Update jenkinsfile with sonar stage

---
 jenkinsfile | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 766877b9..bd5b4167 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -13,28 +13,19 @@ pipeline {
                 checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
             }
         }
-        stage('Run Tests') {
-            parallel {
-                stage('sonar-scan') {
-                    steps {
-                        echo "sonar-scan-done"
-                    }    
-                }
-                stage('unit-test') {
-                    steps {
-                        echo "running unit test"
-                    }
-                }
-            }           
-        }
-        stage('building-source-code') {
-            steps {
-                  sh 'mvn clean package'
+         stage('Static Code Analysis') {
+          environment {
+                SONAR_URL = "http://54.237.75.66:9000"
+                  }
+          steps {
+                withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_AUTH_TOKEN')]) {
+                sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
             }
-        }
-        stage('deploy-to-tomcat') {
+          }
+        }        
+    stage('building-source-code') {
             steps {
-                deploy adapters: [tomcat9(credentialsId: 'tomcat9', path: '', url: 'http://44.211.150.240:8080')], contextPath: '/app', war: '**/*.war'
+                  sh 'mvn clean package'
             }
         }
     }

From d3921bd8a6b700739926a8e94df507c1a12ecfc8 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:01:04 +0530
Subject: [PATCH 071/100] Create jenkinsfile-k8s-deploy

---
 jenkinsfile-k8s-deploy | 77 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 jenkinsfile-k8s-deploy

diff --git a/jenkinsfile-k8s-deploy b/jenkinsfile-k8s-deploy
new file mode 100644
index 00000000..eeb48ab7
--- /dev/null
+++ b/jenkinsfile-k8s-deploy
@@ -0,0 +1,77 @@
+pipeline {
+    agent any
+    tools {
+       maven 'M2_HOME'
+    }
+    environment{
+        VERSION = "${env.BUILD_ID}"
+    }
+    stages {
+        stage('pull source code') {
+            steps {
+                checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
+            }
+        }
+        stage('Build') {
+            steps {
+                sh 'mvn clean package'
+            }
+        }
+        stage('Static Code Analysis') {
+            environment {
+            SONAR_URL = "http://52.205.251.40:9000"
+            }
+            steps {
+                script {
+                    // withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_AUTH_TOKEN')]) {
+                       withSonarQubeEnv(credentialsId: 'sonar-token') {
+                        sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
+                    }
+                    timeout(time: 1, unit: 'HOURS') {
+                        def qg = waitForQualityGate()
+                        if (qg.status != 'OK') {
+                            error "Pipeline aborted due to quality gate failure: ${qg.status}"
+                        }
+                    }
+                }
+            }
+        }
+        stage("docker build & docker push"){
+            steps{
+                script{
+                    withCredentials([string(credentialsId: 'docker', variable: 'docker_password')]) {
+                             sh '''
+                                docker build -t sudhakarbastawade/helm-deploy:${VERSION} .
+                                docker login -u sudhakarbastawade -p $docker_password
+                                docker push sudhakarbastawade/helm-deploy:${VERSION}
+                                docker rmi sudhakarbastawade/helm-deploy:${VERSION}
+                            '''
+                    }
+                }
+            }
+        }
+        stage('manual approval'){
+            steps{
+                script{
+                    timeout(10) {
+                        mail bcc: '', body: "<br>Project: ${env.JOB_NAME} <br>Build Number: ${env.BUILD_NUMBER} <br> Go to build url and approve the deployment request <br> URL de build: ${env.BUILD_URL}", cc: '', charset: 'UTF-8', from: '', mimeType: 'text/html', replyTo: '', subject: "${currentBuild.result} CI: Project name -> ${env.JOB_NAME}", to: "devops.classes.online@gmail.com";  
+                        input(message: "Deploy ${params.project_name}?", ok: 'Deploy')
+                    }
+                }
+            }
+        }
+        stage('Deploying application on k8s cluster') {
+            steps {
+              script{
+                  // withCredentials([kubeconfigFile(credentialsId: 'kubeconfig', variable: 'KUBECONFIG')]) {
+		       withCredentials([file(credentialsId: 'kubeconfig', variable: 'KUBECONFIG')]) {
+		       dir('kubernetes/') {
+                          sh 'helm upgrade --install --set image.repository="sudhakarbastawade/helm-deploy" --set image.tag="${VERSION}" myjavaapp myapp/ ' 
+                        }
+                    }
+              }
+            }
+        }
+        
+    }
+}

From cfb65de955affd0c3e0f720d44e2879554fd956d Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Mon, 27 Nov 2023 18:18:25 +0530
Subject: [PATCH 072/100] Update service.yaml

---
 kubernetes/myapp/templates/service.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kubernetes/myapp/templates/service.yaml b/kubernetes/myapp/templates/service.yaml
index 1f732009..e6c43e75 100644
--- a/kubernetes/myapp/templates/service.yaml
+++ b/kubernetes/myapp/templates/service.yaml
@@ -8,8 +8,8 @@ spec:
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: http
+      targetPort: 8080
       protocol: TCP
       name: http
   selector:
-    {{- include "myapp.selectorLabels" . | nindent 4 }}
\ No newline at end of file
+    {{- include "myapp.selectorLabels" . | nindent 4 }}

From 9efd4c94e1b76c064ea9e75182861340bb04a0ac Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Thu, 30 Nov 2023 07:47:27 +0530
Subject: [PATCH 073/100] Update values.yaml

---
 kubernetes/myapp/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/myapp/values.yaml b/kubernetes/myapp/values.yaml
index affdb4ca..962fb3a0 100644
--- a/kubernetes/myapp/values.yaml
+++ b/kubernetes/myapp/values.yaml
@@ -12,4 +12,4 @@ image:
 
 service:
   type: NodePort
-  port: 8080
+  port: 80

From 22a78e5da2e3978faea0a722bd0aeda4bcc303ad Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Fri, 1 Dec 2023 07:22:38 +0530
Subject: [PATCH 074/100] Update HelloWorldApplication.java

---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index 938f02cb..05ba8451 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "Hi, welcome to cloud-clasess and  This is demo service";
+        return "Hi, welcome to cloud-clasess and  This is demo on CICD";
     }
 
 }

From a7104d8f0ff15763f18e468027c0e0c6375e3bc0 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Thu, 11 Jan 2024 18:18:19 +0530
Subject: [PATCH 075/100] Update Readme.md

---
 Readme.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Readme.md b/Readme.md
index 4848b8ee..dc49c7bc 100644
--- a/Readme.md
+++ b/Readme.md
@@ -10,3 +10,5 @@
 - cp -rvf target/hello-world-0.0.1-SNAPSHOT.war /var/lib/tomcat9/webapps/app.war
 - testing webhook
 testing weghook
+
+demo

From fc0aea34001767d109aab194a2b9b7ce98f2e168 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Thu, 11 Jan 2024 19:19:13 +0530
Subject: [PATCH 076/100] Update HelloWorldApplication.java

---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index 05ba8451..241549e0 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "Hi, welcome to cloud-clasess and  This is demo on CICD";
+        return "Hi, welcome to cloud-clasess, Today we deployed on TOMCAT";
     }
 
 }

From 8e7deeca71f08b14171a34d88dfdc7c31821c891 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Mon, 15 Jan 2024 19:02:14 +0530
Subject: [PATCH 077/100] Update Readme.md

---
 Readme.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index dc49c7bc..8a8a4130 100644
--- a/Readme.md
+++ b/Readme.md
@@ -11,4 +11,3 @@
 - testing webhook
 testing weghook
 
-demo

From 6d11a1fb53c86ec9380acb05cf925316eb99cf39 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Mon, 15 Jan 2024 19:03:18 +0530
Subject: [PATCH 078/100] Update Readme.md

---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index 8a8a4130..2a471e30 100644
--- a/Readme.md
+++ b/Readme.md
@@ -11,3 +11,4 @@
 - testing webhook
 testing weghook
 
+testing github web hook

From 45a94323d4eaf44854c5ad9efee80ce1ecd5d981 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 16 Jan 2024 18:50:23 +0530
Subject: [PATCH 079/100] Update jenkinsfile

---
 jenkinsfile | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index bd5b4167..87a1c7f0 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -1,10 +1,8 @@
 pipeline {
-    agent {
-        label 'java'
-    }
+    agent any
     
     tools {
-        maven 'M2_HOME'
+        maven 'maven'
     }
 
     stages {
@@ -13,20 +11,25 @@ pipeline {
                 checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
             }
         }
-         stage('Static Code Analysis') {
-          environment {
-                SONAR_URL = "http://54.237.75.66:9000"
+        # stage('Static Code Analysis') {
+         # environment {
+          #      SONAR_URL = "http://54.237.75.66:9000"
                   }
-          steps {
-                withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_AUTH_TOKEN')]) {
-                sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
-            }
-          }
-        }        
+         # steps {
+         #       withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_AUTH_TOKEN')]) {
+         #       sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
+         #   }
+        #  }
+      #  }        
     stage('building-source-code') {
             steps {
                   sh 'mvn clean package'
             }
         }
+ stage('deploy to tomcat') {
+            steps {
+                  deploy adapters: [tomcat9(credentialsId: 'tomcat9-server', path: '', url: 'http://13.233.62.73:8080')], contextPath: '/app', war: '**/*.war'
+            }
+        }
     }
 }

From 0f2b3f318fad81916f36dc22a2d5f658100de271 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 16 Jan 2024 18:52:17 +0530
Subject: [PATCH 080/100] Update jenkinsfile

---
 jenkinsfile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 87a1c7f0..0722fc14 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -11,16 +11,16 @@ pipeline {
                 checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
             }
         }
-        # stage('Static Code Analysis') {
-         # environment {
-          #      SONAR_URL = "http://54.237.75.66:9000"
-                  }
-         # steps {
-         #       withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_AUTH_TOKEN')]) {
-         #       sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
-         #   }
-        #  }
-      #  }        
+        #stage('Static Code Analysis') {
+         #environment {
+                #SONAR_URL = "http://54.237.75.66:9000"
+                 #}
+          #steps {
+               #withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_AUTH_TOKEN')]) {
+                #sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
+            #}
+          #}
+        #}        
     stage('building-source-code') {
             steps {
                   sh 'mvn clean package'

From 26517603ccb26aee525057fa2efe7c14d7d1e137 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 16 Jan 2024 18:54:05 +0530
Subject: [PATCH 081/100] Update jenkinsfile

---
 jenkinsfile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 0722fc14..045d2712 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -11,16 +11,16 @@ pipeline {
                 checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
             }
         }
-        #stage('Static Code Analysis') {
-         #environment {
-                #SONAR_URL = "http://54.237.75.66:9000"
-                 #}
-          #steps {
-               #withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_AUTH_TOKEN')]) {
-                #sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
-            #}
-          #}
-        #}        
+        //stage('Static Code Analysis') {
+         //environment {
+                //SONAR_URL = "http://54.237.75.66:9000"
+                 //}
+          //steps {
+               //withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_AUTH_TOKEN')]) {
+                //sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
+            //}
+          //}
+        //}        
     stage('building-source-code') {
             steps {
                   sh 'mvn clean package'

From 38d7b154f397908e2f615c9ab5a1346a7a0b1e39 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 16 Jan 2024 19:00:12 +0530
Subject: [PATCH 082/100] Update jenkinsfile

---
 jenkinsfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jenkinsfile b/jenkinsfile
index 045d2712..e29299a2 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -1,5 +1,7 @@
 pipeline {
-    agent any
+    agent {
+        label 'java'
+    }
     
     tools {
         maven 'maven'

From 10e375d9a7f3c9847444f65c59b141305b9e58b3 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 16 Jan 2024 20:17:47 +0530
Subject: [PATCH 083/100] Update jenkinsfile

---
 jenkinsfile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index e29299a2..fa11e79c 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -13,16 +13,16 @@ pipeline {
                 checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
             }
         }
-        //stage('Static Code Analysis') {
-         //environment {
-                //SONAR_URL = "http://54.237.75.66:9000"
-                 //}
-          //steps {
-               //withCredentials([string(credentialsId: 'sonar-token', variable: 'SONAR_AUTH_TOKEN')]) {
-                //sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
-            //}
-          //}
-        //}        
+        stage('Static Code Analysis') {
+             environment {
+                SONAR_URL = "http://13.201.115.32:9000"
+                }
+              steps {
+                   withCredentials([string(credentialsId: 'sonar', variable: 'SONAR_AUTH_TOKEN')]) {
+                   sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
+            }
+          }
+        }        
     stage('building-source-code') {
             steps {
                   sh 'mvn clean package'

From 1c18adce8ba09d19b51d644efd3dd4a80e294fbf Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Tue, 16 Jan 2024 20:22:31 +0530
Subject: [PATCH 084/100] Update Readme.md

---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index 2a471e30..b021d87e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -12,3 +12,4 @@
 testing weghook
 
 testing github web hook
+ghfvgfvgvgvgv

From b056e03ceb06edc189d414d0ae5b7acf911841c0 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 20 Jan 2024 18:26:28 +0530
Subject: [PATCH 085/100] Update jenkinsfile

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

diff --git a/jenkinsfile b/jenkinsfile
index fa11e79c..dd0601f1 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -15,7 +15,7 @@ pipeline {
         }
         stage('Static Code Analysis') {
              environment {
-                SONAR_URL = "http://13.201.115.32:9000"
+                SONAR_URL = "http://65.2.11.163:9000"
                 }
               steps {
                    withCredentials([string(credentialsId: 'sonar', variable: 'SONAR_AUTH_TOKEN')]) {

From da3682cebfc61a49cac2ac8de333528245f6925e Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 20 Jan 2024 18:35:59 +0530
Subject: [PATCH 086/100] Update jenkinsfile-dockerpush

---
 jenkinsfile-dockerpush | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/jenkinsfile-dockerpush b/jenkinsfile-dockerpush
index e198c745..d58ecac1 100644
--- a/jenkinsfile-dockerpush
+++ b/jenkinsfile-dockerpush
@@ -12,6 +12,16 @@ pipeline {
                 checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
             }
         }
+        stage('Static Code Analysis') {
+             environment {
+                SONAR_URL = "http://65.2.11.163:9000"
+                }
+              steps {
+                   withCredentials([string(credentialsId: 'sonar', variable: 'SONAR_AUTH_TOKEN')]) {
+                   sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
+            }
+          }
+        }    
         stage('Build war file'){
             steps{
                 script{
@@ -24,9 +34,9 @@ pipeline {
                 script{
                     withCredentials([string(credentialsId: 'dockerhub', variable: 'docker_password')]) {
                              sh '''
-                                docker build -t sudhakarbastawade/demo:${VERSION} .
+                                docker build -t sudhakarbastawade/testapp:${VERSION} .
                                 docker login -u sudhakarbastawade -p $docker_password
-                                docker push sudhakarbastawade/demo:${VERSION}
+                                docker push sudhakarbastawade/testapp:${VERSION}
                                 docker rmi sudhakarbastawade/demo:${VERSION}
                             '''
                     }

From bb9b940fd44ffc3ca4445a91a4650c7036b99e66 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 20 Jan 2024 18:40:49 +0530
Subject: [PATCH 087/100] Update jenkinsfile-dockerpush

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

diff --git a/jenkinsfile-dockerpush b/jenkinsfile-dockerpush
index d58ecac1..5489e454 100644
--- a/jenkinsfile-dockerpush
+++ b/jenkinsfile-dockerpush
@@ -1,7 +1,7 @@
 pipeline {
     agent any
     tools {
-        maven 'M2_HOME'
+        maven 'maven'
     }
     environment {
         VERSION = "${env.BUILD_ID}"

From 06e94d7cb0b73b934a27a10ba87a36e0a08e5b0a Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 20 Jan 2024 18:49:19 +0530
Subject: [PATCH 088/100] Update jenkinsfile-dockerpush

---
 jenkinsfile-dockerpush | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jenkinsfile-dockerpush b/jenkinsfile-dockerpush
index 5489e454..c62bf399 100644
--- a/jenkinsfile-dockerpush
+++ b/jenkinsfile-dockerpush
@@ -35,9 +35,9 @@ pipeline {
                     withCredentials([string(credentialsId: 'dockerhub', variable: 'docker_password')]) {
                              sh '''
                                 docker build -t sudhakarbastawade/testapp:${VERSION} .
-                                docker login -u sudhakarbastawade -p $docker_password
+                                docker login -u sudhakarbastawade --password-stdin $docker_password
                                 docker push sudhakarbastawade/testapp:${VERSION}
-                                docker rmi sudhakarbastawade/demo:${VERSION}
+                                docker rmi sudhakarbastawade/testapp:${VERSION}
                             '''
                     }
                 }

From afba6c10bd4acada3a27b98a95b4b24bdbe830c0 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 20 Jan 2024 18:56:26 +0530
Subject: [PATCH 089/100] Update jenkinsfile-dockerpush

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

diff --git a/jenkinsfile-dockerpush b/jenkinsfile-dockerpush
index c62bf399..f1d63b78 100644
--- a/jenkinsfile-dockerpush
+++ b/jenkinsfile-dockerpush
@@ -35,7 +35,7 @@ pipeline {
                     withCredentials([string(credentialsId: 'dockerhub', variable: 'docker_password')]) {
                              sh '''
                                 docker build -t sudhakarbastawade/testapp:${VERSION} .
-                                docker login -u sudhakarbastawade --password-stdin $docker_password
+                                docker login -u sudhakarbastawade --password-stdin ${docker_password}
                                 docker push sudhakarbastawade/testapp:${VERSION}
                                 docker rmi sudhakarbastawade/testapp:${VERSION}
                             '''

From c731a5d83f02fa7002c24a83b83f5959452b7ecd Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 20 Jan 2024 18:57:01 +0530
Subject: [PATCH 090/100] Update jenkinsfile-dockerpush

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

diff --git a/jenkinsfile-dockerpush b/jenkinsfile-dockerpush
index f1d63b78..97100591 100644
--- a/jenkinsfile-dockerpush
+++ b/jenkinsfile-dockerpush
@@ -35,7 +35,7 @@ pipeline {
                     withCredentials([string(credentialsId: 'dockerhub', variable: 'docker_password')]) {
                              sh '''
                                 docker build -t sudhakarbastawade/testapp:${VERSION} .
-                                docker login -u sudhakarbastawade --password-stdin ${docker_password}
+                                docker login -u sudhakarbastawade -p ${docker_password}
                                 docker push sudhakarbastawade/testapp:${VERSION}
                                 docker rmi sudhakarbastawade/testapp:${VERSION}
                             '''

From 60fd1124952538b0f65bb6cf0f469bf0db6bde7c Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 20 Jan 2024 19:00:21 +0530
Subject: [PATCH 091/100] Update jenkinsfile-dockerpush

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

diff --git a/jenkinsfile-dockerpush b/jenkinsfile-dockerpush
index 97100591..c56934cc 100644
--- a/jenkinsfile-dockerpush
+++ b/jenkinsfile-dockerpush
@@ -35,7 +35,7 @@ pipeline {
                     withCredentials([string(credentialsId: 'dockerhub', variable: 'docker_password')]) {
                              sh '''
                                 docker build -t sudhakarbastawade/testapp:${VERSION} .
-                                docker login -u sudhakarbastawade -p ${docker_password}
+                                docker login -u sudhakarbastawade --password-stdin. ${docker_password}
                                 docker push sudhakarbastawade/testapp:${VERSION}
                                 docker rmi sudhakarbastawade/testapp:${VERSION}
                             '''

From 5c5dd87f4f8a5dd6621b368bec0d35e3652f276b Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 20 Jan 2024 19:03:32 +0530
Subject: [PATCH 092/100] Update jenkinsfile-dockerpush

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

diff --git a/jenkinsfile-dockerpush b/jenkinsfile-dockerpush
index c56934cc..97100591 100644
--- a/jenkinsfile-dockerpush
+++ b/jenkinsfile-dockerpush
@@ -35,7 +35,7 @@ pipeline {
                     withCredentials([string(credentialsId: 'dockerhub', variable: 'docker_password')]) {
                              sh '''
                                 docker build -t sudhakarbastawade/testapp:${VERSION} .
-                                docker login -u sudhakarbastawade --password-stdin. ${docker_password}
+                                docker login -u sudhakarbastawade -p ${docker_password}
                                 docker push sudhakarbastawade/testapp:${VERSION}
                                 docker rmi sudhakarbastawade/testapp:${VERSION}
                             '''

From 60dc63c00d9e574ad3976204a4f19893f364a1eb Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 11 May 2024 19:00:30 +0530
Subject: [PATCH 093/100] Update pom.xml

edited for testing
---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 09632aa4..179dfd0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,8 +47,3 @@
 
   
 </project>
-
-
-
-
-

From f8ce3126614e5075ff4e6db1fd39701d6b6ba8ee Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sat, 11 May 2024 19:14:09 +0530
Subject: [PATCH 094/100] Update HelloWorldApplication.java

---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index 241549e0..394d082b 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "Hi, welcome to cloud-clasess, Today we deployed on TOMCAT";
+        return "Hi, welcome to cloud-clasess, Today we deployed on Test server";
     }
 
 }

From a2d0b337d2fca2dd752a062a22dae5bab2e45bbb Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303 <sudhakarbastawade2303@gmail.com>
Date: Wed, 28 Aug 2024 08:29:44 +0530
Subject: [PATCH 095/100] updated java code on helloworldapplication.java

---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index 394d082b..e0260cf1 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "Hi, welcome to cloud-clasess, Today we deployed on Test server";
+        return "Hi, welcome to cloud-clasess, Today we deployed on Tomcat server";
     }
 
 }

From f7c736a196485e18283a3c54dccefb48b9763916 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303 <sudhakarbastawade2303@gmail.com>
Date: Wed, 28 Aug 2024 09:06:37 +0530
Subject: [PATCH 096/100] testing webhooks

---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index e0260cf1..21fa2fb4 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "Hi, welcome to cloud-clasess, Today we deployed on Tomcat server";
+        return "Hi,testing webhooks,  welcome to cloud-clasess, Today we deployed on Tomcat server";
     }
 
 }

From afdb6968446d253d99f713562052803358b16a03 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Fri, 20 Sep 2024 08:43:10 +0530
Subject: [PATCH 097/100] Update jenkinsfile-dockerpush

---
 jenkinsfile-dockerpush | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/jenkinsfile-dockerpush b/jenkinsfile-dockerpush
index 97100591..807ecba6 100644
--- a/jenkinsfile-dockerpush
+++ b/jenkinsfile-dockerpush
@@ -12,16 +12,16 @@ pipeline {
                 checkout scmGit(branches: [[name: '*/master']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/sudhakarbastawade2303/spring-boot-war-example.git']])
             }
         }
-        stage('Static Code Analysis') {
-             environment {
-                SONAR_URL = "http://65.2.11.163:9000"
-                }
-              steps {
-                   withCredentials([string(credentialsId: 'sonar', variable: 'SONAR_AUTH_TOKEN')]) {
-                   sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
-            }
-          }
-        }    
+        // stage('Static Code Analysis') {
+        //      environment {
+        //         SONAR_URL = "http://65.2.11.163:9000"
+        //         }
+        //       steps {
+        //           withCredentials([string(credentialsId: 'sonar', variable: 'SONAR_AUTH_TOKEN')]) {
+        //           sh 'mvn sonar:sonar -Dsonar.login=$SONAR_AUTH_TOKEN -Dsonar.host.url=${SONAR_URL}'
+        //     }
+        //   }
+        // }    
         stage('Build war file'){
             steps{
                 script{

From 38a6b33a55e624dc51022e2fea1b921a29a5da58 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303
 <112871403+sudhakarbastawade2303@users.noreply.github.com>
Date: Sun, 22 Dec 2024 10:56:13 +0530
Subject: [PATCH 098/100] Update values.yaml

---
 kubernetes/myapp/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kubernetes/myapp/values.yaml b/kubernetes/myapp/values.yaml
index 962fb3a0..44203b0d 100644
--- a/kubernetes/myapp/values.yaml
+++ b/kubernetes/myapp/values.yaml
@@ -2,7 +2,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-replicaCount: 5
+replicaCount: 2
 
 image:
   repository: IMAGE_NAME

From f7afccafc0645432e0cf4a93c6fa7e2f9f49e3de Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303 <sudhakarbastawade2303@gmail.com>
Date: Wed, 29 Jan 2025 07:29:12 +0530
Subject: [PATCH 099/100] testing

---
 pom.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 179dfd0b..63ed7523 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,5 @@
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
     </plugins>
-  </build>
-
-  
+  </build> 
 </project>

From 58686c311595af116897322c3322afb60cc80103 Mon Sep 17 00:00:00 2001
From: sudhakarbastawade2303 <sudhakarbastawade2303@gmail.com>
Date: Mon, 1 Sep 2025 08:32:15 +0530
Subject: [PATCH 100/100] testing

---
 .../com/springhow/example/helloworld/HelloWorldApplication.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
index 21fa2fb4..3fb47b81 100644
--- a/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
+++ b/src/main/java/com/springhow/example/helloworld/HelloWorldApplication.java
@@ -23,7 +23,7 @@ public static void main(String[] args) {
 
     @RequestMapping("/")
     String helloWorld() {
-        return "Hi,testing webhooks,  welcome to cloud-clasess, Today we deployed on Tomcat server";
+        return "welcome to cloud-clasess";
     }
 
 }