From f8869ab2dcdfd5bc95ec6c21c1c871f08ccafcb4 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 21 Jul 2017 11:32:04 +0100 Subject: [PATCH 1/6] version: set to 3.3.0-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99e420f..7e50d3e 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ net.kemitix kemitix-parent - 3.2.0 + 3.3.0-SNAPSHOT pom Kemitix Parent From a38c82d897ce795345256edc140d72e6b5b42167 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 21 Jul 2017 22:07:05 +0100 Subject: [PATCH 2/6] .travis-support: added --- .gitmodules | 3 ++ .travis-support | 1 + .travis.yml | 2 +- ...codesigning.asc.enc => codesigning.asc.enc | Bin travis-ci/travis-deploy.sh | 12 -------- travis-ci/travis-settings.xml | 28 ------------------ 6 files changed, 5 insertions(+), 41 deletions(-) create mode 100644 .gitmodules create mode 160000 .travis-support rename travis-ci/codesigning.asc.enc => codesigning.asc.enc (100%) delete mode 100644 travis-ci/travis-deploy.sh delete mode 100644 travis-ci/travis-settings.xml diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..bd45c77 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule ".travis-support"] + path = .travis-support + url = git@github.com:kemitix/kemitix-travis-support.git diff --git a/.travis-support b/.travis-support new file mode 160000 index 0000000..1e1bc4e --- /dev/null +++ b/.travis-support @@ -0,0 +1 @@ +Subproject commit 1e1bc4ebcb290bba6e56dcfbe2afbe8b9b785a98 diff --git a/.travis.yml b/.travis.yml index cfa27dd..6982e71 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ install: true script: "./mvnw clean install" deploy: provider: script - script: sh travis-ci/travis-deploy.sh + script: sh .travis-support/deploy.sh on: branch: master env: diff --git a/travis-ci/codesigning.asc.enc b/codesigning.asc.enc similarity index 100% rename from travis-ci/codesigning.asc.enc rename to codesigning.asc.enc diff --git a/travis-ci/travis-deploy.sh b/travis-ci/travis-deploy.sh deleted file mode 100644 index b68fd67..0000000 --- a/travis-ci/travis-deploy.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -echo "Preparing to deploy to nexus..." -openssl aes-256-cbc -K $encrypted_f424d6efdd6f_key -iv $encrypted_f424d6efdd6f_iv \ - -in travis-ci/codesigning.asc.enc -out travis-ci/codesigning.asc -d -echo "Signing key decrypted" -gpg --batch --fast-import travis-ci/codesigning.asc -echo "Signing key imported" -./mvnw --settings travis-ci/travis-settings.xml \ - -Dskip-Tests=true -P release -B deploy -echo "Deploy complete" - diff --git a/travis-ci/travis-settings.xml b/travis-ci/travis-settings.xml deleted file mode 100644 index e2d8c63..0000000 --- a/travis-ci/travis-settings.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - sonatype-nexus-snapshots - kemitix - ${env.CI_DEPLOY_PASSWORD} - - - sonatype-nexus-staging - kemitix - ${env.CI_DEPLOY_PASSWORD} - - - - - gpg-sign - - true - - - gpg - ${env.CI_DEPLOY_GPG_KEYNAME} - ${env.CI_DEPLOY_GPG_PASSPHRASE} - - - - From 070a8e1f2fb5c08e29a379ef034ad86c281bf8ee Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 21 Jul 2017 22:20:32 +0100 Subject: [PATCH 3/6] .gitmodules: use annonymous access for submodule --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index bd45c77..c50d110 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule ".travis-support"] path = .travis-support - url = git@github.com:kemitix/kemitix-travis-support.git + url = https://github.com/kemitix/kemitix-travis-support.git From 8bc0ee5a2e0810eebcf5471b14c6a00dd00f3eaa Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 21 Jul 2017 22:27:17 +0100 Subject: [PATCH 4/6] .travis.yml: remove legacy global environment variables --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6982e71..79a109e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,3 @@ deploy: script: sh .travis-support/deploy.sh on: branch: master -env: - global: - - secure: IZu0VGBsjxwaWGiBh0muZTbxE25aDubsgNGuCp/6tHRtOA73tIwLOeeINJd4iblMvLFg6SrVW7wMhO2N12Pxt5v/czjt3q+t34faXlKP9NK4DjwT2awf96oafVVn3yK0e8S60YwOeSzutF0pEMhGa2nQCmEsAyTcbuavBABeXPKP9QwO9ByywFLZIsbg2uwU1JJALQeyHgYl8DVag2UdVUBfQ2TBB3VaCcwiDOmd/V7Ks2BtzGE4mGDJOWiBrOsANlKwYMhHqcgzH29KeiDvNs8JU8YfizCeQA4mOAUut5A+u+2dXeqdrqL9Nch618tFb73ty4l/rlInmIXRnuV/JvWR8ZnX2N1ngJGe3GOCnA+oSHDDkdW4aRKvcrs8hnKmSew/OV9+locRvYIOO3tJq4A2Rc0izF5jSn+i+yUJpaZlpKiuNSNs0eRTtUggUAQn61c+1In4aWSofsMpObD/KD7K/N5oi71cznxHFHl98QAFlHRza1siYVPAvtINbG04ijChYPFSH527+2XMbis4BhyqoCYH7+xa4qsLriOVuvodomQCaB+5lIiiDYC/N7zesz167Dgv/Gdxfk8NxKjr8XO0dPI3303SspQi2aR9EHpvZF7TkABx/7nzxq04V1u4bHT+EBFyT3Cg+SFiAv3MAbYal2SuzNSAGoRShTySnEs= - - secure: pJLKI3vrSxoD8eHFL4dRJOvn0kjCBk6iQkeRtUVQe9hoE+zyzqlLPG2Gy13qNCRnmx3B3HDPPnGWeUbeyXNHB5TtjXdoYkqUREgwNsV0d4MxvWf2AX52WmhoQylYj1sZEQPPcG1+3+C383PbmoFXg+9nFoevJuhLQGsn5jt8R9Lzk1LPNua1O+v7VThq5HuI5dr32PskQYOSC4bX4B4I/OnzFxLickqjNr8UALzzV5dmNtqBClsmWXz8kA/XQBx4iso3IxLL8/6+oceBnPbC7Vjmx07E79xSqb4dUTH5UWeJSsugw0Pdt4fR/VjoSW8HUDl0MpjKIhiPvA3j2fjoOwuhFSCDpTn5m62Fb2qOvJSsFkg0s0kZl7VDHvFPLZvnelFwLV2eB8M7R7Zu9EHmt1Vq6Bk/XpH9pONNp6EyFpnudXMln1sd5TlRykNwQgP+wQE94bak3xTyzlWGsP9ynjnQQqZS1lcI6FVr0SHv4+QjaHKR9MXcYodjpa3FkIPXiaMiaUETI1X4wCaePaVD0MqGe11+cdO6DpLFEUP91dCbinRag5ct6A+KAE/9ncQIr9kPRnHOXZqWj3ZxG1A7AYNwX9zUomZazKOr8vB1g+Vx8ijH0B+EcxWsykTxIUjQv179uVBwVvhg9V1Osqzuz0bvpO+jDawv4U5kswU4VWU= - - secure: X8oPsjaaL7fk5r4tMp+1cpcXzOUlqwcQQImIV+O1j/h7u2qZJpwErHJZx2hDKCQu/brkHlFPSRgc7hxhXIsZ3tvXqUtfl8WkaszceVkqs23uWQLPh5ENL/yxrRPiiQQ9+tliq/VrnzRFrXmnUJKG4c0m7b7gB1lwvpFWNl2LegmvMxoWAJQno1tjXoNt7w1qykeQNL1K/BvzEYWroNbz11XnlaYuCO18tAPSSfm7umk7p3mzJzKFtKfWbaEhUecJx9ah5yAv/haT/yQfoJoZF9HkjtbcYHhw1TH9IsWFurm8VxzM1KvW7DxM+GdpABNkYYQ71iv0EUuU4M+n+w/stv/aOXLoM9/qRijJhK9YpsMcPj3rB2vPjd0dBpz3yOrlhxubu82O+zRkcBi0VYbxbMq19CmPVY1RtuLbfLCCJlbTlwPOof5NZ02r6SlrBJ+glmGgT51oTwHMvsU1y0iryOcN7DuK2WC2H3f/AZYNSo1c2oMefY5Rv08GqYr2dthmGhhmoN+GjOOKcJhZgxXNMQesuPfYHXcyyDsl5ApNWK5K0KJcSJ/KD2Ls1Fc90bzUtCVazZ1MI5NqIYutfqqyhcqI1ftn3m6fPDbpkdQcCbdhMq1ebCo6veq52onjzAbA2OV1sWc24zzjLVq0RV/hHCz9smaKM5fIwvbDk/JfOAs= From 16fa88d3c1cd70b97eb9c1f055f77832a077a718 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 21 Jul 2017 22:42:04 +0100 Subject: [PATCH 5/6] version: set to 3.2.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e50d3e..f9bad1f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ net.kemitix kemitix-parent - 3.3.0-SNAPSHOT + 3.2.1 pom Kemitix Parent From 1f8df12a6f48fac50e99051858825c5c747c729a Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 21 Jul 2017 22:42:17 +0100 Subject: [PATCH 6/6] CHANGELOG --- CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index b7cd5f9..21c112e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,11 @@ CHANGELOG ========= +3.2.1 +----- + +* Travis support provided by `kemitix-travis-support` + 3.2.0 -----