From 973d3aa0f3a79c5030d17d62ed0f9d6f0fdb1be2 Mon Sep 17 00:00:00 2001 From: Daniyah Alsomali Date: Wed, 27 Sep 2023 11:26:39 -0400 Subject: [PATCH 1/4] updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3eb1783..5a9a22c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Welcome to DevOpsCon CI/CD demo repo +# Welcome to DevOpsCon CI/CD demo repo - Daniyah ## This repository contains basic Maven project with Hello-World Java war file In order to make it work, please follow the instructions below: From 026fdf47907307609e012aff3af715abe90b627d Mon Sep 17 00:00:00 2001 From: daniyah-als <78404177+daniyah-als@users.noreply.github.com> Date: Wed, 27 Sep 2023 15:28:45 -0400 Subject: [PATCH 2/4] Update index.jsp --- 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..7b79a8d 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 8b43d6d451110e95a24ba4331848610380bcfcb1 Mon Sep 17 00:00:00 2001 From: daniyah-als <78404177+daniyah-als@users.noreply.github.com> Date: Wed, 27 Sep 2023 15:30:11 -0400 Subject: [PATCH 3/4] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 179b03b..8e9c32d 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/daniyah-als/devopscon.git' println 'Starting the build...' sh "mvn clean install -Pci" } From a7ed7ba0ec4900fea6c7be7c7c03626db2429ebe Mon Sep 17 00:00:00 2001 From: daniyah-als <78404177+daniyah-als@users.noreply.github.com> Date: Wed, 27 Sep 2023 15:32:23 -0400 Subject: [PATCH 4/4] Update index.jsp --- 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 7b79a8d..38cd1d0 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

<%