diff --git a/Banking1 b/Banking1 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/Jenkins-decnew b/Jenkins-decnew index 6416ebd400..d38a24adfa 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: 'sana2', url: 'https://github.com/Sanaullahdevops/myweb.git' } } stage("Maven Build"){ @@ -18,13 +18,13 @@ pipeline{ } stage("deploy-dev"){ steps{ - sshagent(['tomcat-new']) { + sshagent(['sana2']) { sh """ - scp -o StrictHostKeyChecking=no target/myweb.war ec2-user@172.31.41.123:/home/ec2-user/apache-tomcat-9.0.94/webapps/ + scp -o StrictHostKeyChecking=no target/myweb.war ec2-user@172.31.23.67:/home/ec2-user/apache-tomcat-9.0.98/webapps/ - ssh ec2-user@172.31.41.123 /home/ec2-user/apache-tomcat-9.0.94/bin/shutdown.sh + ssh ec2-user@172.31.23.67 /home/ec2-user/apache-tomcat-9.0.98/bin/shutdown.sh - ssh ec2-user@172.31.41.123 /home/ec2-user/apache-tomcat-9.0.94/bin/startup.sh + ssh ec2-user@172.31.23.67 /home/ec2-user/apache-tomcat-9.0.98/bin/startup.sh """ } diff --git a/Sanaremoterep2localrep b/Sanaremoterep2localrep new file mode 100644 index 0000000000..194bd6f04c --- /dev/null +++ b/Sanaremoterep2localrep @@ -0,0 +1,7 @@ +This is Sanaullah, a brave person always a hero with no fear. +My data added here with proper notesTest this data123My new data +1234567890 +sana1 +Fecth data +Sana2 +Fetch data2 diff --git a/Sanaullah shaik b/Sanaullah shaik new file mode 100644 index 0000000000..9daeafb986 --- /dev/null +++ b/Sanaullah shaik @@ -0,0 +1 @@ +test diff --git a/dev1file b/dev1file new file mode 100644 index 0000000000..e69de29bb2 diff --git a/devopsfile2 b/devopsfile2 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/f1 b/f1 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/fil786 b/fil786 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/file1 b/file1 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/file12 b/file12 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/file123 b/file123 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/file2 b/file2 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/file32 b/file32 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/file345 b/file345 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/file55 b/file55 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/file9 b/file9 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/filenew b/filenew new file mode 100644 index 0000000000..e69de29bb2 diff --git a/filmaster b/filmaster new file mode 100644 index 0000000000..e69de29bb2 diff --git a/myfile8 b/myfile8 new file mode 100644 index 0000000000..7827ee52c2 --- /dev/null +++ b/myfile8 @@ -0,0 +1,5 @@ +This is my file 123 +This is the data inside myfile8 +This is 2nd line +This is to undo the changes in Index/staging areaThis is my 4th line +This is my 5th line \ No newline at end of file diff --git a/myweb b/myweb new file mode 160000 index 0000000000..ae086a9702 --- /dev/null +++ b/myweb @@ -0,0 +1 @@ +Subproject commit ae086a9702414b922f57a77c2396b52bf062c370 diff --git a/pom.xml b/pom.xml index 5f521b1324..f312862290 100644 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,13 @@ in.javahome myweb war - 8.2.0 + 8.2.1-SNAPSHOT Java Home myweb http://maven.apache.org kammana - http://13.231.64.94:9000/ + http://18.212.90.18:9000/ UTF-8 1.7 1.7 @@ -32,12 +32,12 @@ nexusRepo - http://57.181.26.207:8081/repository/sample-snapshots/ + http://100.27.185.111:8081/repository/Snapshot_Repository/ nexusRepo - http://57.181.26.207:8081/repository/sample-releases/ + http://100.27.185.111:8081/repository/Release_repository/ diff --git a/sananewfile1 b/sananewfile1 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/sanaullah b/sanaullah new file mode 100644 index 0000000000..e69de29bb2 diff --git a/sanaullah-testing b/sanaullah-testing new file mode 100644 index 0000000000..f260221035 --- /dev/null +++ b/sanaullah-testing @@ -0,0 +1,7 @@ +This to check whether i am able to create the file in reote repository or not. +And to see whether i am getting this file into my local repository or not. +I am adding data from local repository to the remote repository. +Tomcat +Mydata +my devops +New line to test git merge command after git fetch command. diff --git a/sanaullahfile2 b/sanaullahfile2 new file mode 100644 index 0000000000..f7642ccd85 --- /dev/null +++ b/sanaullahfile2 @@ -0,0 +1 @@ +Hello I am sana. diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 81b27107dd..2649806d06 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,5 +1,5 @@ -

GANA TECH APP VERSION-36000

+

SANA & VAHIDA TECH APP VERSION-3800