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
diff --git a/Jenkins-decnew b/Jenkins-decnew
index 4af0e02158..e24b69c83c 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: 'automation', url: 'https://github.com/saikiran7948/myweb.git'
}
}
stage("Maven Build"){
@@ -18,13 +18,13 @@ pipeline{
}
stage("deploy-dev"){
steps{
- sshagent(['tomcat-new']) {
+ sshagent(['tomcat-new1']) {
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@172.31.44.181:/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@172.31.44.181 /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@172.31.44.181 /home/ec2-user/apache-tomcat-9.0.107/bin/startup.sh
"""
}
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/pom.xml b/pom.xml
index 08a12c31d2..acb082ba78 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-SNAPSHOT
+ 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://3.16.49.1:8081/repository/sample-snapshots/
+
+
+ nexusRepo
+ http://3.16.49.1:8081/repository/sample-releases/
+
+
+
+
+
+ maven1
+ Maven.org
+ http://repo1.maven.org/maven2
+
+
+
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
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
index 3087892497..3a7735084c 100644
--- a/src/main/webapp/index.jsp
+++ b/src/main/webapp/index.jsp
@@ -1,5 +1,5 @@
- GANA TECH APP VERSION-26000
+ one project