From e46102cf144858613d968659db3feaaed3c1cc28 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Thu, 7 Jul 2022 20:04:17 -0600 Subject: [PATCH 01/26] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3bf21532..907114f1 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ 5.1.2.RELEASE 4.11 1.2.17 - http://172.31.81.112:7000/ + http://172.31.23.188:5000/ admin - admin + admin123 UTF-8 UTF-8 From d76634ec675d59e348f96a4b2f205d8e2daf9777 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Thu, 7 Jul 2022 20:28:31 -0600 Subject: [PATCH 02/26] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 14a2807e..ab6905ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,2 @@ FROM tomcat:8.0.20-jre8 -COPY target/*.war /usr/local/tomcat/webapps/td.war +COPY target/*.war /usr/local/tomcat/webapps/cohort7.war From ec35f88d62d0c5f492f40b8d7364b0fa0d8762eb Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Wed, 31 Aug 2022 21:01:23 -0600 Subject: [PATCH 03/26] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 907114f1..5441bf01 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ 5.1.2.RELEASE 4.11 1.2.17 - http://172.31.23.188:5000/ + http://172.31.18.127:9000/ admin - admin123 + admin UTF-8 UTF-8 From a4509fc37432f38a0f983c28e635bee7024a2eee Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 3 Sep 2022 07:41:01 -0600 Subject: [PATCH 04/26] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5441bf01..0d05a80f 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 5.1.2.RELEASE 4.11 1.2.17 - http://172.31.18.127:9000/ + http://172.31.18.127:7000/ admin admin UTF-8 From 194ea427553dbf493abbfd64b8ac032626da1047 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 3 Sep 2022 08:23:40 -0600 Subject: [PATCH 05/26] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0d05a80f..85335b28 100644 --- a/pom.xml +++ b/pom.xml @@ -97,13 +97,13 @@ nexus ACADA Learning Releases Nexus Repository - http://172.31.86.108:8081/repository/rbc-app-release/ + http://172.31.85.41:8081/repository/rbc-release/ nexus ACADA Learning Snapshot Nexus Repository - http://172.31.86.108:8081/repository/shared-lib-snapshot/ + http://172.31.85.41:8081/repository/rbc-snapshot/ From d11eec9954799482065a7b9893e96c11cf63e6ea Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 3 Sep 2022 08:29:57 -0600 Subject: [PATCH 06/26] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 85335b28..ae63c2d1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mt maven-web-application war - 2.0.5-SNAPSHOT + 2.0.6-SNAPSHOT maven-web-application From a6166576e34a489096fd9abab6068302f1e5fd90 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 3 Sep 2022 08:31:28 -0600 Subject: [PATCH 07/26] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ae63c2d1..8d3af8a0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mt maven-web-application war - 2.0.6-SNAPSHOT + 2.0.7-SNAPSHOT maven-web-application From 73f716758e7a164a26acc5e62bd18916e1579051 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 3 Sep 2022 08:33:25 -0600 Subject: [PATCH 08/26] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8d3af8a0..4a708ba7 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mt maven-web-application war - 2.0.7-SNAPSHOT + 2.0.7-RELEASE maven-web-application From 9d73c47d169e993c3074fd32221c5b7a85632923 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 3 Sep 2022 08:36:43 -0600 Subject: [PATCH 09/26] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4a708ba7..8d3af8a0 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mt maven-web-application war - 2.0.7-RELEASE + 2.0.7-SNAPSHOT maven-web-application From 6917134b9aa42248e2cf150080cc89b938704f39 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Wed, 7 Sep 2022 19:22:08 -0600 Subject: [PATCH 10/26] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8d3af8a0..0b98e87c 100644 --- a/pom.xml +++ b/pom.xml @@ -97,13 +97,13 @@ nexus ACADA Learning Releases Nexus Repository - http://172.31.85.41:8081/repository/rbc-release/ + http://172.31.85.41:8081/repository/new-project-release/ nexus ACADA Learning Snapshot Nexus Repository - http://172.31.85.41:8081/repository/rbc-snapshot/ + http://172.31.85.41:8081/repository/new-project-snapshot/ From dcd564ed6bbb6076c1125c078682d157cb133829 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Wed, 7 Sep 2022 20:55:17 -0600 Subject: [PATCH 11/26] Update home.jsp --- src/main/webapp/jsps/home.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/jsps/home.jsp b/src/main/webapp/jsps/home.jsp index d56841cd..4d97dd0f 100644 --- a/src/main/webapp/jsps/home.jsp +++ b/src/main/webapp/jsps/home.jsp @@ -11,7 +11,7 @@

Welcome to Acada Learning, Calgary, Canada Office.

We are developing and supporting quality Software Solutions to millions of clients. - We offer Training for DevOps with Linux and Cloud equipping IT Engineers for best performance. God Loves you. Everyone will be hired

