From b36d1f9b6a3f4ab833de697faba25e63cb42607f Mon Sep 17 00:00:00 2001 From: "Bishop, Michael" Date: Wed, 27 Sep 2023 11:24:56 -0400 Subject: [PATCH 1/4] Added my name to the README.md file. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3eb1783..b543869 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,4 @@ In order to make it work, please follow the instructions below: > > ``` +Commit: Michael Bishop (michael.bishop@anthem.com) \ No newline at end of file From 469cf40882779cdc98179aaea69648d15c50581c Mon Sep 17 00:00:00 2001 From: "Bishop, Michael" Date: Wed, 27 Sep 2023 15:15:21 -0400 Subject: [PATCH 2/4] RUnning on Windows. --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 179b03b..79fa067 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { println 'Cloning git repository...' git 'https://github.com/nirkoren/devopscon.git' println 'Starting the build...' - sh "mvn clean install -Pci" + bat "mvn clean install -Pci" } post { success { From 749e02656e279ce821f37132a1f081b9c85259dd Mon Sep 17 00:00:00 2001 From: "Bishop, Michael" Date: Wed, 27 Sep 2023 15:23:47 -0400 Subject: [PATCH 3/4] Changed background to red. --- build-war/src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-war/src/main/webapp/index.jsp b/build-war/src/main/webapp/index.jsp index edb6933..0ef7509 100644 --- a/build-war/src/main/webapp/index.jsp +++ b/build-war/src/main/webapp/index.jsp @@ -1,6 +1,6 @@ <%@page import="org.nirkoren.maven.demo.HelloHandler"%> - +

Welcome to DevOpsCon Demo project

CI/CD Workshop, Maven / Tomcat WAR example

<% From 852193c0f4e84b7b16d4769791ac119edf0fe525 Mon Sep 17 00:00:00 2001 From: "Bishop, Michael" Date: Wed, 27 Sep 2023 15:27:57 -0400 Subject: [PATCH 4/4] Fixed repo, changed color to blueviolet. --- Jenkinsfile | 2 +- build-war/src/main/webapp/index.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 79fa067..de082c4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { stage('Build') { steps { println 'Cloning git repository...' - git 'https://github.com/nirkoren/devopscon.git' + git 'https://github.com/bishopmw/devopscon.git' println 'Starting the build...' bat "mvn clean install -Pci" } diff --git a/build-war/src/main/webapp/index.jsp b/build-war/src/main/webapp/index.jsp index 0ef7509..754d9da 100644 --- a/build-war/src/main/webapp/index.jsp +++ b/build-war/src/main/webapp/index.jsp @@ -1,6 +1,6 @@ <%@page import="org.nirkoren.maven.demo.HelloHandler"%> - +

Welcome to DevOpsCon Demo project

CI/CD Workshop, Maven / Tomcat WAR example

<%