From 4d1f07d936ed4b7dd367a88c98565fcebcd62bbf Mon Sep 17 00:00:00 2001
From: root <root@ip-172-31-16-218.ec2.internal>
Date: Fri, 12 Jan 2024 11:11:58 +0000
Subject: [PATCH 01/10] Code modified no 1

---
 webapp/src/main/webapp/index.jsp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index 987199eb..21d585c8 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -1,6 +1,3 @@
 <h1> Hello Dear Students !!, Welcome to DevOps Project-2 !! </h1>
 <h2> By Mr.Hari from Saidemy </h2>
 <h2> It's time to start the DevOps Project-2!! Get ready!! </h2>
-<h2> This is what complete End-to-End CI-CD pipeline devops project!! </h2>
-<h2> We are done with Ansible Deployment in Project-2 </h2>
-<h2> We are done with Docker Deployment!!! </h2>

From 378d3452f877af115f904fd2fee86f97f2d55eb6 Mon Sep 17 00:00:00 2001
From: Pravinmakula <pravindevops5@gmail.com>
Date: Sat, 13 Jan 2024 03:11:31 +0000
Subject: [PATCH 02/10] Code modified no 2

---
 webapp/src/main/webapp/index.jsp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index 21d585c8..aa2a43f7 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -1,3 +1,4 @@
 <h1> Hello Dear Students !!, Welcome to DevOps Project-2 !! </h1>
 <h2> By Mr.Hari from Saidemy </h2>
 <h2> It's time to start the DevOps Project-2!! Get ready!! </h2>
+<h2> Line 4 added on Jan 13 2024 </h2>

From e2866545203c8eea8e6978a8e0677f3516d703e5 Mon Sep 17 00:00:00 2001
From: Pravinmakula <pravindevops5@gmail.com>
Date: Sat, 13 Jan 2024 08:29:23 +0000
Subject: [PATCH 03/10] Code modified

---
 webapp/src/main/webapp/index.jsp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index aa2a43f7..d77c09a9 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -2,3 +2,4 @@
 <h2> By Mr.Hari from Saidemy </h2>
 <h2> It's time to start the DevOps Project-2!! Get ready!! </h2>
 <h2> Line 4 added on Jan 13 2024 </h2>
+<h2> Line 5 added </h2>

From 5219c8294ffbca057ced9ac20f1e3a75dfded0d7 Mon Sep 17 00:00:00 2001
From: root <root@ip-172-31-43-217.ap-south-1.compute.internal>
Date: Sun, 28 Apr 2024 15:51:43 +0000
Subject: [PATCH 04/10] code committed

---
 webapp/src/main/webapp/index.jsp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index d77c09a9..21d585c8 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -1,5 +1,3 @@
 <h1> Hello Dear Students !!, Welcome to DevOps Project-2 !! </h1>
 <h2> By Mr.Hari from Saidemy </h2>
 <h2> It's time to start the DevOps Project-2!! Get ready!! </h2>
-<h2> Line 4 added on Jan 13 2024 </h2>
-<h2> Line 5 added </h2>

From fb12523d2d9aabd50fa4da703d547049dc93fb53 Mon Sep 17 00:00:00 2001
From: PravinMakula <147311156+PravinMakula@users.noreply.github.com>
Date: Wed, 29 May 2024 09:51:10 +0530
Subject: [PATCH 05/10] Create Test123

---
 Test123 | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 Test123

diff --git a/Test123 b/Test123
new file mode 100644
index 00000000..b8fad2c6
--- /dev/null
+++ b/Test123
@@ -0,0 +1,2 @@
+Test file please ignore 
+Delete after testing

From 6bf0e3856ccc7548ed8ee8906d8087a81010bdc0 Mon Sep 17 00:00:00 2001
From: PravinMakula <147311156+PravinMakula@users.noreply.github.com>
Date: Wed, 29 May 2024 09:52:12 +0530
Subject: [PATCH 06/10] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8196d201..47eedbab 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # maven-project
 
