diff --git a/Jenkinsfile b/Jenkinsfile index 1a7877e..0eb7192 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,21 +4,23 @@ pipeline { maven 'm1' } stages { - stage('Build') { + stage ('build') { steps { - sh 'mvn -B -DskipTests clean install' + sh 'mvn clean install -DskipTests' } + } - stage('Test') { + stage ('test') { steps { sh 'mvn test' } - post { - always { - junit 'target/surefire-reports/*.xml' - } - } + } + stage ('run') { + steps { + sh './scripts/deliver.sh' + } + } } } diff --git a/README.md b/README.md index a4915f5..026124a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -# java-maven-app +# java-maven-app--test + The repository contains a simple Java application which outputs the string @@ -10,7 +11,9 @@ to build mvn clean install -to run +to run the application scripts/deliver.sh + + diff --git a/pom.xml b/pom.xml index 6f3a1ad..9731901 100755 --- a/pom.xml +++ b/pom.xml @@ -2,6 +2,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 com.mycompany.app + my-app jar 1.0-SNAPSHOT diff --git a/scripts/deliver.sh b/scripts/deliver.sh index fb1cb38..59d7c08 100755 --- a/scripts/deliver.sh +++ b/scripts/deliver.sh @@ -1,16 +1,3 @@ #!/usr/bin/env bash -set -x -mvn jar:jar install:install help:evaluate -Dexpression=project.name -set +x - -set -x -NAME=`mvn help:evaluate -Dexpression=project.name | grep "^[^\[]"` -set +x - -set -x -VERSION=`mvn help:evaluate -Dexpression=project.version | grep "^[^\[]"` -set +x - -set -x -java -jar target/${NAME}-${VERSION}.jar +java -jar target/my-app-1.0-SNAPSHOT.jar diff --git a/test b/test new file mode 100644 index 0000000..485d258 --- /dev/null +++ b/test @@ -0,0 +1,3 @@ +test + +123 diff --git a/test1 b/test1 new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/test1 @@ -0,0 +1 @@ +