From 37b05b8f8531752f44b9296b3683917bafbeb575 Mon Sep 17 00:00:00 2001 From: Saikiran7948 <67984395+Saikiran7948@users.noreply.github.com> Date: Sun, 27 Jul 2025 18:16:52 -0500 Subject: [PATCH 01/16] Update pom.xml --- pom.xml | 121 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 73 insertions(+), 48 deletions(-) diff --git a/pom.xml b/pom.xml index 08a12c31d2..53f12afe0c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,49 +1,74 @@ - - 4.0.0 - in.javahome - myweb - war - 8.2.0 - Java Home myweb - http://maven.apache.org - - - kammana - http://18.181.164.81:9000/ - - - - - - - junit - junit - 3.8.1 - test - - - - - - - nexusRepo - http://54.178.74.89:8081/repository/sample-snapshots/ - - - - nexusRepo - http://54.178.74.89:8081/repository/sample-releases/ - - - - - - maven1 - Maven.org - http://repo1.maven.org/maven2 - - - - + + + 4.0.0 + in.javahome + myweb + war + 8.2.0 + Java Home myweb + http://maven.apache.org + + + 11 + 11 + UTF-8 + kammana + http://18.181.164.81:9000/ + + + + + junit + junit + 3.8.1 + test + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + ${maven.compiler.source} + ${maven.compiler.target} + + + + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + false + + + + + + + + nexusRepo + http://54.178.74.89:8081/repository/sample-snapshots/ + + + nexusRepo + http://54.178.74.89:8081/repository/sample-releases/ + + + + + + maven1 + Maven.org + http://repo1.maven.org/maven2 + + + From 3c288d2ae0146769bfc4fa94d2e0f319840fbfce Mon Sep 17 00:00:00 2001 From: Saikiran7948 <67984395+Saikiran7948@users.noreply.github.com> Date: Sun, 27 Jul 2025 23:17:39 -0500 Subject: [PATCH 02/16] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 3087892497..fa30de2575 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

GANA TECH APP VERSION-26000

+

Hello Kiran

From 66266668276307ee205d5b262567a041a15aa4b3 Mon Sep 17 00:00:00 2001 From: Saikiran7948 <67984395+Saikiran7948@users.noreply.github.com> Date: Sun, 27 Jul 2025 23:19:25 -0500 Subject: [PATCH 03/16] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index fa30de2575..da6f22cc38 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

Hello Kiran

+

Hello Kiran How are you?

From ca1012d404a2f2ed3ed6e83e47631ec42e63e75c Mon Sep 17 00:00:00 2001 From: Saikiran7948 <67984395+Saikiran7948@users.noreply.github.com> Date: Sun, 27 Jul 2025 23:19:56 -0500 Subject: [PATCH 04/16] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index da6f22cc38..715700ff83 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

Hello Kiran How are you?

+

success

From 68731a1121d6b193a281bc6f0e5dcde11c4a3bd9 Mon Sep 17 00:00:00 2001 From: Saikiran7948 <67984395+Saikiran7948@users.noreply.github.com> Date: Mon, 28 Jul 2025 01:23:28 -0500 Subject: [PATCH 05/16] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 715700ff83..44f01c255d 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

success

+

automation project

