From b39e25f1e04baa86d019cbc43a09f707d8349285 Mon Sep 17 00:00:00 2001
From: Suhas S Gaviyappanavar <117796656+suhassg25@users.noreply.github.com>
Date: Sat, 31 Jan 2026 12:23:27 +0530
Subject: [PATCH 1/4] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index 6bebf532..33ad5925 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.edurekademo.tutorial</groupId>
     <artifactId>addressbook</artifactId>
     <packaging>war</packaging>
-    <version>2.0</version>
+    <version>3.4</version>
     <name>Vaadin Addressbook example</name>
 
     <properties>

From d3c5fdeb07cc504cd11ebc3184c5af844b52a0c3 Mon Sep 17 00:00:00 2001
From: Suhas S Gaviyappanavar <117796656+suhassg25@users.noreply.github.com>
Date: Sat, 31 Jan 2026 12:29:53 +0530
Subject: [PATCH 2/4] Change servlet scope to provided and add maven-war-plugin

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

diff --git a/pom.xml b/pom.xml
index 33ad5925..fa03adac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <version>3.0.1</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <!-- The huge set of awesome Java libraries are available as such 
             for Vaadin developers, you should take the advantage of those. In this app 
@@ -191,7 +191,14 @@
 					</excludes>
 				</configuration>
 			</plugin>
-
+	<plugin>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-war-plugin</artifactId>
+    <version>3.4.0</version>
+    <configuration>
+        <failOnMissingWebXml>false</failOnMissingWebXml>
+    </configuration>
+</plugin>
         </plugins>
 		<finalName>addressbook</finalName>
     </build>

From f1d25a66e36211af759b701e807aa704f21a0fcc Mon Sep 17 00:00:00 2001
From: Suhas S Gaviyappanavar <117796656+suhassg25@users.noreply.github.com>
Date: Thu, 5 Mar 2026 10:52:54 +0530
Subject: [PATCH 3/4] Update Dockerfile to use latest Tomcat image

---
 Dockerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4324eba4..543e95d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,3 @@
-# test
-FROM bitnami/tomcat
+FROM bitnami/tomcat:latest
 ENV ALLOW_EMPTY_PASSWORD=yes
-COPY addressbook.war /opt/bitnami/tomcat/webapps_default/addressbook.war
+COPY target/*.war /opt/bitnami/tomcat/webapps_default/addressbook.war

From cf1b774a808d3077de099d98b1107cfa67461636 Mon Sep 17 00:00:00 2001
From: Suhas S Gaviyappanavar <117796656+suhassg25@users.noreply.github.com>
Date: Thu, 5 Mar 2026 10:55:38 +0530
Subject: [PATCH 4/4] Refactor Jenkinsfile for Docker image build and push

---
 Jenkinsfile | 73 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 64 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 57caa9d7..5a263977 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,20 +1,75 @@
 pipeline {
     agent any
+
+    environment {
+        GIT_REPO = 'https://github.com/suhassg25/addressbook.git'
+        AWS_REGION = 'ap-south-1'
+        ECR_REPO_NAME = 'sample/jenkinspush'
+        ECR_PUBLIC_REPO_URI = '409171460696.dkr.ecr.ap-south-1.amazonaws.com/sample/jenkinspush'
+        IMAGE_TAG = 'latest'
+        AWS_ACCOUNT_ID = '409171460696'
+        IMAGE_URI = "${ECR_PUBLIC_REPO_URI}:${IMAGE_TAG}"
+    }
+
     stages {
-        stage('Compile') {
-            steps { 
-                sh 'mvn compile'
+        stage('Clone Repository') {
+            steps {
+                git url: "${GIT_REPO}", branch: 'master'
+            }
+        }
+
+        stage('Build') {
+            steps {
+                script {
+                    sh '''
+                        echo "Building Java application..."
+                        mvn clean -B -Denforcer.skip=true package
+                    '''
+                }
+            }
+        }
+
+        stage('Login to AWS ECR') {
+            steps {
+                script {
+                    sh '''
+                        echo "Logging into AWS ECR..."
+                        aws ecr get-login-password --region ap-south-1 \
+                        | docker login --username AWS --password-stdin 409171460696.dkr.ecr.ap-south-1.amazonaws.com
+                    '''
+                }
             }
         }
-        stage('test') {
-            steps { 
-                sh 'mvn test'
+
+        stage('Build Docker Image') {
+            steps {
+                script {
+                    sh '''
+                        echo "Building Docker image..."
+                        docker build -t ${IMAGE_URI} .
+                    '''
+                }
             }
         }
-        stage('package') {
-            steps { 
-                sh 'mvn package'
+
+        stage('Push Docker Image to ECR') {
+            steps {
+                script {
+                    sh '''
+                        echo "Pushing Docker image to ECR..."
+                        docker push ${IMAGE_URI}
+                    '''
+                }
             }
         }
     }
+    
+    post {
+        success {
+            echo "Docker image pushed to ECR successfully and deployed."
+        }
+        failure {
+            echo "Pipeline failed."
+        }
+    }
 }