diff --git a/.travis.yml b/.travis.yml index 0d1d54a..ea42614 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ cache: directories: - "$HOME/.m2" install: true -script: "./mvnw clean install" +script: "./mvnw -B -U clean install" after_success: - sh .travis-support/coveralls.sh - bash <(curl -s https://codecov.io/bash) diff --git a/CHANGELOG b/CHANGELOG index accb642..bdec8c3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,12 @@ CHANGELOG ========= +0.4.0 +----- + +* Building with Jenkins +* Upgrade `kemitix-parent` to 5.0.3 + 0.3.0 ----- diff --git a/Jenkinsfile b/Jenkinsfile index 2d06154..880b2ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,20 +1,36 @@ pipeline { agent any stages { - stage('Build') { + stage('Prepare') { steps { checkout([ $class: 'GitSCM', branches: [[name: '**']], - doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CleanBeforeCheckout']], - submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-kemitix', url: 'git@github.com:kemitix/conditional.git']] ]) - sh './mvnw clean install' + } + } + stage('Build') { + steps { + sh './mvnw -B -U clean install' + } + } + stage('Reporting') { + steps { junit '**/target/surefire-reports/*.xml' archiveArtifacts '**/target/*.jar' } } + stage('Deploy') { + when { + expression { + env.GIT_BRANCH == 'master' + } + } + steps { + sh './mvnw -B -Dskip-Tests=true -P release deploy' + } + } } } diff --git a/pom.xml b/pom.xml index 0169c89..00dd62e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 3.2.0 - 5-complexity + 1.8 + 4.0.1 + 5-complexity 1 1 0 @@ -14,18 +15,27 @@ 4.12 3.8.0 4.3.0 + 2.10 + 0.5.1 + 1.16.20 - net.kemitix + net.kemitix kemitix-parent - 3.2.0 + 5.0.3 conditional 0.4.0-SNAPSHOT + + org.projectlombok + lombok + ${lombok.version} + true + junit junit @@ -43,25 +53,16 @@ - net.kemitix - kemitix-checkstyle-ruleset-maven-plugin - ${kemitix-checkstyle-ruleset.version} + io.repaint.maven + tiles-maven-plugin + ${tiles-maven-plugin.version} + true - ${kemitix-checkstyle-ruleset.level} + + net.kemitix.tiles:all:${kemitix-tiles.version} + net.kemitix.checkstyle:tile:${kemitix-checkstyle.version} + - - - validate - - check - - - - - - org.eluder.coveralls - coveralls-maven-plugin - ${coveralls-maven-plugin.version}