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 5fdf050..0000000 --- a/.travis-support +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5fdf0501a920e2678a8d920df986d250fc0173f4 diff --git a/.travis.yml b/.travis.yml index 79a109e..a856626 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,4 @@ cache: directories: - "$HOME/.m2" install: true -script: "./mvnw clean install" -deploy: - provider: script - script: sh .travis-support/deploy.sh - on: - branch: master +script: "./mvnw -U -B clean install" diff --git a/CHANGELOG b/CHANGELOG index c3b897c..1109787 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,18 @@ CHANGELOG ========= +5.0.3 +----- + +* Add javadoc, source and nexus-staging plugins +* Add Jenkinsfile +* Remove travis-support for deployment + +5.0.2 +----- + +* Add pom name and description + 5.0.1 ----- diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..4e84469 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,28 @@ +final String gitRepoUrl = 'git@github.com:kemitix/kemitix-parent.git' +final String mvn = "mvn --batch-mode --update-snapshots" + +pipeline { + agent any + stages { + stage('Prepare') { + steps { + git url: gitRepoUrl, branch: '**', credentialsId: 'github-kemitix' + } + } + stage('Build') { + steps { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + sh "${mvn} clean install" + } + } + } + stage('Deploy') { + when { expression { (env.GIT_BRANCH == 'master') } } + steps { + withMaven(maven: 'maven 3.5.2', jdk: 'JDK 1.8') { + sh "${mvn} deploy --activate-profiles release" + } + } + } + } +} diff --git a/codesigning.asc.enc b/codesigning.asc.enc deleted file mode 100644 index 27b9e64..0000000 Binary files a/codesigning.asc.enc and /dev/null differ diff --git a/pom.xml b/pom.xml index 0efbfac..c06ec1b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ net.kemitix kemitix-parent - 5.0.3 + 5.1.0 pom Kemitix Parent @@ -36,7 +36,10 @@ UTF-8 1.8 + 3.0.0 + 3.0.1 1.6 + 1.6.8 @@ -53,12 +56,47 @@ release + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + attach-javadocs + package + + jar + + + + + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + attach-sources + package + + jar-no-fork + + + + + org.apache.maven.plugins maven-gpg-plugin ${maven-gpg-plugin.version} ${gpg.passphrase} + + --batch + --pinentry-mode + loopback + @@ -70,6 +108,18 @@ + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus-staging-maven-plugin.version} + true + + sonatype-nexus + https://oss.sonatype.org/ + false + + diff --git a/set-version.sh b/set-version.sh new file mode 100644 index 0000000..61099c3 --- /dev/null +++ b/set-version.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +if test $# != 1 +then + echo "next version missing" + exit +fi + +CURRENT=`grep '' pom.xml |head -n 1| sed 's/.*>\(.*\)<.*/\1/'` +NEXT=$1 + +echo Updating version from $CURRENT to $NEXT + +./mvnw versions:set -DnewVersion=$NEXT +perl -p -i -e "s,$CURRENT