From 9dae261176fbda03765ccbd5790720cc60f18d96 Mon Sep 17 00:00:00 2001 From: Saikiran7948 <67984395+Saikiran7948@users.noreply.github.com> Date: Mon, 28 Jul 2025 12:08:33 -0500 Subject: [PATCH 06/16] Update Jenkins-decnew --- Jenkins-decnew | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkins-decnew b/Jenkins-decnew index 4af0e02158..c470107d98 100644 --- a/Jenkins-decnew +++ b/Jenkins-decnew @@ -7,7 +7,7 @@ pipeline{ stages{ stage("Git Checkout"){ steps{ - git credentialsId: 'javahome2', url: 'https://github.com/srinivas1987devops/myweb.git' + git credentialsId: 'saikiran7948', url: 'https://github.com/saikiran7948/myweb.git' } } stage("Maven Build"){ @@ -20,11 +20,11 @@ pipeline{ steps{ sshagent(['tomcat-new']) { sh """ - scp -o StrictHostKeyChecking=no target/myweb.war ec2-user@172.31.10.233:/home/ec2-user/apache-tomcat-9.0.64/webapps/ + scp -o StrictHostKeyChecking=no target/myweb.war ec2-user@3.22.188.109:/home/ec2-user/apache-tomcat-9.0.107/webapps/ - ssh ec2-user@172.31.10.233 /home/ec2-user/apache-tomcat-9.0.64/bin/shutdown.sh + ssh ec2-user@3.22.188.109 /home/ec2-user/apache-tomcat-9.0.107/bin/shutdown.sh - ssh ec2-user@172.31.10.233 /home/ec2-user/apache-tomcat-9.0.64/bin/startup.sh + ssh ec2-user@3.22.188.109 /home/ec2-user/apache-tomcat-9.0.107/bin/startup.sh """ } From 489dcaa9f372df69f4ef6e793a3c27fc91858e7c Mon Sep 17 00:00:00 2001 From: Saikiran7948 <67984395+Saikiran7948@users.noreply.github.com> Date: Mon, 28 Jul 2025 13:23:00 -0500 Subject: [PATCH 07/16] Update Jenkins-decnew --- Jenkins-decnew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkins-decnew b/Jenkins-decnew index c470107d98..a8c917555b 100644 --- a/Jenkins-decnew +++ b/Jenkins-decnew @@ -7,7 +7,7 @@ pipeline{ stages{ stage("Git Checkout"){ steps{ - git credentialsId: 'saikiran7948', url: 'https://github.com/saikiran7948/myweb.git' + git credentialsId: 'automation', url: 'https://github.com/saikiran7948/myweb.git' } } stage("Maven Build"){ From a73cb7fdf4244555c954983dfafd9acb9c49f29a Mon Sep 17 00:00:00 2001 From: Saikiran7948 <67984395+Saikiran7948@users.noreply.github.com> Date: Mon, 28 Jul 2025 13:27:21 -0500 Subject: [PATCH 08/16] Update Jenkins-decnew --- Jenkins-decnew | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkins-decnew b/Jenkins-decnew index a8c917555b..ea4665fe88 100644 --- a/Jenkins-decnew +++ b/Jenkins-decnew @@ -20,11 +20,11 @@ pipeline{ steps{ sshagent(['tomcat-new']) { sh """ - scp -o StrictHostKeyChecking=no target/myweb.war ec2-user@3.22.188.109:/home/ec2-user/apache-tomcat-9.0.107/webapps/ + scp -o StrictHostKeyChecking=no target/myweb.war ec2-user@52.15.223.7:/home/ec2-user/apache-tomcat-9.0.107/webapps/ - ssh ec2-user@3.22.188.109 /home/ec2-user/apache-tomcat-9.0.107/bin/shutdown.sh + ssh ec2-user@52.15.223.7 /home/ec2-user/apache-tomcat-9.0.107/bin/shutdown.sh - ssh ec2-user@3.22.188.109 /home/ec2-user/apache-tomcat-9.0.107/bin/startup.sh + ssh ec2-user@52.15.223.7 /home/ec2-user/apache-tomcat-9.0.107/bin/startup.sh """ } From 148c275c31deb086cb108e018164647fe53758f0 Mon Sep 17 00:00:00 2001 From: Saikiran7948 <67984395+Saikiran7948@users.noreply.github.com> Date: Mon, 28 Jul 2025 14:01:04 -0500 Subject: [PATCH 09/16] Update Jenkins-decnew --- Jenkins-decnew | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkins-decnew b/Jenkins-decnew index ea4665fe88..b7a7c6db94 100644 --- a/Jenkins-decnew +++ b/Jenkins-decnew @@ -18,7 +18,7 @@ pipeline{ } stage("deploy-dev"){ steps{ - sshagent(['tomcat-new']) { + sshagent(['tomcat-new1']) { sh """ scp -o StrictHostKeyChecking=no target/myweb.war ec2-user@52.15.223.7:/home/ec2-user/apache-tomcat-9.0.107/webapps/ From 862cf93926ae554de3df09cc279e031165267916 Mon Sep 17 00:00:00 2001 From: Saikiran7948 <67984395+Saikiran7948@users.noreply.github.com> Date: Tue, 29 Jul 2025 17:10:45 -0500 Subject: [PATCH 10/16] Update Jenkins-decnew --- Jenkins-decnew | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkins-decnew b/Jenkins-decnew index b7a7c6db94..e24b69c83c 100644 --- a/Jenkins-decnew +++ b/Jenkins-decnew @@ -20,11 +20,11 @@ pipeline{ steps{ sshagent(['tomcat-new1']) { sh """ - scp -o StrictHostKeyChecking=no target/myweb.war ec2-user@52.15.223.7:/home/ec2-user/apache-tomcat-9.0.107/webapps/ + scp -o StrictHostKeyChecking=no target/myweb.war ec2-user@172.31.44.181:/home/ec2-user/apache-tomcat-9.0.107/webapps/ - ssh ec2-user@52.15.223.7 /home/ec2-user/apache-tomcat-9.0.107/bin/shutdown.sh + ssh ec2-user@172.31.44.181 /home/ec2-user/apache-tomcat-9.0.107/bin/shutdown.sh - ssh ec2-user@52.15.223.7 /home/ec2-user/apache-tomcat-9.0.107/bin/startup.sh + ssh ec2-user@172.31.44.181 /home/ec2-user/apache-tomcat-9.0.107/bin/startup.sh """ } From a5a1a244eb971829ed7a26bf23f71b9b9c393ce4 Mon Sep 17 00:00:00 2001 From: Saikiran7948 <67984395+Saikiran7948@users.noreply.github.com> Date: Fri, 1 Aug 2025 13:28:57 -0500 Subject: [PATCH 11/16] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 53f12afe0c..10f5acc55c 100644 --- a/pom.xml +++ b/pom.xml @@ -55,11 +55,11 @@ nexusRepo - http://54.178.74.89:8081/repository/sample-snapshots/ + http://3.16.49.1:8081/repository/sample-snapshots/ nexusRepo - http://54.178.74.89:8081/repository/sample-releases/ + http://3.16.49.1:8081/repository/sample-releases/ From 902830009243a637fd18df751640af727aa82015 Mon Sep 17 00:00:00 2001 From: Saikiran7948 <67984395+Saikiran7948@users.noreply.github.com> Date: Fri, 1 Aug 2025 14:10:09 -0500 Subject: [PATCH 12/16] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 10f5acc55c..acb082ba78 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ in.javahome myweb war - 8.2.0 + 8.2.0-SNAPSHOT Java Home myweb http://maven.apache.org From 9dd26769534708b6c1fb40c3311ed222c0d512ba Mon Sep 17 00:00:00 2001 From: Saikiran7948 <67984395+Saikiran7948@users.noreply.github.com> Date: Mon, 25 Aug 2025 15:07:51 -0500 Subject: [PATCH 13/16] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 44f01c255d..6885008eb3 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

automation project

+

dimmy project

From 87bd1c0a2ffdb1ae19b1b53a8f9bf23716d72ad7 Mon Sep 17 00:00:00 2001 From: Saikiran7948 <67984395+Saikiran7948@users.noreply.github.com> Date: Mon, 25 Aug 2025 15:19:44 -0500 Subject: [PATCH 14/16] Update index.jsp --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 6885008eb3..3a7735084c 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

dimmy project

+

one project

From 27f41235894ca7e57a0395143b67e2b623cfe7a0 Mon Sep 17 00:00:00 2001 From: saikiran7948 Date: Wed, 26 Nov 2025 12:56:15 -0600 Subject: [PATCH 15/16] testing changes --- main.tf | 2 +- src/main/webapp/WEB-INF/web.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 421856d9d5..f136585ad2 100644 --- a/main.tf +++ b/main.tf @@ -8,6 +8,6 @@ resource "aws_instance" "web7" { instance_type = "${lookup(var.instancetype, var.region)}" tags = { - Name = "HelloWorld9" + Name = "HelloWorld9000" } } diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 9f88c1f963..0dbe34b491 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -3,5 +3,5 @@ "http://java.sun.com/dtd/web-app_2_3.dtd" > - Archetype Created Web Application + Archetype Create Web Application From 89e0a674147190c004ef45172fc4eaf612532ca9 Mon Sep 17 00:00:00 2001 From: saikiran7948 Date: Wed, 26 Nov 2025 12:57:44 -0600 Subject: [PATCH 16/16] testing changes --- .idea/.gitignore | 3 +++ .idea/compiler.xml | 13 +++++++++++++ .idea/encodings.xml | 7 +++++++ .idea/jarRepositories.xml | 20 ++++++++++++++++++++ .idea/misc.xml | 12 ++++++++++++ .idea/vcs.xml | 6 ++++++ 6 files changed, 61 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000000..26d33521af --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000000..d2bd5db874 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000000..aa00ffab78 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000000..712ab9d985 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000..86993b23b3 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000..35eb1ddfbb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file