diff --git a/123Dockerfile b/123Dockerfile index 69084ef35d..e891687aa2 100644 --- a/123Dockerfile +++ b/123Dockerfile @@ -1,4 +1,4 @@ -FROM tomcat:8.0.20-jre8 +FROM tomcat:8.0.30-jre8 # Dummy text to test COPY target/myweb*.war /usr/local/tomcat/webapps/myweb.war diff --git a/Jenkins-ansible b/Jenkins-ansible index 48543b243c..1f4d6f8ab7 100644 --- a/Jenkins-ansible +++ b/Jenkins-ansible @@ -1,7 +1,7 @@ pipeline{ agent any tools { - maven 'Maven-3.6.1' + maven 'Maven-3.7.3' } environment{ diff --git a/Jenkins-decnew b/Jenkins-decnew index 238d6eba64..6edbd6d61b 100644 --- a/Jenkins-decnew +++ b/Jenkins-decnew @@ -7,7 +7,7 @@ pipeline{ stages{ stage("Git Checkout"){ steps{ - git credentialsId: 'javahome2', url: 'https://github.com/srinicloud87/myweb.git' + git credentialsId: 'krishna', url: 'https://github.com/krishnaveni123-beep/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.9.247:/home/ec2-user/apache-tomcat-9.0.91/webapps/ + scp -o StrictHostKeyChecking=no target/myweb.war ec2-user@13.229.72.64:/home/ec2-user/apache-tomcat-9.0.93/webapps/ - ssh ec2-user@172.31.9.247 /home/ec2-user/apache-tomcat-9.0.91/bin/shutdown.sh + ssh ec2-user@13.229.72.64 /home/ec2-user/apache-tomcat-9.0.93/bin/shutdown.sh - ssh ec2-user@172.31.9.247 /home/ec2-user/apache-tomcat-9.0.91/bin/startup.sh + ssh ec2-user@13.229.72.64 /home/ec2-user/apache-tomcat-9.0.93/bin/startup.sh """ } diff --git a/Jenkins-kube b/Jenkins-kube index 0cfd850a0e..a94fd64e49 100644 --- a/Jenkins-kube +++ b/Jenkins-kube @@ -1,7 +1,7 @@ pipeline{ agent any tools { - maven 'Maven-3.6.1' + maven 'Maven-3.6.2' } environment{ diff --git a/abhinaya b/abhinaya new file mode 100644 index 0000000000..0e7239d022 --- /dev/null +++ b/abhinaya @@ -0,0 +1 @@ +my name abhi diff --git a/cred4.0 b/cred4.0 index 6290daf1b2..9d2feefda2 100644 --- a/cred4.0 +++ b/cred4.0 @@ -1 +1,2 @@ bbbbb +aaaa.. \ No newline at end of file diff --git a/devops b/devops new file mode 100644 index 0000000000..3496e8a69d --- /dev/null +++ b/devops @@ -0,0 +1,4 @@ +teamcity +codefresh +github +iac diff --git a/jakeer b/jakeer index e69de29bb2..939c2c71bd 100644 --- a/jakeer +++ b/jakeer @@ -0,0 +1 @@ +My name is khadeer. \ No newline at end of file diff --git a/naresh b/naresh new file mode 100644 index 0000000000..7acc03cc4a --- /dev/null +++ b/naresh @@ -0,0 +1,2 @@ +this is devops +this is git tool diff --git a/pom.xml b/pom.xml index e6f3d08dc7..2dd4491695 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,4 @@ + 4.0.0 @@ -12,8 +13,8 @@ kammana http://52.194.255.96:9000/ UTF-8 - 1.7 - 1.7 + 1.8 + 1.8 @@ -49,5 +50,26 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + + + diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index a6e4b301dc..0f551ec775 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

GANA TECH APP VERSION-33000

+

GANA TECH APP VERSION-33300

diff --git a/triveni b/triveni deleted file mode 100644 index e69de29bb2..0000000000