diff --git a/README.md b/README.md index 775c721..43532f9 100644 --- a/README.md +++ b/README.md @@ -17,4 +17,8 @@ In order to make it work, please do the following: > > > - > ``` + > + ``` + + + Added new line diff --git a/build-war/src/main/webapp/index.jsp b/build-war/src/main/webapp/index.jsp index 8e91573..77e4055 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 JAX London Demo project

CI/CD Workshop, Maven / Tomcat WAR example

<% diff --git a/jenkinsfile b/jenkinsfile new file mode 100644 index 0000000..52ad826 --- /dev/null +++ b/jenkinsfile @@ -0,0 +1,24 @@ +node { + def mvnHome + stage('Preparation') { // for display purposes + // Get some code from a GitHub repository + git 'https://github.com/sebastianspang/jaxlondon.git' + // Get the Maven tool. + // ** NOTE: This 'M3' Maven tool must be configured + // ** in the global configuration. + mvnHome = tool 'M3' + } + stage('Build') { + // Run the maven build + withEnv(["MVN_HOME=$mvnHome"]) { + if (isUnix()) { + sh '"$MVN_HOME/bin/mvn" -Dmaven.test.failure.ignore clean package' + } else { + bat(/"%MVN_HOME%\bin\mvn" clean install -Pci/) + } + } + } + stage('Results') { + junit '**/target/surefire-reports/TEST-*.xml' + } +}