diff --git a/Dockerfile b/Dockerfile index 74a00407b6..c758662ae1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,3 @@ -FROM tomcat:8.0.20-jre8 +FROM tomcat:9.0 # Dummy text to test COPY target/maven-web-application*.war /usr/local/tomcat/webapps/maven-web-application.war diff --git a/Jenkinsfile b/Jenkinsfile index 82d63ae784..3ae49f0fcc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,21 +1,21 @@ node { - def mavenHome = tool name: "maven3.6.2" + def mavenHome = tool name: "maven3.9.2" echo "GitHub BranhName ${env.BRANCH_NAME}" echo "Jenkins Job Number ${env.BUILD_NUMBER}" echo "Jenkins Node Name ${env.NODE_NAME}" echo "Jenkins Home ${env.JENKINS_HOME}" - echo "Jenkins URL ${env.JENKINS_URL}" + echo "JOB Name ${env.JOB_NAME}" - properties([[$class: 'JiraProjectProperty'], buildDiscarder(logRotator(artifactDaysToKeepStr: '', artifactNumToKeepStr: '2', daysToKeepStr: '', numToKeepStr: '2')), pipelineTriggers([pollSCM('* * * * *')])]) + stage("CheckOutCodeGit") { - git branch: 'development', credentialsId: '65fb834f-a83b-4fe7-8e11-686245c47a65', url: 'https://github.com/MithunTechnologiesDevOps/maven-web-application.git' + git credentialsId: 'Gitid', url: 'https://github.com/realblegend/maven-web-app.git' } stage("Build") @@ -23,32 +23,25 @@ node sh "${mavenHome}/bin/mvn clean package" } - /* - stage("ExecuteSonarQubeReport") - { - sh "${mavenHome}/bin/mvn sonar:sonar" - } - +/* stage("UploadArtifactsintoNexus") { sh "${mavenHome}/bin/mvn deploy" } - + */ stage("DeployAppTomcat") { - sshagent(['423b5b58-c0a3-42aa-af6e-f0affe1bad0c']) { - sh "scp -o StrictHostKeyChecking=no target/maven-web-application.war ec2-user@15.206.91.239:/opt/apache-tomcat-9.0.34/webapps/" - } + deploy adapters: [tomcat9(credentialsId: '226b4bb7-f7e4-4707-abbb-81f033e9a69e', path: '', url: 'http://35.208.56.74:8089/')], contextPath: null, war: '*/*war' } stage('EmailNotification') { - mail bcc: 'devopstrainingblr@gmail.com', body: '''Build is over + mail bcc: 'bepapaul65@gmail.com', body: '''Build is over Thanks, Mithun Technologies, - 9980923226.''', cc: 'devopstrainingblr@gmail.com', from: '', replyTo: '', subject: 'Build is over!!', to: 'devopstrainingblr@gmail.com' + 9980923226.''', cc: 'bepapaul65@gmail.com', from: '', replyTo: '', subject: 'Build is over!!', to: 'bepapaul65@gmail.com' } - */ + } diff --git a/pom.xml b/pom.xml index 31ecb53c29..179164e14a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,11 +26,8 @@ admin UTF-8 UTF-8 - - - mylandmarktechs - https://sonarcloud.io - + mylandmarktechs + https://sonarcloud.io @@ -100,14 +97,14 @@ nexus - Landmark Technologies Releases Nexus Repository - http://44.192.81.238:8888/mylandmarktech/repository/boa-release/ + Realblegend Releases Nexus Repository + http://35.208.56.74:9000/repository/webappreleases/ nexus - Landmark Technologies Snapshot Nexus Repository - http://44.192.81.238:8888/mylandmarktech/repository/boa-snapshot/ + Realblegend Snapshot Nexus Repository + http://35.208.56.74:9000/repository/webappsnapshots/ diff --git a/src/main/webapp/images/Capture.PNG b/src/main/webapp/images/Capture.PNG new file mode 100644 index 0000000000..1d045a0fe3 Binary files /dev/null and b/src/main/webapp/images/Capture.PNG differ diff --git a/src/main/webapp/jsps/home.jsp b/src/main/webapp/jsps/home.jsp index 8a19925368..0914f70517 100644 --- a/src/main/webapp/jsps/home.jsp +++ b/src/main/webapp/jsps/home.jsp @@ -4,12 +4,13 @@ -MylandmarkTech.com- Home Page - +Congrat- About us +

Landmark Technologies

+

CONGRATULATIONsssssssss ON YOUR FIRST PROJECT

Welcome to Landmark Technology. Landmark Technology is a an ideal online training platform for DevOps and Cloud Engineers. We offer interview preparations and job assitance. @@ -22,7 +23,7 @@ Landmark Technology, Toronto, Ontario, Canada - +1 437 215 2483, + +1 4703226087, mylandmarktech@gmail.com
Mail to Landmark Technologies