-Simple Maven Project
+Simple Maven Project.

From a8ab46c2f5ed87c0ce375301a54af2d5bfe699c6 Mon Sep 17 00:00:00 2001
From: PravinMakula <pravindevops5@gmail.com>
Date: Fri, 19 Jul 2024 13:46:13 +0000
Subject: [PATCH 07/10] Code modified

---
 webapp/src/main/webapp/index.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index 21d585c8..0cabb979 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -1,3 +1,3 @@
 <h1> Hello Dear Students !!, Welcome to DevOps Project-2 !! </h1>
-<h2> By Mr.Hari from Saidemy </h2>
+<h2> By Mr.Pravin from MyAcademy </h2>
 <h2> It's time to start the DevOps Project-2!! Get ready!! </h2>

From 7f4d9a92b420aecfc845121392a4bfcabd77342e Mon Sep 17 00:00:00 2001
From: root <root@ip-172-31-45-45.ap-south-1.compute.internal>
Date: Mon, 22 Jul 2024 04:30:57 +0000
Subject: [PATCH 08/10] modified

---
 webapp/src/main/webapp/index.jsp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index 0cabb979..5ddd6959 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -1,3 +1,4 @@
 <h1> Hello Dear Students !!, Welcome to DevOps Project-2 !! </h1>
 <h2> By Mr.Pravin from MyAcademy </h2>
 <h2> It's time to start the DevOps Project-2!! Get ready!! </h2>
+<h2> Testing /<h2>

From 15c9cde698c14bb12f7aade5b1077a3bc965d502 Mon Sep 17 00:00:00 2001
From: Pravinmakula <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>
Date: Mon, 20 Jan 2025 07:25:24 +0000
Subject: [PATCH 09/10] index file commited

---
 webapp/src/main/webapp/index.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp
index 5ddd6959..c2a6d2ec 100644
--- a/webapp/src/main/webapp/index.jsp
+++ b/webapp/src/main/webapp/index.jsp
@@ -1,4 +1,4 @@
-<h1> Hello Dear Students !!, Welcome to DevOps Project-2 !! </h1>
+<h1> Hello Dear Students !!, Welcome to DevOps Project-2 Jan-2025 !! </h1>
 <h2> By Mr.Pravin from MyAcademy </h2>
 <h2> It's time to start the DevOps Project-2!! Get ready!! </h2>
 <h2> Testing /<h2>

From 34310b01d24d6d8eed2dd88c74a108ee0dfbc7c8 Mon Sep 17 00:00:00 2001
From: PravinMakula <147311156+PravinMakula@users.noreply.github.com>
Date: Tue, 21 Jan 2025 23:27:04 +0530
Subject: [PATCH 10/10] Update pom.xml

---
 webapp/pom.xml | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/webapp/pom.xml b/webapp/pom.xml
index 7a46c58d..2ce9a540 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -15,28 +15,50 @@
   <name>Webapp</name>
   <description>Webapp.</description>
 
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+  </properties>
+
   <build>
     <finalName>${project.artifactId}</finalName>
 
     <plugins>
+      <!-- Maven Compiler Plugin -->
       <plugin>
-        <groupId>org.mortbay.jetty</groupId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.10.1</version>
+        <configuration>
+          <source>${maven.compiler.source}</source>
+          <target>${maven.compiler.target}</target>
+        </configuration>
+      </plugin>
+
+      <!-- Jetty Maven Plugin -->
+      <plugin>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
+        <version>11.0.15</version>
       </plugin>
     </plugins>
   </build>
 
   <dependencies>
-
+    <!-- Servlet API -->
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>5.0.0</version>
       <scope>provided</scope>
     </dependency>
 
+    <!-- JSP API -->
     <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
+      <groupId>jakarta.servlet.jsp</groupId>
+      <artifactId>jakarta.servlet.jsp-api</artifactId>
+      <version>3.0.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>