diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index c50d110..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule ".travis-support"] - path = .travis-support - url = https://github.com/kemitix/kemitix-travis-support.git diff --git a/.travis-support b/.travis-support deleted file mode 160000 index b8593e5..0000000 --- a/.travis-support +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b8593e541ba9a11447fa9559a83e5f99097ca4d2 diff --git a/.travis.yml b/.travis.yml index 1f3bfa4..fcd939b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,4 @@ cache: directories: - "$HOME/.m2" install: true -script: "./mvnw clean install" -after_success: -- sh .travis-support/coveralls.sh -- bash <(curl -s https://codecov.io/bash) -deploy: - provider: script - script: sh .travis-support/deploy.sh - on: - branch: master +script: "./mvnw -B -U clean install" diff --git a/CHANGELOG b/CHANGELOG index 5a2658c..8a25f54 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,11 @@ CHANGELOG ========= +0.7.0 +----- + +* + 0.6.0 ----- diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy index 6c74e11..0e9f8ea 100644 --- a/Jenkinsfile.groovy +++ b/Jenkinsfile.groovy @@ -1,27 +1,32 @@ -final String repoName = "mon" -final String repoUrl = "git@github.com:kemitix/${repoName}.git" final String mvn = "mvn --batch-mode --update-snapshots" pipeline { agent any stages { - stage('Prepare') { + stage('Environment') { steps { - git url: repoUrl, branch: '**', credentialsId: 'github-kemitix' + sh 'set' } } stage('no SNAPSHOT in master') { - // checks that the pom version is not a snapshot when the current branch is master - // TODO: also check for SNAPSHOT when is a pull request with master as the target branch + // checks that the pom version is not a snapshot when the current or target branch is master when { expression { - (env.GIT_BRANCH == 'master') && + (env.GIT_BRANCH == 'master' || env.CHANGE_TARGET == 'master') && (readMavenPom(file: 'pom.xml').version).contains("SNAPSHOT") } } steps { error("Build failed because SNAPSHOT version") } } + stage('Static Code Analysis') { + steps { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + sh "${mvn} compile checkstyle:checkstyle pmd:pmd" + } + pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '', unHealthy: '' + } + } stage('Build') { parallel { stage('Java 8') { @@ -34,7 +39,7 @@ pipeline { stage('Java 9') { steps { withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { - sh 'mvn clean install' + sh "${mvn} clean install" } } } @@ -43,6 +48,14 @@ pipeline { stage('Test Results') { steps { junit '**/target/surefire-reports/*.xml' + jacoco exclusionPattern: '**/*{Test|IT|Main|Application|Immutable}.class' + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + sh "${mvn} com.gavinmogan:codacy-maven-plugin:coverage " + + "-DcoverageReportFile=target/site/jacoco/jacoco.xml " + + "-DprojectToken=`$JENKINS_HOME/codacy/token` " + + "-DapiToken=`$JENKINS_HOME/codacy/apitoken` " + + "-Dcommit=`git rev-parse HEAD`" + } } } stage('Archiving') { @@ -50,15 +63,10 @@ pipeline { archiveArtifacts '**/target/*.jar' } } - stage('Coverage') { - steps { - jacoco(execPattern: '**/target/jacoco.exec') - } - } stage('Deploy') { when { expression { (env.GIT_BRANCH == 'master') } } steps { - withMaven(maven: 'maven 3.5.2', jdk: 'JDK 9') { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { sh "${mvn} deploy --activate-profiles release -DskipTests=true" } } diff --git a/codesigning.asc.enc b/codesigning.asc.enc deleted file mode 100644 index 2963d29..0000000 Binary files a/codesigning.asc.enc and /dev/null differ diff --git a/pom.xml b/pom.xml index 4d4717a..93691fb 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ net.kemitix mon - 0.6.0 + 0.7.0-SNAPSHOT 1.8