Skip to content

added new file to track progress #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maximearin wants to merge 7 commits into
base: main
Choose a base branch
from
Open

added new file to track progress #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
491d3a5
added new file
maximearin Dec 1, 2025
0e62e24
Merge branch 'nirkoren:main' into main
maximearin Dec 1, 2025
94c2653
changed background colour to blue
maximearin Dec 1, 2025
68206b6
changed background colour to yellow
maximearin Dec 1, 2025
a47831b
changed Jenkinsfile Repository URL
maximearin Dec 1, 2025
91710f7
changed Maven Installation name in Jenkinsfile
maximearin Dec 1, 2025
e49d484
changed background colour in index.jsp to gold
maximearin Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
node {
def mvnHome
def GIT_REPO = "https://github.com/nirkoren/devopscon.git"
def GIT_REPO = "https://github.com/maximearin/devopscon.git"

stage("Preparation") {
println "Cloning git repository..."
git branch: "main", url: GIT_REPO
mvnHome = tool 'M3'
mvnHome = tool 'Maven local'
}

stage('Build & Deploy') {
Expand Down
4 changes: 4 additions & 0 deletions Maxime.MD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Document to keep track of what I learned during the demo.

* Very interesting training and trainer
* GIT is not rocket science after all :D
2 changes: 1 addition & 1 deletion build-war/src/main/webapp/index.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%@page import="org.nirkoren.maven.demo.HelloHandler"%>
<html>
<body style="background-color:silver; font-family: arial;">
<body style="background-color:gold; font-family: arial;">
<h2>Welcome to DevOpsCon Demo repo</h2>
CI/CD Workshop, Maven / Tomcat WAR example<P>
<%
Expand Down