From 01080dfea02ac0bb1c2be023faa229290131909a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BCller?= Date: Thu, 9 Nov 2017 16:03:35 +0100 Subject: [PATCH 01/10] prepare release --- .circleci.settings.xml | 10 +++++++++ circle.yml | 47 ++++++++++++++++++++++++++++++++++++++++++ pom.xml | 32 +--------------------------- 3 files changed, 58 insertions(+), 31 deletions(-) create mode 100644 .circleci.settings.xml create mode 100644 circle.yml diff --git a/.circleci.settings.xml b/.circleci.settings.xml new file mode 100644 index 0000000..c8679f5 --- /dev/null +++ b/.circleci.settings.xml @@ -0,0 +1,10 @@ + + + + oss.sonatype + ${env.OSS_SONATYPE_USERNAME} + ${env.OSS_SONATYPE_PASSWORD} + + + \ No newline at end of file diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..07dce40 --- /dev/null +++ b/circle.yml @@ -0,0 +1,47 @@ +# Java Maven CircleCI 2.0 configuration file +# +# Check https://circleci.com/docs/2.0/language-java/ for more details +# +version: 2 +jobs: + build: + docker: + # specify the version you desire here + - image: circleci/openjdk:8-jdk + + # Specify service dependencies here if necessary + # CircleCI maintains a library of pre-built images + # documented at https://circleci.com/docs/2.0/circleci-images/ + # - image: circleci/postgres:9.4 + + working_directory: ~/repo + + environment: + # Customize the JVM maximum heap limit + MAVEN_OPTS: -Xmx3200m + + steps: + - checkout + + # Download and cache dependencies + - restore_cache: + keys: + - v1-dependencies-{{ checksum "pom.xml" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- + + - run: mvn dependency:go-offline + + - save_cache: + paths: + - ~/.m2 + key: v1-dependencies-{{ checksum "pom.xml" }} + + # run tests! + - run: mvn clean install + +deployment: + main: + branch: master + commands: + - mvn -s .circleci.settings.xml -DskipTests deploy diff --git a/pom.xml b/pom.xml index 63f6337..85fdfce 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.jtendermint jabci - 0.11.0-SNAPSHOT + 0.12.0 com.github.jtendermint:jabci Java implementation for ABCI consensus protocol from tendermint.com and related tools @@ -151,38 +151,8 @@ - - rel - - ${bamboo_planRepository_branchName} - - - - - ponton.product.maven.plugins - createversion-maven-plugin - 1.2.0 - - ${bamboo.planRepository.branchName} - - - release/(.+) - #{project.simpleVersion} - release - - - - - - - release - - - target/release - - From e86b81da9965640827e995589274b29edaee7027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BCller?= Date: Thu, 9 Nov 2017 16:19:53 +0100 Subject: [PATCH 02/10] try to enable deployment --- circle.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/circle.yml b/circle.yml index 07dce40..f8d4a3a 100644 --- a/circle.yml +++ b/circle.yml @@ -40,8 +40,8 @@ jobs: # run tests! - run: mvn clean install -deployment: - main: - branch: master - commands: - - mvn -s .circleci.settings.xml -DskipTests deploy + deployment: + main: + branch: master + commands: + - mvn -s .circleci.settings.xml -DskipTests deploy From 6c5f35474ef29f6f52d8193194ff135f15508994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BCller?= Date: Thu, 9 Nov 2017 16:22:43 +0100 Subject: [PATCH 03/10] try to enable deployment --- circle.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/circle.yml b/circle.yml index f8d4a3a..c740448 100644 --- a/circle.yml +++ b/circle.yml @@ -40,8 +40,10 @@ jobs: # run tests! - run: mvn clean install - deployment: - main: - branch: master - commands: - - mvn -s .circleci.settings.xml -DskipTests deploy + - deployment + +deployment: + main: + branch: master + commands: + - mvn -s .circleci.settings.xml -DskipTests deploy From a6df8ce377de238feb34b9024f10e6b6e7bc7d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BCller?= Date: Thu, 9 Nov 2017 16:28:10 +0100 Subject: [PATCH 04/10] circleCi: try something else. Maybe this works out of the box --- circle.yml | 48 ++++++------------------------------------------ 1 file changed, 6 insertions(+), 42 deletions(-) diff --git a/circle.yml b/circle.yml index c740448..23fd82c 100644 --- a/circle.yml +++ b/circle.yml @@ -1,46 +1,10 @@ -# Java Maven CircleCI 2.0 configuration file -# -# Check https://circleci.com/docs/2.0/language-java/ for more details -# -version: 2 -jobs: - build: - docker: - # specify the version you desire here - - image: circleci/openjdk:8-jdk - - # Specify service dependencies here if necessary - # CircleCI maintains a library of pre-built images - # documented at https://circleci.com/docs/2.0/circleci-images/ - # - image: circleci/postgres:9.4 +dependencies: + override: + - mvn -DskipTests clean install dependency:resolve-plugins dependency:go-offline - working_directory: ~/repo - - environment: - # Customize the JVM maximum heap limit - MAVEN_OPTS: -Xmx3200m - - steps: - - checkout - - # Download and cache dependencies - - restore_cache: - keys: - - v1-dependencies-{{ checksum "pom.xml" }} - # fallback to using the latest cache if no exact match is found - - v1-dependencies- - - - run: mvn dependency:go-offline - - - save_cache: - paths: - - ~/.m2 - key: v1-dependencies-{{ checksum "pom.xml" }} - - # run tests! - - run: mvn clean install - - - deployment +test: + override: + - mvn -o surefire:test deployment: main: From 7facc3b0e21d296342d8f156d955230f4ee89797 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BCller?= Date: Thu, 9 Nov 2017 16:31:25 +0100 Subject: [PATCH 05/10] circleCi: do not use surefire goal --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 23fd82c..f78cb05 100644 --- a/circle.yml +++ b/circle.yml @@ -4,7 +4,7 @@ dependencies: test: override: - - mvn -o surefire:test + - mvn -o test deployment: main: From 0fd6b4c0b3715db7ed82f6de1f2b8f8d7f8590b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BCller?= Date: Thu, 9 Nov 2017 16:34:49 +0100 Subject: [PATCH 06/10] circleCi: run tests immediately --- circle.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/circle.yml b/circle.yml index f78cb05..32482a0 100644 --- a/circle.yml +++ b/circle.yml @@ -1,10 +1,6 @@ dependencies: override: - - mvn -DskipTests clean install dependency:resolve-plugins dependency:go-offline - -test: - override: - - mvn -o test + - mvn clean install dependency:resolve-plugins dependency:go-offline deployment: main: From 6997b44c88fefb6b4f261a1ddc17652762fc195a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BCller?= Date: Thu, 9 Nov 2017 18:03:28 +0100 Subject: [PATCH 07/10] cleanup the mess --- .circleci.settings.xml | 4 ++++ circle.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci.settings.xml b/.circleci.settings.xml index c8679f5..aea839f 100644 --- a/.circleci.settings.xml +++ b/.circleci.settings.xml @@ -6,5 +6,9 @@ ${env.OSS_SONATYPE_USERNAME} ${env.OSS_SONATYPE_PASSWORD} + + gpg.passphrase + ${env.OSS_SONATYPE_PASSPHRASE} + \ No newline at end of file diff --git a/circle.yml b/circle.yml index 32482a0..20cd122 100644 --- a/circle.yml +++ b/circle.yml @@ -6,4 +6,4 @@ deployment: main: branch: master commands: - - mvn -s .circleci.settings.xml -DskipTests deploy + - mvn -P release -s .circleci.settings.xml -DskipTests deploy From 4ea222902a883b8f7a8c97dd522cff5141c62d3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BCller?= Date: Thu, 9 Nov 2017 18:13:57 +0100 Subject: [PATCH 08/10] cleanup the mess --- .circleci.settings.xml | 2 +- circle.yml | 5 ++++- gpg/secret | Bin 0 -> 2624 bytes 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 gpg/secret diff --git a/.circleci.settings.xml b/.circleci.settings.xml index aea839f..e88859e 100644 --- a/.circleci.settings.xml +++ b/.circleci.settings.xml @@ -8,7 +8,7 @@ gpg.passphrase - ${env.OSS_SONATYPE_PASSPHRASE} + ${env.GPG_PASSPHRASE} \ No newline at end of file diff --git a/circle.yml b/circle.yml index 20cd122..eb65a4b 100644 --- a/circle.yml +++ b/circle.yml @@ -1,4 +1,7 @@ dependencies: + pre: + - mkdir -p ~/.gnupg + - openssl aes-256-cbc -d -in gpg/secret -k $SIGN_SECRET >> ~/.gnupg/secring.gpg override: - mvn clean install dependency:resolve-plugins dependency:go-offline @@ -6,4 +9,4 @@ deployment: main: branch: master commands: - - mvn -P release -s .circleci.settings.xml -DskipTests deploy + - mvn -P release -s .circleci.settings.xml -DskipTests deploy -Dgpg.passphrase=$GPG_PASSPHRASE diff --git a/gpg/secret b/gpg/secret new file mode 100644 index 0000000000000000000000000000000000000000..e17c82472369009110950753b7381f08251bd582 GIT binary patch literal 2624 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 Date: Thu, 9 Nov 2017 18:18:18 +0100 Subject: [PATCH 09/10] provide pubkey for gpg (this should be removed and a sign-only key should be used instead) --- circle.yml | 1 + gpg/pubring.gpg | Bin 0 -> 1226 bytes 2 files changed, 1 insertion(+) create mode 100644 gpg/pubring.gpg diff --git a/circle.yml b/circle.yml index eb65a4b..d636b6a 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,7 @@ dependencies: pre: - mkdir -p ~/.gnupg + - cp gpg/pubring.gpg ~/.gnupg/pubring.gpg - openssl aes-256-cbc -d -in gpg/secret -k $SIGN_SECRET >> ~/.gnupg/secring.gpg override: - mvn clean install dependency:resolve-plugins dependency:go-offline diff --git a/gpg/pubring.gpg b/gpg/pubring.gpg new file mode 100644 index 0000000000000000000000000000000000000000..38d0964f65dab2f816a97efd21083e2ae5f6d5e7 GIT binary patch literal 1226 zcmV;*1U37a0SyFN1c=T72mrM}JoE%eOt?#L;Eb9YZMK+eK2#)}cku8^gVZ~hoxVcM?mlrCcu8ld^<~6TqeVM?7 z|H)n*fUXQ~qs>r)>rk{;KUmjA_`y4Z6iOXD*dfGP+QasK+C%eN_3LVTalb<)y8{W; zF;A`hx&kPhZ<1i4WD@5}Y#?i8c`hJVX>4pD zVr3w6b#P^Jb7f^@Wn?KJJZ*JlY;0w6KyYtvbZ>4hWMw{y0XYN{0SEvi1p-OB93K?)jXJf5Uvm#dFbu)FnuZtK zmc20~?^Oo~-MZD=Stz#Ey!ixP1nb3pHL-VpQ=b{RTmdYr8HK|b?6ovKhc$hON+;=S zLyuGc^cXuiY-Y5-4seetfT+?$?$G@ds$LvZ$*-- z$&5Zw4tl`l@I`O_bfSL+*kO@CFKB)wU9bN`R~y%A7Yl~L{^nJ6(HEM?BiICAcr3}@wOV(*8ttXeH-Nb&co{wL&gwxCqUyxmE& zmYWa~1izASQ4)u7W)omYPMBU}*T2`2_gKdHp3=#jYv-g8-qE%g6B@l-pZNh&=~aW4eR=P`rt zcvl{({LW`9pAOA9tyt9=^B{Z*3*vGndHonpW_!YeyW^?6-re^dDHr@mWvw5m7O6g` zcR`+-)F$cDCmv?6>SrsUkqxPHK$E4_nZ{nCy4lLbZ);ztjZv}wtpBXi0TYq|^>Y9b z0RRDs0Urby0SEvI1p- z|9u1PS2|ye@)Jt)xLIgd=-R^GH{N(zL4F@YC{kNKP_i;)!|YO{j(L{~38pj}7e}*h o0=SA#9oiHWo40tX_(Erqg>@J(q#TQWwg&rt2d`_o_OJo~0}Q!0!vFvP literal 0 HcmV?d00001 From 9cbb406485d9deed8a50ca6c1e30cebb7494e55e Mon Sep 17 00:00:00 2001 From: Wolf Posdorfer Date: Tue, 14 Nov 2017 14:27:13 +0100 Subject: [PATCH 10/10] Version bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7741e91..32ba201 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.github.jtendermint jabci - SNAPSHOT + 0.12.0.1 com.github.jtendermint:jabci Java implementation for ABCI consensus protocol from tendermint.com and related tools