Merge pull request #13 from kemitix/upgrade-tiles

Upgrade kemitix-maven-tiles to 0.5.2
This commit is contained in:
Paul Campbell 2018-02-27 07:00:10 +00:00 committed by GitHub
commit 78bb906cfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 20 deletions

29
Jenkinsfile vendored
View file

@ -3,33 +3,24 @@ pipeline {
stages { stages {
stage('Prepare') { stage('Prepare') {
steps { steps {
checkout([ git url: 'git@github.com:kemitix/conditional.git',
$class: 'GitSCM', branch: '**',
branches: [[name: '**']], credentialsId: 'github-kemitix'
extensions: [[$class: 'CleanBeforeCheckout']],
userRemoteConfigs: [[credentialsId: 'github-kemitix', url: 'git@github.com:kemitix/conditional.git']]
])
} }
} }
stage('Build') { stage('Build') {
steps { steps {
sh './mvnw -B -U clean install' withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
} sh "mvn -B -U clean install"
} }
stage('Reporting') {
steps {
junit '**/target/surefire-reports/*.xml'
archiveArtifacts '**/target/*.jar'
} }
} }
stage('Deploy') { stage('Deploy') {
when { when { expression { (env.GIT_BRANCH == 'master') } }
expression {
env.GIT_BRANCH == 'master'
}
}
steps { steps {
sh './mvnw -B -Dskip-Tests=true -P release deploy' withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') {
sh "mvn -B -U -P release deploy"
}
} }
} }
} }

View file

@ -16,7 +16,7 @@
<assertj.version>3.8.0</assertj.version> <assertj.version>3.8.0</assertj.version>
<coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version> <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
<tiles-maven-plugin.version>2.10</tiles-maven-plugin.version> <tiles-maven-plugin.version>2.10</tiles-maven-plugin.version>
<kemitix-tiles.version>0.5.1</kemitix-tiles.version> <kemitix-tiles.version>0.5.2</kemitix-tiles.version>
<lombok.version>1.16.20</lombok.version> <lombok.version>1.16.20</lombok.version>
</properties> </properties>