Skip to content
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

Jump to bottom

Return greeting string directly #12

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Return greeting string directly #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25b6194
Return string directly
radceratops Oct 10, 2019
66a126b
Merge branch 'master' of github.com:nirkoren/jaxlondon
radceratops Oct 10, 2019
8aa3aee
Merge branch 'master' of github.com:nirkoren/jaxlondon
radceratops Oct 10, 2019
be6b174
Change background colour to lime
radceratops Oct 10, 2019
f56dfa5
Create jenkinsfile
radceratops Oct 10, 2019
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
3 changes: 1 addition & 2 deletions build-war/src/main/java/org/nirkoren/maven/demo/HelloHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
public class HelloHandler {

public String sayHello() {
String hello = "Hello JAX London, Is it working from your laptop?";
return hello;
return "Hello JAX London, Is it working from your laptop?";
}

}
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: Tan; font-family: arial;">
<body style="background-color: lime; font-family: arial;">
<h2>Welcome to JAX London Demo project</h2>
CI/CD Workshop, Maven / Tomcat WAR example<P>
<%
Expand Down
22 changes: 22 additions & 0 deletions jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
node {
def mvnHome
stage('Preparation') { // for display purposes
// Get some code from a GitHub repository
git 'https://github.com/radceratops/jaxlondon.git'
// Get the Maven tool.
mvnHome = tool 'M3'
}
stage('Build') {
// Run the maven build
withEnv(["MVN_HOME=$mvnHome"]) {
if (isUnix()) {
sh '"$MVN_HOME/bin/mvn" clean install -Pci'
} else {
bat(/"%MVN_HOME%\bin\mvn" clean install/)
}
}
}
stage('Results') {
junit '**/target/surefire-reports/TEST-*.xml'
}
}