+ We offer Training for DevOps with Linux and Cloud equipping IT Engineers for best performance. God Loves you. Everyone will be hired with multiple job offers, Amen

Server Side IP Address


From 647fbf0c7d93fbcedccf02fa820e071582612e6a Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Wed, 7 Sep 2022 21:12:47 -0600 Subject: [PATCH 12/26] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 67aca80a..2a95dde7 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # web-app # new commit +# commit From a074d528cebcd5c0a16dd2b42978c6776681baae Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 24 Sep 2022 06:41:06 -0600 Subject: [PATCH 13/26] Create jenkins-cohort8 --- jenkins-cohort8 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 jenkins-cohort8 diff --git a/jenkins-cohort8 b/jenkins-cohort8 new file mode 100644 index 00000000..5110f8f2 --- /dev/null +++ b/jenkins-cohort8 @@ -0,0 +1,24 @@ +//scripted +node(""){ +def MHD = tool name: "maven3.8.6" +stage('GitClone'){ +sh "echo this is git clone" +git credentialsId: 'Github-Cred', url: 'https://github.com/acadalearning/web-app.git' +} +stage('Build'){ +sh "echo start of build process" +sh "${MHD}/bin/mvn package" +} +stage('CodeQuality'){ +sh "echo performing SonarQube Test" +//sh "${MHD}/bin/mvn sonar:sonar" +} +stage('BackupArtifacts'){ +sh "echo backup to Nexus" +sh "${MHD}/bin/mvn deploy" +} +stage('DeploytoTomcat'){ +sh "echo Deploy to Tomcat server" +deploy adapters: [tomcat9(credentialsId: 'Tomcat-cred', path: '', url: 'http://54.196.234.205:7000/')], contextPath: null, war: 'target/*war' +} +} From 16dd52fb200921d046307b5ed822c738b505f7a5 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 24 Sep 2022 06:51:48 -0600 Subject: [PATCH 14/26] Added manual approval --- jenkins-cohort8 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jenkins-cohort8 b/jenkins-cohort8 index 5110f8f2..b185e8c1 100644 --- a/jenkins-cohort8 +++ b/jenkins-cohort8 @@ -21,4 +21,14 @@ stage('DeploytoTomcat'){ sh "echo Deploy to Tomcat server" deploy adapters: [tomcat9(credentialsId: 'Tomcat-cred', path: '', url: 'http://54.196.234.205:7000/')], contextPath: null, war: 'target/*war' } +stage('Approval'){ +sh "echo approval for Jenkins-file-app" +timeout(time:5, UNIT:'DAYS'){ +input message:'Approval for Prod' +} +} +stage('DeploytoTomcat'){ +sh "echo Deploy to Tomcat server" +deploy adapters: [tomcat9(credentialsId: 'Tomcat-cred', path: '', url: 'http://54.196.234.205:7000/')], contextPath: null, war: 'target/*war' +} } From d6da76f35aaa2381b2799b1ceb07e7a3bbc86654 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 24 Sep 2022 06:54:54 -0600 Subject: [PATCH 15/26] Update jenkins-cohort8 --- jenkins-cohort8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins-cohort8 b/jenkins-cohort8 index b185e8c1..8d77c99f 100644 --- a/jenkins-cohort8 +++ b/jenkins-cohort8 @@ -17,7 +17,7 @@ stage('BackupArtifacts'){ sh "echo backup to Nexus" sh "${MHD}/bin/mvn deploy" } -stage('DeploytoTomcat'){ +stage('DeploytoStaging'){ sh "echo Deploy to Tomcat server" deploy adapters: [tomcat9(credentialsId: 'Tomcat-cred', path: '', url: 'http://54.196.234.205:7000/')], contextPath: null, war: 'target/*war' } @@ -27,7 +27,7 @@ timeout(time:5, UNIT:'DAYS'){ input message:'Approval for Prod' } } -stage('DeploytoTomcat'){ +stage('DeploytoProd'){ sh "echo Deploy to Tomcat server" deploy adapters: [tomcat9(credentialsId: 'Tomcat-cred', path: '', url: 'http://54.196.234.205:7000/')], contextPath: null, war: 'target/*war' } From f5d49772b2b743214b5ebeb4e1f4f31f02793c82 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 24 Dec 2022 14:15:38 -0700 Subject: [PATCH 16/26] url update --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b98e87c..0f0ae25c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 5.1.2.RELEASE 4.11 1.2.17 - http://172.31.18.127:7000/ + http://172.31.21.231:9000/ admin admin UTF-8 From 7ef81c47bc6b98ee52d45f81104b9dcac8711f0c Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 31 Dec 2022 14:22:41 -0700 Subject: [PATCH 17/26] Update pom.xml --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 0f0ae25c..ff1d994c 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 5.1.2.RELEASE 4.11 1.2.17 - http://172.31.21.231:9000/ + http://172.31.21.231:7000/ admin admin UTF-8 @@ -97,13 +97,13 @@ nexus ACADA Learning Releases Nexus Repository - http://172.31.85.41:8081/repository/new-project-release/ + http://172.31.27.56:8081/repository/rbc-release/ nexus ACADA Learning Snapshot Nexus Repository - http://172.31.85.41:8081/repository/new-project-snapshot/ + http://172.31.27.56:8081/repository/rbc-snapshot/ From c74f90b712c1b209a588cddd29ec0a9d281f358b Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 31 Dec 2022 14:43:11 -0700 Subject: [PATCH 18/26] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff1d994c..3fff8674 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mt maven-web-application war - 2.0.7-SNAPSHOT + 2.0.0-SNAPSHOT maven-web-application From 836025ccde7c905d63de48171a7d052937b6b269 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 31 Dec 2022 14:44:22 -0700 Subject: [PATCH 19/26] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3fff8674..21986572 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mt maven-web-application war - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT maven-web-application From c26a174e678677092fbae161fc850efcf499dc4f Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 31 Dec 2022 14:46:02 -0700 Subject: [PATCH 20/26] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 21986572..921b8a21 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mt maven-web-application war - 2.0.1-SNAPSHOT + 2.0.7-RELEASE maven-web-application From 18d80a5f5796c11bb02f9d8d85bada8fc5775910 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Tue, 3 Jan 2023 20:04:46 -0700 Subject: [PATCH 21/26] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a95dde7..b507d8ed 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # web-app # new commit # commit - +# done From 5b2a238d4c155cbc8044d70f1b4c5f7a781b3578 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Tue, 3 Jan 2023 20:15:42 -0700 Subject: [PATCH 22/26] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b507d8ed..2a95dde7 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # web-app # new commit # commit -# done + From 6102804d1b483e1356fd361aa16d7b16fde7617e Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Tue, 3 Jan 2023 20:16:39 -0700 Subject: [PATCH 23/26] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2a95dde7..bc662991 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # web-app # new commit # commit - +# Done From 95dab05fa7fba140a586d9238a1aa48285056005 Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 7 Jan 2023 14:21:10 -0700 Subject: [PATCH 24/26] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 921b8a21..ff1d994c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mt maven-web-application war - 2.0.7-RELEASE + 2.0.7-SNAPSHOT maven-web-application From 5e40aa64c226dcc74052f61a958bbf9e9e76efef Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sat, 14 Jan 2023 13:37:07 -0700 Subject: [PATCH 25/26] Create cohort9 --- cohort9 | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 cohort9 diff --git a/cohort9 b/cohort9 new file mode 100644 index 00000000..fcaf91c8 --- /dev/null +++ b/cohort9 @@ -0,0 +1,51 @@ + pipeline{ + agent any + tools{ + maven "maven3.8.5" + } + stages{ + stage("1.CodeClone"){ + steps{ + git credentialsId: 'Github-Cred', url: 'https://github.com/acadalearning/web-app.git' + } + } + stage("2. build"){ + steps{ + sh "echo start of maven build" + sh "mvn clean package" + } + } + stage("3. Code Quality"){ + steps{ + sh "echo start of code quality" + sh "mvn sonar:sonar" + } + } + stage("4. Backup"){ + steps{ + sh "echo backup to nexus" + sh "mvn deploy" + } + } + stage("5. Deploy to UAT"){ + steps{ + sh "echo deploy to UAT Environment" + deploy adapters: [tomcat9(credentialsId: 'tomcat-cred2', path: '', url: 'http://172.31.12.185:7000/')], contextPath: null, war: 'target/*.war' + } + } + stage("6. Approval"){ + steps{ + sh "echo approval needed" + timeout(time:2, unit:'DAYS'){ + input message:'Approval for Production eni' + } + } +} + stage("5. Deploy to Prod"){ + steps{ + sh "echo deploy to Prod Environment" + deploy adapters: [tomcat9(credentialsId: 'tomcat-cred2', path: '', url: 'http://172.31.12.185:7000/')], contextPath: null, war: 'target/*.war' + } + } +} +} From a99767afedc2b4b87fcc6009eba079027841a51e Mon Sep 17 00:00:00 2001 From: acadalearning <108498076+acadalearning@users.noreply.github.com> Date: Sun, 19 Mar 2023 14:45:28 -0600 Subject: [PATCH 26/26] Update sonarqube IP --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ff1d994c..bba48085 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 5.1.2.RELEASE 4.11 1.2.17 - http://172.31.21.231:7000/ + http://172.31.20.235:9000/ admin admin UTF-8