From abf96ae6acc72c57b7c1bbf8b32160dc7d623fea Mon Sep 17 00:00:00 2001 From: io-scalecube-ci Date: Sat, 14 Mar 2020 09:52:46 +0000 Subject: [PATCH 001/130] Merge pull request #76 from scalecube/develop update jacoco-maven-plugin [skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index db60093..3fe0e68 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.0.22 + 0.0.23-SNAPSHOT pom ScaleCube parent project @@ -24,7 +24,7 @@ https://scalecube.io scm:git:git@github.com:scalecube/scalecube-parent.git scm:git:git@github.com:scalecube/scalecube-parent.git - v0.0.22 + HEAD From 5dbb727fd39ec2c83e7f3ea3d93fadf58d381951 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 21 Mar 2020 19:35:39 +0200 Subject: [PATCH 002/130] Reverted puppy-crawl to 14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3fe0e68..a2a05c2 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ google_checks.xml - 8.20 + 8.14 scalecube/${project.artifactId} 1.4.6 From ffae196e99a8ce0ec2fe467c886c9153062c3ce9 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 21 Mar 2020 21:07:23 +0200 Subject: [PATCH 003/130] Prepare pom for java 11 --- pom.xml | 56 +++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index a2a05c2..2a80255 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ - 3.0.3 + 3.3.9 @@ -55,18 +55,20 @@ UTF-8 - 3.7.0 - 3.0.1 - 2.10.4 - 2.22.0 + 3.8.1 + 3.2.1 + 3.2.0 + 3.0.0-M4 1.6 1.6.8 - 2.5.3 - 3.0.0-M1 - 3.10.0 + 3.0.0-M1 + 3.0.0-M3 + 3.13.0 3.0.0 - 3.1.0 - 3.1.0 + 3.2.0 + 3.1.2 + 2.7 + 0.8.5 google_checks.xml @@ -96,6 +98,14 @@ + + org.codehaus.mojo + versions-maven-plugin + ${versions-maven-plugin.version} + + false + + maven-jar-plugin ${maven-jar-plugin.version} @@ -144,11 +154,9 @@ maven-compiler-plugin - 3.7.0 + ${maven-compiler-plugin.version} - 1.8 - 1.8 - true + 11 @@ -194,11 +202,16 @@ maven-surefire-plugin ${maven-surefire-plugin.version} + + + --illegal-access=permit + + org.jacoco jacoco-maven-plugin - 0.8.4 + ${jacoco-maven-plugin.version} @@ -256,6 +269,19 @@ + + enforce-maven + + enforce + + + + + [3.3.9,) + + + + From 745e1da8576aca969856976ae81646a5ccbbc581 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 21 Mar 2020 21:20:57 +0200 Subject: [PATCH 004/130] Prepare pom for java 11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a80255..410b36f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.0.23-SNAPSHOT + 0.1.0-SNAPSHOT pom ScaleCube parent project From f11518d7ecb909dccc90767956e8fd6490f67cd1 Mon Sep 17 00:00:00 2001 From: io-scalecube-ci Date: Sat, 21 Mar 2020 21:36:49 +0000 Subject: [PATCH 005/130] updated: travis ci configuration file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ce26c80..c02c943 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ addons: - libxml-xpath-perl sudo: required language: java -jdk: openjdk8 +jdk: openjdk11 before_install: - "./src/main/scripts/ci/before-install.sh" - "./src/main/scripts/cd/before-deploy.sh" From da90749f46b1a77217346f5b66056e0d6a8f4a7f Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Tue, 14 Apr 2020 17:43:45 +0300 Subject: [PATCH 006/130] Fixed javadoc plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 410b36f..ca94c4d 100644 --- a/pom.xml +++ b/pom.xml @@ -308,7 +308,7 @@ jar - -Xdoclint:none + none true From 49c711a2e6caf52eb83bce12d0688cb1f0afead2 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Tue, 14 Apr 2020 17:51:44 +0300 Subject: [PATCH 007/130] Removed javadoc plugin --- pom.xml | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pom.xml b/pom.xml index 410b36f..9bdb2ca 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,6 @@ 3.8.1 3.2.1 - 3.2.0 3.0.0-M4 1.6 1.6.8 @@ -297,23 +296,6 @@ - - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - - attach-javadocs - post-integration-test - - jar - - - -Xdoclint:none - true - - - - maven-gpg-plugin ${maven-gpg-plugin.version} @@ -429,9 +411,6 @@ maven-source-plugin - - maven-javadoc-plugin - maven-gpg-plugin From 137344173dd9643fba503e42354b4aaecd66358c Mon Sep 17 00:00:00 2001 From: io-scalecube-ci Date: Tue, 14 Apr 2020 14:56:52 +0000 Subject: [PATCH 008/130] Merge pull request #82 from scalecube/develop New release [skip ci] prepare release v0.1.0 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9bdb2ca..251b65b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.1.0-SNAPSHOT + 0.1.0 pom ScaleCube parent project @@ -24,7 +24,7 @@ https://scalecube.io scm:git:git@github.com:scalecube/scalecube-parent.git scm:git:git@github.com:scalecube/scalecube-parent.git - HEAD + v0.1.0 From 836410e2af464986bf4055db5c60aba43bc04b18 Mon Sep 17 00:00:00 2001 From: io-scalecube-ci Date: Tue, 14 Apr 2020 14:56:59 +0000 Subject: [PATCH 009/130] Merge pull request #82 from scalecube/develop New release [skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 251b65b..a92f41b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.1.0 + 0.1.1-SNAPSHOT pom ScaleCube parent project @@ -24,7 +24,7 @@ https://scalecube.io scm:git:git@github.com:scalecube/scalecube-parent.git scm:git:git@github.com:scalecube/scalecube-parent.git - v0.1.0 + HEAD From dd714aa92e6483cd9b78fbc286106f7a8e6b528c Mon Sep 17 00:00:00 2001 From: io-scalecube-ci Date: Tue, 14 Apr 2020 14:56:59 +0000 Subject: [PATCH 010/130] ++++ Prepare for next development iteration build: 327 ++++ --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 251b65b..a92f41b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.1.0 + 0.1.1-SNAPSHOT pom ScaleCube parent project @@ -24,7 +24,7 @@ https://scalecube.io scm:git:git@github.com:scalecube/scalecube-parent.git scm:git:git@github.com:scalecube/scalecube-parent.git - v0.1.0 + HEAD From caaa5cbbb42f23d6f4b4544b1635b515def0710a Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Wed, 15 Apr 2020 00:45:39 +0300 Subject: [PATCH 011/130] Brought back javadoc plugin --- pom.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pom.xml b/pom.xml index a92f41b..2ea6d5d 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,7 @@ 3.8.1 3.2.1 + 3.2.0 3.0.0-M4 1.6 1.6.8 @@ -296,6 +297,23 @@ + + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + attach-javadocs + post-integration-test + + jar + + + none + true + + + + maven-gpg-plugin ${maven-gpg-plugin.version} @@ -411,6 +429,9 @@ maven-source-plugin + + maven-javadoc-plugin + maven-gpg-plugin From 81a2ac625d0762edfd6a3ce453550595d1ddcbd0 Mon Sep 17 00:00:00 2001 From: io-scalecube-ci Date: Tue, 14 Apr 2020 21:52:35 +0000 Subject: [PATCH 012/130] Merge pull request #83 from scalecube/develop New release [skip ci] prepare release v0.1.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2ea6d5d..229f84d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.1.1-SNAPSHOT + 0.1.1 pom ScaleCube parent project @@ -24,7 +24,7 @@ https://scalecube.io scm:git:git@github.com:scalecube/scalecube-parent.git scm:git:git@github.com:scalecube/scalecube-parent.git - HEAD + v0.1.1 From 93972234edaa7d0cbe9d0d9d17f57996ebe41ccb Mon Sep 17 00:00:00 2001 From: io-scalecube-ci Date: Tue, 14 Apr 2020 21:52:42 +0000 Subject: [PATCH 013/130] Merge pull request #83 from scalecube/develop New release [skip ci] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 229f84d..fdefbf8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.1.1 + 0.1.2-SNAPSHOT pom ScaleCube parent project @@ -24,7 +24,7 @@ https://scalecube.io scm:git:git@github.com:scalecube/scalecube-parent.git scm:git:git@github.com:scalecube/scalecube-parent.git - v0.1.1 + HEAD From d0cf788a86bbb45b5a2ee2c49458e0c5c03b82a6 Mon Sep 17 00:00:00 2001 From: io-scalecube-ci Date: Tue, 14 Apr 2020 21:52:42 +0000 Subject: [PATCH 014/130] ++++ Prepare for next development iteration build: 333 ++++ --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 229f84d..fdefbf8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.1.1 + 0.1.2-SNAPSHOT pom ScaleCube parent project @@ -24,7 +24,7 @@ https://scalecube.io scm:git:git@github.com:scalecube/scalecube-parent.git scm:git:git@github.com:scalecube/scalecube-parent.git - v0.1.1 + HEAD From 940c760d7d3bddddfe72e285dfe65c457fdbc032 Mon Sep 17 00:00:00 2001 From: io-scalecube-ci Date: Wed, 24 Jun 2020 15:43:52 +0000 Subject: [PATCH 015/130] updated: travis ci configuration file --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c02c943..ce26c80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ addons: - libxml-xpath-perl sudo: required language: java -jdk: openjdk11 +jdk: openjdk8 before_install: - "./src/main/scripts/ci/before-install.sh" - "./src/main/scripts/cd/before-deploy.sh" From 5822046ba12d1f3898c55339494fc03c9e4e7ab9 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Wed, 24 Jun 2020 19:46:55 +0300 Subject: [PATCH 016/130] Changed compiler options for jdk 8 --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fdefbf8..bc8a119 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,9 @@ maven-compiler-plugin ${maven-compiler-plugin.version} - 11 + 1.8 + 1.8 + true From 799320593e5d6023f7536074bacb427f068bf840 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 26 Jun 2020 12:50:10 +0300 Subject: [PATCH 017/130] Updated surefire -> .M1, release -> .M2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index bc8a119..2a05c87 100644 --- a/pom.xml +++ b/pom.xml @@ -58,10 +58,10 @@ 3.8.1 3.2.1 3.2.0 - 3.0.0-M4 + 3.0.0-M1 1.6 1.6.8 - 3.0.0-M1 + 3.0.0-M2 3.0.0-M3 3.13.0 3.0.0 From 558f0c2179343051db5eb2da8eafd36b43647736 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 26 Jun 2020 14:00:59 +0300 Subject: [PATCH 018/130] Downgraded release plugin to .m1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a05c87..e016640 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 3.0.0-M1 1.6 1.6.8 - 3.0.0-M2 + 3.0.0-M1 3.0.0-M3 3.13.0 3.0.0 From 7fe39562f1bdf5c20abcf914d90d20ef96f8f9de Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 26 Jun 2020 16:53:39 +0300 Subject: [PATCH 019/130] Reverted dependencies --- pom.xml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index e016640..4a5a23f 100644 --- a/pom.xml +++ b/pom.xml @@ -55,15 +55,15 @@ UTF-8 - 3.8.1 - 3.2.1 - 3.2.0 - 3.0.0-M1 + 3.7.0 + 3.0.1 + 2.10.4 + 2.22.0 1.6 1.6.8 - 3.0.0-M1 - 3.0.0-M3 - 3.13.0 + 2.5.3 + 3.0.0-M1 + 3.10.0 3.0.0 3.2.0 3.1.2 @@ -204,11 +204,6 @@ maven-surefire-plugin ${maven-surefire-plugin.version} - - - --illegal-access=permit - - org.jacoco From d1061c8c982e5d30644586bd6d48de3229d25fb5 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Thu, 17 Sep 2020 17:57:30 +0300 Subject: [PATCH 020/130] WIP on github actions --- .editorconfig | 9 ++++ .gitattributes | 10 ++++ .github/workflows/feature-ci.yml | 37 +++++++++++++++ .github/workflows/master-ci.yml | 64 +++++++++++++++++++++++++ .github/workflows/release-ci.yml | 38 +++++++++++++++ .gitignore | 21 +++------ .yamllint.yml | 17 +++++++ pom.xml | 80 ++++++++++++++++++++++---------- 8 files changed, 238 insertions(+), 38 deletions(-) create mode 100644 .editorconfig create mode 100644 .gitattributes create mode 100644 .github/workflows/feature-ci.yml create mode 100644 .github/workflows/master-ci.yml create mode 100644 .github/workflows/release-ci.yml create mode 100644 .yamllint.yml diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..86a63dc --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_style = space +indent_size = 2 +insert_final_newline = true +trim_trailing_whitespace = true diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..ae7194d --- /dev/null +++ b/.gitattributes @@ -0,0 +1,10 @@ +# Auto detect text files and perform LF normalization +* text=auto +*.txt text +*.sh text eol=lf +*.html text eol=lf diff=html +*.css text eol=lf +*.js text eol=lf +*.jpg -text +*.pdf -text +*.java text diff=java diff --git a/.github/workflows/feature-ci.yml b/.github/workflows/feature-ci.yml new file mode 100644 index 0000000..c0611d2 --- /dev/null +++ b/.github/workflows/feature-ci.yml @@ -0,0 +1,37 @@ +name: Feature Branch CI + +on: + push: + paths-ignore: + - '.github/workflows/**' + - 'README.md' + branches-ignore: + - 'master' + - 'develop' + - 'release*' + +jobs: + build: + name: Feature Branch CI + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + server-id: github + server-username: GITHUB_ACTOR + server-password: GITHUB_TOKEN + - name: Maven Build + run: mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true -Ddockerfile.skip=true -B -V + env: + GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }} + - name: Maven Verify + run: mvn verify -B diff --git a/.github/workflows/master-ci.yml b/.github/workflows/master-ci.yml new file mode 100644 index 0000000..b79bcd5 --- /dev/null +++ b/.github/workflows/master-ci.yml @@ -0,0 +1,64 @@ +name: Master branch CI + +on: + push: + branches: + - 'master' + +jobs: + build: + name: Master Branch CI + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + server-id: github + server-username: GITHUB_ACTOR + server-password: GITHUB_TOKEN + - name: Maven Build + run: mvn clean install -DskipTests=true -Ddockerfile.skip=true -B -V + env: + GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }} + - name: Maven Verify + run: mvn verify -B + - name: Configure git + run: | + echo "Git checkout branch ${GITHUB_REF##*/}, commit ${GITHUB_SHA} was pushed by ${GITHUB_ACTOR}" + git checkout ${GITHUB_REF##*/} + echo "Git reset hard to ${GITHUB_SHA}" + git reset --hard ${GITHUB_SHA} + git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" + git config --global user.name "${GITHUB_ACTOR}" + - name: Prepare release + id: prepare_release + run: | + mvn --batch-mode build-helper:parse-version release:prepare -P release \ + -DreleaseVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion} \ + -DdevelopmentVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT \ + -DautoVersionSubmodules=true -Darguments="-DskipTests=true" + echo ::set-output name=release_tag::$(git describe --tags --abbrev=0) + - name: Perform release + run: mvn --batch-mode release:perform -P release -Darguments="-DskipTests=true -Ddocker.image.extra-tag=master" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }} + - name: Rollback release + if: failure() + run: | + mvn release:rollback || echo "nothing to rollback" + if [ ! -z "${{ steps.prepare_release.outputs.release_tag }}" ] + then + git tag -d ${{ steps.prepare_release.outputs.release_tag }} + git push origin :refs/tags/${{ steps.prepare_release.outputs.release_tag }} + fi diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml new file mode 100644 index 0000000..5624043 --- /dev/null +++ b/.github/workflows/release-ci.yml @@ -0,0 +1,38 @@ +name: Release CI + +on: + release: + types: [published] + +jobs: + build: + name: Release CI + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + server-id: github + server-username: GITHUB_ACTOR + server-password: GITHUB_TOKEN + - name: Deploy release version + run: | + # `tag` is the concatenation of `v` and a version by the tag convention. + release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") + echo Release version $release_version + mvn versions:set -DnewVersion=$release_version -DgenerateBackupPoms=false + mvn versions:commit + mvn clean deploy -B -V + env: + GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }} + - name: Rollback release (remove tag) + if: failure() + run: git push origin :refs/tags/${{ github.event.release.tag_name }} diff --git a/.gitignore b/.gitignore index 6f068f4..7cab252 100644 --- a/.gitignore +++ b/.gitignore @@ -1,20 +1,13 @@ -# everything that starts with dot (hidden files) .* -# except this file !.gitignore -# except this file-extention +!.gitattributes +!.github +!.editorconfig !.*.yml - -# Build targets +!.env.example **/target/ - -# logs and reports +*.iml +**/logs/*.log +*.db *.csv *.log -*.zip - -# IntelliJ IDEA project files and directories -*.iml - -**/pom.xml.releaseBackup -/release.properties diff --git a/.yamllint.yml b/.yamllint.yml new file mode 100644 index 0000000..f43e7a0 --- /dev/null +++ b/.yamllint.yml @@ -0,0 +1,17 @@ +extends: default +rules: + document-start: + present: false + truthy: disable + comments: + min-spaces-from-content: 1 + line-length: + max: 150 + braces: + min-spaces-inside: 0 + max-spaces-inside: 0 + brackets: + min-spaces-inside: 0 + max-spaces-inside: 0 + indentation: + indent-sequences: consistent diff --git a/pom.xml b/pom.xml index 4a5a23f..1d2b1d3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 io.scalecube scalecube-parent-pom - 0.1.2-SNAPSHOT + 0.2.0-SNAPSHOT pom ScaleCube parent project @@ -20,6 +22,14 @@ + + + github + GitHub Packages + https://maven.pkg.github.com/scalecube/${project.artifactId} + + + https://scalecube.io scm:git:git@github.com:scalecube/scalecube-parent.git @@ -27,17 +37,6 @@ HEAD - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - 3.3.9 @@ -75,10 +74,12 @@ 8.14 scalecube/${project.artifactId} - 1.4.6 + 1.4.13 1.4.6 true false + + ${env.GITHUB_REPOSITORY} @@ -234,6 +235,8 @@ release v@{project.version} deploy + ${env.GITHUB_ACTOR} + ${env.GITHUB_TOKEN} @@ -262,7 +265,7 @@ The reactor is not valid true - + @@ -333,24 +336,45 @@ default build - tag + install ${project.build.finalName} + ${project.artifactId} + ${project.version} latest - ${project.version} - create-extra-tags + extra-tag + + tag + + install + + ${docker.image.extra-tag} + + + + push-extra-tags + + push + + deploy + + ${docker.image.extra-tag} + + + + tag-version tag + install - ${extratags} - ${noextratags} + ${docker.image.tag} @@ -358,22 +382,30 @@ push + deploy latest - ${project.version} - push-extra-tags + tag-deployment push + deploy - ${extratags} - ${noextratags} + ${docker.image.tag} + + docker.pkg.github.com/${github.repository}/${project.artifactId} + + ${env.GITHUB_ACTOR} + ${env.GITHUB_TOKEN} + false + true + From c593dc60eca22ea3b050e5be2b1b36d71acb2ee1 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Thu, 17 Sep 2020 18:14:10 +0300 Subject: [PATCH 021/130] WIP on github actions --- .travis.yml | 28 ----------- src/main/scripts/cd/before-deploy.sh | 67 ------------------------- src/main/scripts/cd/deploy.sh | 17 ------- src/main/scripts/cd/external_build.sh | 68 -------------------------- src/main/scripts/cd/release.sh | 62 ----------------------- src/main/scripts/cd/secrets.tar.enc | Bin 20496 -> 0 bytes src/main/scripts/ci/after-success.sh | 20 -------- src/main/scripts/ci/before-install.sh | 33 ------------- travis-settings.xml | 55 --------------------- 9 files changed, 350 deletions(-) delete mode 100644 .travis.yml delete mode 100755 src/main/scripts/cd/before-deploy.sh delete mode 100755 src/main/scripts/cd/deploy.sh delete mode 100755 src/main/scripts/cd/external_build.sh delete mode 100755 src/main/scripts/cd/release.sh delete mode 100644 src/main/scripts/cd/secrets.tar.enc delete mode 100755 src/main/scripts/ci/after-success.sh delete mode 100755 src/main/scripts/ci/before-install.sh delete mode 100644 travis-settings.xml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index ce26c80..0000000 --- a/.travis.yml +++ /dev/null @@ -1,28 +0,0 @@ -addons: - apt: - packages: - - libxml-xpath-perl -sudo: required -language: java -jdk: openjdk8 -before_install: -- "./src/main/scripts/ci/before-install.sh" -- "./src/main/scripts/cd/before-deploy.sh" -script: "mvn verify -B" -after_success: "./src/main/scripts/ci/after-success.sh" -deploy: -- provider: script - script: - - "./src/main/scripts/cd/deploy.sh" - on: - branch: develop -- provider: script - script: - - "./src/main/scripts/cd/release.sh" - on: - branch: master -- provider: script - script: - - "./src/main/scripts/cd/release.sh" - on: - tags: true diff --git a/src/main/scripts/cd/before-deploy.sh b/src/main/scripts/cd/before-deploy.sh deleted file mode 100755 index 74c5259..0000000 --- a/src/main/scripts/cd/before-deploy.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env bash - -DIRNAME=$(dirname $0) -BEFORE_DEPLOY_EXEC_FILES=$(find $DIRNAME -name 'before-deploy-*.sh') - -echo Running $0 -echo *-*-*-*-*-*-*-*-*-*-*-*-*-* - -decryptsecrets() { - echo decrypting secrets - echo *-*-*-*-*-*-*-*-*-*-*-* - mkdir -p ~/tmp - openssl aes-256-cbc -K $encrypted_SOME_key -iv $encrypted_SOME_iv -in $TRAVIS_BUILD_DIR/src/main/scripts/cd/secrets.tar.enc -out ~/tmp/secrets.tar -d - md5sum ~/tmp/secrets.tar - tar -xvf ~/tmp/secrets.tar -C ~/.ssh - shred -z -u ~/tmp/secrets.tar -} - -importpgp() { - echo importing pgp secret - echo *-*-*-*-*-*-*-*-*-*-*-* - eval $(gpg-agent --daemon --batch) - gpg --batch --passphrase $GPG_PASSPHRASE --import ~/.ssh/codesigning.asc - shred -z -u ~/.ssh/codesigning.asc -} - -setupssh() { - echo importing ssh secret - echo *-*-*-*-*-*-*-*-*-*-*-* - chmod 400 ~/.ssh/id_rsa - touch ~/.ssh/config - - echo "Host github.com" >> $HOME/.ssh/config - echo " IdentityFile $HOME/.ssh/id_rsa" >> $HOME/.ssh/config - echo " StrictHostKeyChecking no" >> $HOME/.ssh/config - - eval "$(ssh-agent -s)" - ssh-add ~/.ssh/id_rsa - ssh -T git@github.com | true -} - -setupgit() { - echo setting git up - echo *-*-*-*-*-*-*-*-*-*-*-* - git remote set-url origin git@github.com:$TRAVIS_REPO_SLUG.git - git config --global user.email "io.scalecube.ci@gmail.com" - git config --global user.name "io-scalecube-ci" - git checkout -B $TRAVIS_BRANCH | true -} - -deployment() { - if [ "$TRAVIS_PULL_REQUEST" = 'false' -a "$TRAVIS_BRANCH" = 'master' -o "$TRAVIS_BRANCH" = 'develop' -o -n "$TRAVIS_TAG" ]; then - echo deployment - echo *-*-*-*-*-*-*-*-*-*-*-* - decryptsecrets - importpgp - setupssh - setupgit - fi -} - -deployment - -# extends before-deploy.sh -for script_file in $BEFORE_DEPLOY_EXEC_FILES; do - . $script_file -done diff --git a/src/main/scripts/cd/deploy.sh b/src/main/scripts/cd/deploy.sh deleted file mode 100755 index 81bdffb..0000000 --- a/src/main/scripts/cd/deploy.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env sh - -DIRNAME=$(dirname $0) -DEPLOY_EXEC_FILES=$(find $DIRNAME -name 'deploy-*.sh') - -echo Running $0 -echo *-*-*-*-*-*-*-*-*-*-*-*-*-* - -mvn -P release deploy -Darguments=-DskipTests -B -V -s travis-settings.xml -pip install --user -r requirements.txt -$(dirname $0)/external_build.sh - -# extends deploy.sh -for script_file in $DEPLOY_EXEC_FILES; do - . $script_file -done - diff --git a/src/main/scripts/cd/external_build.sh b/src/main/scripts/cd/external_build.sh deleted file mode 100755 index 9d34224..0000000 --- a/src/main/scripts/cd/external_build.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env python - -import requests -import urlparse -import json -import time -import sys -import os - -class TravisBuilds: - """ - This class provides requests to builds and check their statuses - """ - travis_api_url = 'https://api.travis-ci.org/' - build_id = None - - def __init__(self, repo_name, auth_token): - self.headers = {'Content-Type': 'application/json', - 'Accept': 'application/json', - 'Travis-API-Version': '3', - 'Authorization': 'token {}'.format(auth_token) - } - self.repo_name = repo_name - - def start_build(self): - data = {"request": { - "branch": "master" - }} - url = urlparse.urljoin(self.travis_api_url, - 'repo/{}/requests'.format(self.repo_name)) - response = requests.post(url=url, data=json.dumps(data), headers=self.headers) - if response.status_code == 202: - self.build_id = self.get_build_id(response.json()["request"]["id"]) - print self.build_id - return True - - def get_build_id(self, request_id): - time.sleep(10) - url = urlparse.urljoin(self.travis_api_url, - 'repo/{}/request/{}'.format(self.repo_name, request_id)) - response = requests.get(url=url, headers=self.headers) - return response.json()["builds"][0]['id'] - - def wait_for_build_result(self): - attempts = 0 - tests_minutes = int(os.getenv('TESTS_MINUTES')) - while attempts < tests_minutes: - url = urlparse.urljoin(self.travis_api_url, 'build/{}'.format(self.build_id)) - response = requests.get(url=url, headers=self.headers) - if response.json()['state'] == "passed": - return True - else: - print "External build is running {} minutes".format(attempts) - time.sleep(60) - attempts += 1 - return False - - -if __name__ == '__main__': - external_build = os.getenv('TRIGGER_EXTERNAL_CI', '') - if external_build: - travis = TravisBuilds(external_build, os.getenv('TRAVIS_AUTH_TOKEN')) - build = travis.start_build() - result = travis.wait_for_build_result() - if result: - sys.exit(0) - sys.exit(1) - sys.exit(0) diff --git a/src/main/scripts/cd/release.sh b/src/main/scripts/cd/release.sh deleted file mode 100755 index 9f3eb77..0000000 --- a/src/main/scripts/cd/release.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env sh - -DIRNAME=$(dirname $0) -RELEASE_EXEC_FILES=$(find $DIRNAME -name 'release-*.sh') - -echo Running $0 -echo *-*-*-*-*-*-*-*-*-*-*-*-*-* - -. $DIRNAME/before-deploy.sh - -commit_to_develop() { - git fetch - git branch -r - git checkout -B develop - git rebase $TRAVIS_BRANCH - git commit --amend -m "++++ Prepare for next development iteration build: $TRAVIS_BUILD_NUMBER ++++" - git push origin develop -} - -check_next_version() { - export NEXT_VERSION=$(echo $TRAVIS_COMMIT_MESSAGE | grep -E -o '[0-9]+\.[0-9]+\.[0-9]+-SNAPSHOT') - if [ -n "$NEXT_VERSION" ] ; then - export MVN_NEXT_VERSION=-DdevelopmentVersion=$NEXT_VERSION - fi -} - -check_tag_for_rc() { - export VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) - if [ -n "$TRAVIS_TAG" ] ; then - RC_VER=$(echo $TRAVIS_TAG | grep -E -o 'RC-?[0-9]+') - RC_PREPARE=$(echo $TRAVIS_TAG | grep -o -i 'prepare') - if [ -n "$RC_VER" -a -n "$RC_PREPARE" ] ; then - export NEW_RC_VERSION=$(echo $VERSION | sed "s/SNAPSHOT/$RC_VER/g") - echo Release candidate: $NEW_RC_VERSION - echo *-*-*-*-*-*-*-*-*-*-*-* - decryptsecrets - importpgp - setupssh - setupgit - export MVN_RELEASE_VERSION=-DreleaseVersion=$NEW_RC_VERSION - if [ -n "$MVN_NEXT_VERSION" ] ; then - export MVN_NEXT_VERSION=-DdevelopmentVersion=$VERSION; - fi - fi - fi -} - -check_next_version -check_tag_for_rc - -mvn -P release -Darguments=-DskipTests release:prepare release:perform $MVN_RELEASE_VERSION $MVN_NEXT_VERSION -DautoVersionSubmodules=true -DscmCommentPrefix="$TRAVIS_COMMIT_MESSAGE [skip ci] " -B -V -s travis-settings.xml || exit 126 - -mvn -B -q clean - -if [ -z "$NEW_RC_VERSION" ]; then - commit_to_develop -fi - -# extends release.sh -for script_file in $RELEASE_EXEC_FILES; do - . $script_file -done diff --git a/src/main/scripts/cd/secrets.tar.enc b/src/main/scripts/cd/secrets.tar.enc deleted file mode 100644 index 606b76673a7bc6ca0c2abe14179f3110e9552923..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20496 zcmV(#K;*yOq+~D-9hm*^8Aa2Uwiv;U51-k9Fa*x-eW+gM(v;A0CgF$xpD!32Ggv|z4 z!(a{P*OM4`8TNolL0W1Qi)YG^az{fOL!6(n`fY4_Ej`5e^kkx462X$vYbm{89J-`E z

8T;q1+ttYjdWo=lTkK$rO>;E8+>=m(Qx!H1tI{QPr~^yu7gVCm$6mnx_F1+SA7 zF1q$=F+@I|g?2XN^di32=*|QhS`NV%&DcI*pO4gKc-@CXjE$vg85Xot_V;Gb^msZE zaTsIMNwA6YF1HFo<|rCx>N#nR8=PI+LgWzw9nMp z$RcsX&X?X!lZH=(jbe&D4aMiOYtl=dN4pJ~hoC&}n965sST*R_FBcs|Swpb-wIqAl zr`5~`eVmV_q1I@Z;=UzTh@`qf&?wSuKw6?D`#AlX1(r5eB-6HhT!3%Dz%_zAxmekc zR;*^k>F$s%(WL(mUYCXMKDirijWr+GoKHPjd0WiKVRl)=Y)!=!!I2uXJRK)j92qbdXjYgeA=BRiD!jw7WSo&%Kp4K)1z16IHnfgr^NWP>@~qwni~L` zG<3>y7;VMUjSbhR<{blnt$Q(r6X9Y7b3+~?H6g&8aoN6a?v2a*d{k>eG-Ou4AWKYa zt*_xTh()OkPE!=+IPN|`mUGt*gcu2WncY*?*w*=$O)b#G`(*v&tM8l=Wr16Dn|(fG zAWdSsWIj;1DV-S@j;~B)WK=YWd_&3Cf!)Y>T!7ME#jdq^?pOaX;CTrs8-d^R3tWC@ zvgFTVfm$Jchlb~EpP=#x@Okv9+3RKoEu1bTU)kRHoyGF6@k#aH+M%Gi(ViIsYs5)h!ZnvE+Z->H$v4~ zzHwZ@5~H~dBjqoP@Cw4%3GdXv)Ii2qVhq3rMd|bjxjycd2B7Hh{9A=%cH%Y%YE<5RD@75(0h+gJo!RRTe}g5j2eF^1p}jW zBw2xq9O%YWv_2PSqEJ@mva`vaxyLl;YPD*~^r)g@R0?<2Po z7)ueRJX+2b=$Tj6{Q2(>ncgz?EC6t}SCRpbeP}H| zXqo-{8f0Oj_YbcbuV8YYseT=;f4XD0uP|K%2PYdQ03#8B<^sS!m*g7ll8`yD*VqDS+ zE=hBb!uwQ@`s}~}(6L{^!4k;g!(0XQzibhOMZ=v)U!ibVmsBN8lZA_^_YbPR`Tt#FeWl1_J zUOUC!Uy{{y`XV88&&ij>dEXyZ#yDtcj)Wz_XS=R9Ul&sKIhkL$bQ- z&HOQL=NIy&7r?r}*@#c7I<7*p8C-c75FdDJ?9Rm6p<$pi@)3%e(!bZJYL7}6 zG1U}c^^8c}C~hQr(jCFw_{P|KhzX-JH2tN5L$pc}JU75?{yLhPYe^QBHT5*c z;OBmC0cWp+?L#d2yupj5MJNH`AcZw!6MM^#Sg-|gwZEp}EehTzhS45=Xi@`+2!H?q zI@o-qeCAIOL0n1jCIWR-G(47PmA71@-Xi9u^v7C7Sm}VBW7jra{xu+9TF2IYnxhby8~j=0-{aDcgCMDd6@`dk1Jd# z%X3Wb&+v!Eo`hCTU2_VTy=Goi7{R9u2ftCqaD-QmRip38DkPMRFazQGh_a&$qAJ-o zJq@%q$k*Kl6o5*#5g@TyMEJLa!+PxwrSo67S|_=;SO+(SJ`2mUWuKsaot`wB&T}iP z|7O0Xy}4=S}l;jNoPptS(6!KD;7rTQu&8XtCrEt^_p*C=Ol}oK%3pHs@G6X<$OT; zy_sGL5E6R67=0`3%X87`Y-j8HXNPa{{obzt}6W)o2h3`etsJ+BBBYTaFL0#5iv;9iftothL4+giTu~7~c+loawO%mt{ z%v=#@rJTdwf`7ohiWnLkkKm8f%mmCR^(2SXy{;d+a{VU!C-XKKp0C&^jeud+=G9 zzz~h^V~&=J0_UU@RGEo9nHE~j{Yum{g?hIeU0Tf6Hf8@K?7zj;)Q|iYDRpHV+ouD< zDj@d44f}t(dm?b!5}|956%HQ~((!+Vq@Hr~?5uL}wx2+j>-*c&R+V3knY#0e@L@W` zz41!+TunYV2RRhanS2VwYbRI_h+6tZo~tsQMtHY{*DtO4T~V^gtO_pb4XRjiS+UY2 zJcA2(ySJR`<;TK%bWe?7zqZ%R2(G2&y+0OIuu10ff)$-$_(1olZ zM9Z%byHIqyArW;ef)srNsKx@KGpF>jE}Fk&{L&DN+VQ^R$*$BH!(euWgqL)JD2jvM z&>eiF?_K2)aGtFKts9X|mpo?weQ~-EaR#frZAe$R@Ji_N2&9U|QjD2td5`BY=qWx0 zi=gCgy5C4NrT8U(07kjqHh@`Bc-2l>2v&bt7&E4$*H&&^{x@!z3N~c?U#?_c7GJ|J zzej@;)2iRU7IHjo^5a1S5)yLQul(L4@n*mZF}lGeUbksKg}Hp5n_?b<_2WP3Lx$nM z^p=yJlUx1iWk>q|hTJF2#3QmgDOWvf8rWP(i_HA>1VR9&Pz-emb{SS~-kMC72GTVZ z{uDETG1D3%3UQz~;*ju$&P(EM_ATsz(~OwZ!Djy7OgSuK3Axc;tJppk9h?O~k{z=1 zx2L-Q20HK|yXp^}aPI#ojN`jhZ84^-Un;lZXvig&ZM+adJkEe9xPLc;%MSKmjB-BU zZu!NQfVJhB3(KbU(VSXUW`fBa$@3!Ol$HnBT~@cBP7xZrquIFnI{2JeAOE$zzQ22= zT+gWP6@;fT%UwcqKN^@y%tigPm&K$}N{oCUZn8AzFLZT`>$hn%`e)L1XQ;i3i&$x) z@Q#@SR)c03L*(le2N5QRIE_u%9X=vXr=Wito|NXw=D9)9GJf+j3G}rdmD;U2}45l0rF&GM?;9y;PDC3K?v~KTc%g0Lu92) za9wa$Vr?Ot@J*~GowYe;MLACPO7rnIUy%$)6x|*0>SN20XI#5+q`5r~*^)r`bFf1U z;OY_niTy;&9_JeVwl7K}nki@Gw%*Pe*VYl%Oova{wTI6|;{cymXlX1(`$1tA>J*;I z=M}Nf=o)cdhg^*ziR$Vq(ykUQk>n%tqe5G`vy`i1!Axj~1(_?P8yJ-HP z-sMdMU?{IqO`+xbdM@x1Z%I6GuRu)N(vGGL(TSg%qSY;-bNo+){e56svz9zK2xxi@ z&gDL`aaUysdz6Aeh?~GR*{6KeMSDpi#RA%9Qco==m}=igXsvDwY4NUYDnhSKN~i;0 zz|kLeW8LKw2|)2}PFk8zVXoA$T}UZ#hj=TPXlYU4P>YpbyZ+BZ7MorU!L5*kXe7u=%YmYT9>q%s+lBbJnb4>9?Zv{Tn^ z8mV7*;p`c`Fo(s-57mk>u3H~lCqxdQ7e2_@r-w+59_d%U3#y@n)V~R-%&RVV_Z6Lz zXIbmJ_k!K}I5EQb7h+cNA_W*PHe!SqwTp_J9j+f|F*NW-jPY{eV5?9bxaM@6UPAaE zdEF`Gu$RJjN1Bc-x8n zRu)U7AmOA7&g-)|^0eY3SNxNgLMei01Vaz!^pln_#BNnz*Q#;Uq_SQ+CR+ZfNA}HJ z*PdWh$vI6whNNM;s07w`z$-xYI4nl+E{S&ZYD^-MA8gHbg+-Ep*1p&tN~-16Y}02Y z<1a2qlU!XDMuKFwz~~7&yC|OzCFsD#pP*@|&@@20SDt}%aP${Knrdd($aoafX<+p< zjvJ=S%bF@>mk(PtfiZs8C>I36Zeo9s)R#?kVdZ@oVOt`Qbw1yE<>g8Fb$bo zt>bJ}7Fnc<_WdIn8l$K}0PQ;cCm7Rw*m>%y%wuej-13bweAR;X56k^hDwiz-8+yHEoXh{`IrfFCZ`yX`LpSStBjZ zBiOfU7L_XlG~;d7?DOw_o)37IrRqu^>dkI#<~Os7Z=(dp)=T-2kb^W54hHB?-b-_X zVjGf}8yc4Ng%CW1bv1w(z3Z58u9F7mhYHptH=6j>{pieb?4W(%cXc}-@U^ZCYOx^H zE@$-2LI@N@+AHFz&yo`^2~rt}E|Bw!e2^F5KplYPUaP(L!UJ@6=tZ|WR-Cv0KWSc| zHvFdO2-wz6mttc$9JUwG18>p z2F98QtE~1QUum?h|NKSlbob1$>njr~rG5A(q=wog*aVdtM#74;+ z{~`B~V;c_{OF1g4A!OF1Ng0702$W;2Qg}ZV2-}r{(sYPBn zVN_n(f6*{1b*2C>o^`1Iu3+y{x9Pz5aUG-PYqTeTIfU}uOBOLkH-Xbqsx{+P#$whm zDtz_zdtsX)fFe$2;mBv-VNy$S9!(GI+T4f{-MCq{k&iPVrn zJz=}j;@&=Z861>ZDSr0ZHkW}2_)3xifIwAr=_rvsN+ye2R8FRh zRp*|IM0`QLCNgiq#|M((4R4~%(=gN2kW|WjlE)%!WQm&{p0tKOJLKE*u`r*^9~&0~ z4vh)e3eID%Y`BD#5MQk*zrh3&Va_9S-qn33$)W2mAHVtAiu|6v1w%Z;4}&$G+8IuN z)sde&0$iGdU>5=$9*7zfhelr;HWB|*8sYmC+@S|CO+!DHjH7}JmA)JZgK026x*NB` z+L!C~8KzxtgvnK!J!H5izoYIgyrAk7qP=i_8#I;XuoT1rbuLfRrFX{f2KqxK?5J)( z^vtL#y?DMfAHKsfXCg{z;^}#~7oqH&X>&~8yGG5_3{6|be@2E6rdw?l&2$Ake|h-l zg;4)bVgexJS?)*XTG63Eh1Nf=uTNxLy1uHb@c+E`^^YD8>L8v<(IjOwE7O?grJu(~ z(aIQs@s^x#uj?9lmkACTyAq#z3Z{?)M2D`?a0R0dwEx?h#GH?%CI|}ha&ui=#AvRp zhLPoO0u~T|DfA2S0JJ_~Oo*g4s9w@}+L$LN@JDTitsb#$6m&JqC*zZ^-J^e3I97d*i zSKq_R-&f4Zp|+QbknSHy>~yo}{C@I5gGTH)X2`cJOyj}}Jpy7_*VAR0;)Q7x%E?ox zToU;QVAmWe>6crL0!pGTnybdpk!~ST?-g)=174E9H!y5*ttGb7O58jO)0&QGiJtokBYt=pN;fuYuC_n z7G7KQV;L_2&L$S4x-ez7@r7kwfV1uVmT-BUi|R=hc`o4Q?y&SM_k~2wmS+4jyU?>7 z+k4DCk<}D5de2GUM!yR6%l(R;Py2#eS@%AmA=&8)e|FAI>`)doq(yBL#gYN}Gos76 zM0+jNrNiK`T~9_$;n2Z{M;ooczFqs~%T>#aS>DO9->k4wwBoywDC8GL6HT;1K77t{z}ubK=4#z0;ue{e0X)Z@_qPbkL3Yti z_pJp!#xM}}U+4q)J3zGNWJ#_Y#yP#T^x-cR-mfJ8V_v`pW+t51NlO&$L0?Y>pl(bj z3);H9XP8X*0O6?+s+X)D$i(XGaaEExJp<^b4qq5m{4+B+F4TNg$1cuB(8yt?+fX#b zVLXe(-*%ljFs-T+OyEQ;*dL%-LxV9%brGlSc^PD1^Wrz|A|9Kg&}NmL$lH@XDWQ<1 zV{yuTUL4F?e|;O0c&h+usMRLyAp!0P!jHaz%MHo;q-_#ur!U1qceUFB)1k<-*$DDL z=AF%DUs$jhBcqsj91StCnf$nzX@d#Nk}P3b#CKv9z(+4O?cM8C~-Bk_D-SeJCR zHL=HDhHqa6$i2QJK_?ZbjhCtLW2KYEII!JAN_Vy*vW?v0@cETFaR8t;!Zr+ zOF8+Pp@!Q0e;5_LX#GaA7|_QXS&UyshtGYHrbV_o;ZyhhMZlr3Jp|D_x&_oZT2=rq zKy$DHtd<@y0NUhyYuk3_^|o6=%J5Jy1$D`4%lMg(5tkP{2#f70#F-x2ZLITR4x$w@ zj;mf+ZoKmK^E%#W3LH}O7-%DI1?$qG)2c%st%zx@CLVwI9B zef1mVRRt?`6Q%X-3`^9LaQr)*9s3E0ikLb2AYBTI^nj-6zxD?Aqh zh)nlpOmIUn#&gD$*bU#Oyt!u|S=60U3$|r)d^mgGe{ey9nI*}>{knxBwfH@s zzGG+^9l=xNJoOr>BFr=32%Bx2Q}MZ zyJm+M*k{43wD&DlyLYvspB(!!k1h&+0Ak4rLY^ow5UtNqAKaZM(1UO3O(X7%UZ`lj z(A7c55zq#b`^URIaea{V&>oCZ4;+Wk%gsox*Uz1e;s7JF7F+mR0sq}EDAqnmvx_&u zZ3t!LbgBorh$6?9J>HIT}mS=4hthI$7rb^hZ5x$lxrZj zyocWL6fbqC0}U@fTwm0$e3Z0S?Cb>sLkNlw#MAUn2uBh70mmnlIZa5IUww@@xZ(Ge zyYwH%DM?KCCwG1hD}R2wt%Tg^B}K^X-wXnff8#<0tXbr)A&yb+>HFr2s{=2z6dN15 z2jK~xdABi0hWD_IeOl^`iy0I%^8BS+;%JmvtJ_$(o>ebIhASJtu0bQgTYorTuCv51 zkghe%XNutoAl_0}eu$w}ehM0|%Xy=k9~C$A$I)wD*6tVLh35rm&K?uN4novJ*?`7n zkD@(n`Z>~94vWU{VFI}W-Jn1Ew&qj@TUt%DXPdy41pJ+S6N%p5Azbj9D@??_xR`=l zu90P>waO+Jpv?kk^9>|AQ&TBQwCqLXdm3Mj0u88&9%*$f|1yjkqz#C@1BmFIVr=B* z{D!2P#=g?e?O8WhPgIZPy+utKFf$;<5a8!)?2?$cgCr2GtPB%!dCc>V#B-;@PL^pN zcgFARA?7BsXuT=&=A?ptDn9`6E#^^A4^*J|M<$Ats}SbXj^XxNnlzGr2rHeRJ>(zx zcw|gY&EBPON}O%Ww660Zokko9@+N z{u8Ue6n+g@&e7htfAG0BMy-@$!WdL&TA{+rnNqVWyJNKtV)NoAqYM6I>k#|CUl2nR zV`BJWlN7QG_D#n7Q7j9BK}Ca&vHbl2wzpB|r$Dui{|v=<7|3$4=!Z`%aacXW(-dOC+o9P-QqT-{Z%&*7rdXXt)egxD1|!F>tG*v!(2 zUwmWNvfH;=Z;g@q@zdbm{jKS>rth|#!cG^0AY>xBloFX>;UHwJ zw>7z$9cP=j3&l?dVrnYKTLUT5U0shq z{q?+_%g-dV5zZAMtI~(hBka5#)KsA!*Z7XZH_actdxZ!8C;_vK6rE9i))Adp0~P*%D&aCF`3Yre8fj7JK<^^Bt~X zmX{WLqJxMpDXdKR6bl`vvg-!wQC?#$T8NIH5*fWKuhBmnY@s6BOit zgC`Ye@QU9vK8mrMyu3Hrhcj|$o%QP8TL4Ks_rRaK@S0ngmM0NwiB)c;0b%gII~&y9 zM`d6G(8aZWuTa1+_p;rL8LB}1E>01VK)#N&G6~XbHz!JZz7zq5wVe|YX+?2ikf<{f z_ZUM9|4K;bh;Rdyne^EMT@>yoKZ6bSiE4}!Ulp$dvMh?wmw~o*Lo#ju;3C^(=TAPC z=pj;NZtW~KL%{OzzEJae<+mpYyApJ`@1NQkynV=RvgC*CIo{R{%Zii!5)wU@tR;|W zTHtp8e2R+^ipoIoSILaLkhRcc_v%stJlO)VQ^{Rp4GVA@;BFO)MS&eAvL{P1zLXav zAwdV3m0bP(7j_UTa91%=vhhVKd0w#!lsj&Wyp|uLRp>0w>~kXMI{Zd(&}lDFJ9t^! zREzmayos(-wP=LADXcUDa2nU3bSSdDcTUXieC6KT%X3W5UF;U7H^v_(Df&xK3HQ`b zm8YZS;Wb2qNWxYM?06C5c|*K}6L$;Q>PBbJ@*DIt5aXwKTyr89-{u^?7t2w8-xB-k z`dcB3Ik;821#V^s&c~Mnd_Wg8`;X(77*~%Yq1b}vT?(eK4%7!B>fxz&HW(;NQZOr{ zgooD*&YZM$)#x)L0$Ul{s%|tw!fw|fj^qB@)fST8Qs%R1nrZg{Cr`HTLL3{34D)9h zh>f#cz@STt0DO?e4dQ{J=+52^s!_belCRe3hvj3P;8z=oz~5W$D6&FSEvXP+dL$3PV zQ~?LR#+5WCM{qqq)}edhCDBCB#m3sZ$**UID&Yz=7w571lLUX}3xbusZ4!}gBR)Wk zXXJ~%TBo5`%oj*a&G?+bEEqMClsvf!o6&BL^xFj*xQnDwZ7V(ma&h*2N z;h#6nquY6aJk2)PVkmH1+Fu9Pk)a{w4ZJfu<-%@G2cWyl%C^+3GM<}w%DCO5gK$#^ zw>fDXkIdtyceafYu`EA<|52N-YMYe9KHB7NQeHL+Jn~`h3(gI`4JuJ|zy~n+S+6Rh|WG zSTWdozYFWV;HjPJ(KB+7Ym;PL!aqJ|Hc-E(O)6$4D6p47tzev4*$PrWisNtNU_O|S z167Yyco&~Rq3xB!xxso6CK`BVXqkAOSBs|KYb(rbR24QMST{6l3#t7e^Nb_>vX0Q( z?J7e%+9moaCg>d}xCaU)GF>IyNEz<*fLeJ$mM*tmW1@V4ZxkyVP>f-VyS^Q&w4*A?{ zHq*v=MNkYp9WnvwpsSptd@U)IhpJ-SZwxD__|{_53Fw@pXIBSHYu!6SfFAG-k#8=> zr}8&ri@Ao>8b?|Z;v7wA&`Q_?1WKO`-EO2;NIzrA)O!CWP$nJRO=TAK$@KnE+X>aC zc~T|#_10$i0KNQjuT0Jdli*q55s*G}KioZl*0%oB39_>SYfS&EisgE84(s4M;LV{8 z0$ng-xN+B%9krQ1qQgRzCk8_oii+7f{tjN6l!a=xym7H@VU>t{4D=;`+M);Y%OHa`${zRmVbNT-vD1N+07hIPd6&juw< zUhml3Wmy#b`>}#%^LViuy6F4i6)C@t+5+Ud#|EywV`k+o-a#e1H$;E#oe;acLLd#H zh?uAy{gI--#Y6|J3X8^|E?M{eJfem&*l}Acb1GMF4;_ASb8f;YI9I0MC_^AcGCq$L zdUvc%EKtw|n^;p1O3$Td^R&~NZTIp?!<38|NPk4vW|J6481T}%eDRwaXl zYuVN(H9)gexQl3tY9%A94NjQD57VGm=^>L_V4d6baF1EF!~rA|a^-SiIxlCqTk*?+ zE7txu&yt#yIr|L|2N}_2_>}(ruRN}~%ikUi#`J3eV;SB&OK@=ssxfN^e%YVfZ0{B+ zDyNw7)J`h5Z!_8ycA~hrNqkhT+icc{$LcFwKb&K`2!Cd7+eY*oFG)>m!-$aQx?#+| z5a%WCIB>IjQP#v+ZZ{DTDT6Qu@Q#ICTOJMTPAIJy4phj1Z(^^o(iH6pU5r4#6ikk3 zGrnxu;w zf8$I~!vZT#uo3_IXfJS=qdGdXv$N?%epS@>h*5di zixN(|>9-#F{n!k@*cQMW+(xZ46NgicGhK{(gCE-w4Ku<*a1RmgEjxu=>11lC!^FBJ zq0RE&yyMb%`VCs=nWYdit;*3&Xq;TiagEjD1N)*FME(He!$rRTm)v5#6K8!hVxu7g zda{E%?1)*HC}|8+_)$AQ5yDx}&rXRLitPY?hkXBhko$=_G8;1Yp?kIfu`R~I3sU{I zT0XNZlCemJKUouST`&2I(8F)9Q$4Hd$(c1aPb_M53K^)G9XEOm;I>#ZX;0B0W~E}l z{n#+>i`Qw+{|6It>*AwxV+MBh76_mG*bOKp_>fLrNnwUG2--AVz|Z}<=7!CEyh1?~F8!%G#MaI{$Mc96R-)@t zeelN{QD7h00e5rqH!fYBXJmo9o&Meh^KNTY`dCA54Jq^P?7qRf{L>LNBc?w@v{&K# z(yCE}UtnyC`h$30oHNK=Z-BUw2r!F|s6;Gc{rMWiuilF2wT0W*XgPD@vE9iz%TRH+ zwL`V(VgNpR!w%>gW=XtnW~z(8E+=j&-4>DrDRzg^>UKPHl9DRkwq1^498vv8Ig&(n zqVv>?xP@VtxL3rle|kq-G;4HKBrMtfBfLSBSv?{uYpdojdFWfLrY7@yd?#V5DTQd( zo*7yO)1cj5J9Vr*DDv|jGU1rnU3x)(tW7L%ax9p+kuS`_`7VCqE$8@_q2RFztfTbt z9=_Xv7AlL>KOAU!HJWiRrGc5G=Cj-)jBl5 zp77ruDoP@|1fY~I06h|t!1s$E4%zE&(c4XZ&*8XuWYI{D6+3dwukxib}{% z$^*vRqdXenKcHm#KD3(bABk|F4W!iUoA>*bVxFc8^E1n)u102T5E!n)nIKEj@wJTIQ7yWob~!27S3xeVE9Wvw8sZRx$zwqeGj0z&I0RLLfk2L$XMfmx!ogzY1YFZX1TmR}IuC{+{yIKosb^b(Aw!_2J_E&_<<|yl=F~C z_8bmSb3pXd$H+JPorJmYc~~K`;4lyN^`7KyR>GC}m&K=Wj9gXd&4X-fTZc}3$FjfR zw!?Z8`@FnYljHl8yRaRwyBONxV{m(spmta0T z%V4T?coDjD1S0)7eYfy*6a5FD1LAiF#bYA2*GBJ*+2+Uy;8|03)jY^M?4#K&Tug`` zxyopw;cHn}V5p0Zo}^-g@r4$`S!{%d0#81303NngNDTDrFwns9^;MAIO?auvx`bNf z#|0fKiDl{y0JBb}YZSMBEpHHNQL=-ja|o6ts-F^}FV#ydpN5%JX?t&hBaHh(|9Wui z4Idir*GC!>o*Bbz?5<3q;$NR<5OySaGN1D6zAe7`_-1=wYT4aBKPg~QP{ikM0Q8bY zN1y{|52^<+e2^2ZT~6r;KHF?-9z8W~-c%V;vqQqNQ~pTR8JZBdFT8!s3S+_9o(THn zhBl3$n}Cs}Y3FA+0nC%u^nODwDvtbcIU5o-+6+D|=RK;bpUG6~N*V1@1C$E%Udps! zAR!Dux+V?YFn}x$sY)-TLpuqEe4-yNdoGbMB^S%!ih~)hmXA=;A3Bi+FuKq=e*mCq^Cyu7hbK z-fsdIUnt%dN)APCKkBCuwsTUxNAtx^+2clUGGT3GE$9RA~+DE^~z?#FZ9nav}n z@kCy=^?DCWC1SwcUGSCUK2)YuFIr?Ur-j#xFitP|iv&b9V~X6vDL2Vp`YcrR>_ZM{ zo`Zrz5;LC-Xv29F@-N0|gSmgXGO^+GC^-IN69vuWf=^LD)T%>R=h0-Nq=Jv^{1t}< zzl50$bN^CO(o_uU6TWp!)5x0b`K*Xmla{f`tA)&iHdLFOop?v_*m+}~t&)f!AdJpp zT7~MOt#~+0AP31YqW#;<#$%3(FA-+D?+kNqKvtRH=DN*;1a{h^aZS`4Q%g}5%^Zgx z4MY7{R@`>rRQ6WKbx1c-pM*0OLRA5%imE9)^stOS{ev_vtVfN!{PCuzTF5Vy!!$23 zXsRxrWkAm1`Ii;nN0Kvww^Oupy|%HzdDHf~)auh%VS?Nei!M{k)%#T#{jwU0{sS=0 z%|2x`SS!~gBz-G6zI;pgjV0Mr;2xdO{`;KRqc4u{@k$b)i6x3R1d9?-3n2XKlps(4 z+R@fzv&yBJ3$Q^z>#O17FE$uaVADisSZ-=H9E9b)^_FzPFO8!i`5Ulixnv|7d4wXs z=~4!y%w)iKpAbiMKs0ULDG~L7k<9Xir|AJ#a>(b7p3Qr(1pOk@Bu#VoANulLW`2CB zej-A=?Vn>NN1!g_D(_swobV-LaI(;V*d>ql{jN|SvI!lF100WG^8?ugA)OpIBS#pP zSwyu1-7DCFlXiB*6cpq^p4QX31%eC{$&ppPD5oA5ncc$UA-8`Ob{&uDXQG}Rslmc( zoHNLccjzi|xE^<;EyV2?=!x-KmD>>EpWY%c5jNyxX)mnZcmEvu8OHz~*ad#Ak$?kt z3wu_eKH}fT_%t+uCkycccLe1;CD_GzI4tbR7v+c?0qLUZxntmBwPWfkW^KGf9Fuz@ zrQw2Xj$!J5BZ6L+?&rqRAH3KI{wFWpgpm`-baD8-@+C&IflU~;DO^hCf5SdI`Rl>g z44iP5f^e4OSt1}r_{|2PONhd-m-4h!MfV(-ri^Z@f;8*|^%mKY)v6#m8!*}3En#A8 zjERGAWYxZgKw1_D3~wkhb7`NvGb?!yC~_}dE@?ZpDUw5o<(t!Hs4D?P)DOG&n;DKWK5mX3hny?K(NMem8ffSG@PD zV7CVM4<0xAei`(poo(TEPYM9)C0tT-f7IQhL!s+I;h|7NawPp_OGlN2w{8b>9;T8E z0>roTA3b9oWL*8v++e_4c%^A1p>(gz?h~@$aG9h|{^953eAZ3ruy(qxcKlSQuYhSf zR{6*Tk7FPA=dB2H7(@uDjMqevmaK?jM|To_W~tZF{l|&=P3EoB)=nsM4^`jF{v1Nt zIXkvekAv7QtfgDhm8K+sfcAQn`tYL;W5Ib1%6M}CF?_!&F+Bqodxo)A(CgOW<^$FB z{|zhxi4`R1wLPE$avlBD+~Y2%BgT0e4Onxi9C|Y%YjycUg>vpw>72Ag0eg)q@?4Wfm2WSxsq%>UA=Bu9*DuNSh zpgc_1{|yq6-rPANd`FQNp@-mkTYr1?3vH#6XH`L@6%<}C*L;lb17ZgQ4CS->=Kq=o z%7z;R`3}F84z<_9+Y|0=gfIn5lAh%?uIdD{en5Bk)RrA8Ea~vTJn=O7fRaZ8@OFKu zDNjl6w>w;dlut!+ZE%AsiB?bcql;RfbymwAz~hu6v?V91-YiaC?l7=*8`lYmeoLpo zz;aixCL-!!+Sre`RiwoP@qZePsQm%_ZvE`<#I&u>?KK;8m`*hm<8zbshnc<|qHAN` zhY+8y=;cWJKS>tDz-cqcRiqp@e1TkQ#!Y`vN8$nlzCfy@%4h_YJV8HG#DZlP@mD4m#~$3 z;N3#vxTA|Rjcg%vZ#Fc~^bCWWU-%${P&loBQfKv{UYv(V0_XZ`M$2~irLFN!lPh~b z3F3wcQP4C;@eUCrlgK&M3=-z%4o*MC7jKy>YFW-y$Wb(agc8f~MVPfsa-3E|fBPWE zJ;1d--DIm&%`A=ChX(nnobark9RMiJA2ZjbhR-27mZWb^6FkiyV# zaf-N)!n0Ug3=fw$Xx477k{^N0Et>?QNCApBZ$fq6OP{DoR;$AFslQoYZ2-Dk856=g zY$bgocgQ3)wbLTxhhYj2m%qeQuj*V!z?R|IW(|4BU`Ohd7j+~&EnNOu{vo( zQ_uNlc~ic0`_}(I{@v}$Zs}GLE(-oLwwK@bqltW^Q?n^wQe}?jkPjCC$ zt>ZAUkvEJ88UK<7t~9;P5hyF^>LAXOO?i5VqF*tBx0J ze?(p4jT+r9Aw^(~cfw6b^y{i0LIBR)?W+k#cu`nGO_lgU#MaO?n$7GR|N6WP>qrd+ z<43$3KC&xEGNpE&v|X>_7CdH>wuWt804o|qV@`>yno&aSkGzQAJ?Z@QiG-H5^VX${ z{L0hHqpCiiiZ@G2Wrt+k>aSC|@rQ_Pf3jZ9x4Ldv!#B%aweE~tgyir~27|CW;i4iJ z*6F7+&oUiBBS>*I&8xfl$DeJIEI&5ZQqE;X&pL)TqX5Mln=yKa-y?uAKy{c|)61Ih zBo>l3@Pl%15r0e}P)=Az;-Bk%fAH4KKhfB|jhtd>Di=HkrE#+|LVC1cthuPC0l8*v zR6P-C3Rq`54vzEuO#x~5O!5m1u(RLL8$7KOyqrD;l?VMpbIA5^O+^{#8A z-WBQBm$4btzm|M1gSe|YdFWe={t~zpFVt~mLd5yX>_}P+*9rmk4+`+C)|M}ysP*}Y z_8(!QC`NnaYd&9*!g-51ifns1kBC`>HdF-DC}AoSM3VaBn(mxk8S z6kGmF?5{Jk(Z&v&o);6qQ^mqMI>zI+zH^fn$)OhvW4v z8H6PeZ>hG*Zx5@3Fg%cNcIn%*Wg?wPGiyMnOW8B{|3c{bA$=eYLdh~BRLH7Ldm`Gc zB3>=crnLInSOZ5_7UW^3?<;$)nB!HaZ3^}cNg5n_3PRby#aQBp)s#bm#CTbR~ zSq~rW9FHy||q)RVjM!K~K7A#2zP{Z9J0GQE1 zymX$C_izDDo#(#n&<|(FiYE z&+rtSXBK9f6cft%j61i-C)HDzw# z8ab@jvfKnQCzD`gOSPo8l~fqn+R1LHxAMCja$@w9-mrI`7@jh&gf5c-9@lH~w?(hy zu4P4!)_m=7vS!!0n1J@zKRAXVfAcJ&lX1p_rP7V8C{~pqvMk{>9Da~bI%zpBeIN{# z|3cB8>HG5viUTM7GoKWlZH_t(#M;dBIC^yO^%Lyeb0wIr?}onB=HjG)mJUlV1{Q{m zL!(z4#~MFu#CoutZ;?9-%9XPTeK-%t(lHn=U49jNR3V>^UQjLfgj+J}00vn&GL6Z@ zIC{tVKvZtm3QD>aLZUf~+51%C*WC>bh+9P~r`m7nC5d>AhObUr0P>E68#F6!2o#-j z8Z#0SKv2e8EvfO!0PDl8E(P`)e;>y!h5^t>}F}WVyEYn>geMlhMLkOhc8IFi6kGLP8%JLho zcZ|X$*-T5KmoOUPvK!~eRKlEb!f}INBQ;00x~X+W?6%Vg2U z;4L(|OkD5(_m)^EO}r4~kkYqjvnKO@CBQYwG~lE+Z9~kr;i%ky8z`UgJb$Rj#f@6RU~IQ5Ldbur@HUYp#7H~DU1ISQ31OfD|bhbP`xV!X%XM(IZn5lZsN^;2BIVqFpo%4bJHOv0M z4CY)~qcpTlCLoDZK?!Cu=|Xm=b}~IDW(Ct@Ln?#&vDy^384o7Fhy;PLry&HQGwYGi z6iBEvE}>PePP(2w%08uqX}r`RL=Fey$p($%ZRp^@Uez+TWXv+PKb+3Y2_#g*4}OAr zer6zp{0YN92D+|J6;~E#PR?b?yEoyWOeG8Y*d3=(Bbz5Wq+PsLSV2wkw#*8)LP%wm&ew)?dM@XiJQb}2i0_&9yNLTNsi`6;znivUKrn41@wvUsP=5{#v>G8s|g zF-pw^VH|bOQN>`i-s3e|*}L$8rNQEs%H15_9|LxO(>pjfM#ZvXXozWH2H*0V_9$B} z5vk*sI#B!%vEyuXzs}9)oi)_-&w%T~d1rgFkL);0M9~tc(t5)p0^aJ!G?d(pbA@n9 zMk%QJu`BAF?S<2ihQ`2$97GwT>SCy`6)mN0I9D~Rb-Us zD*G=GcGe~hTGazeg5N4)4fnPig2J|D628{@s1S%yg*%!Z0{^o}@K!?J|?U}FQ>{mAd zs9eoEv{^krZA^KX%56{rMR_+Lo-HlKrOaqLZr~M6{jkBLlaxtLOgh3Pq-3vA2{mhP ziye9)bdznP!@2XDnrWKO`jM4$!7bg6Gn7_{l_lHlokLmD{VA#yzshSu-Y+Q)0GT@X zO8jPJlBaji%r&C*&7aVT0Mt580gS5mSi}M2o5ZP1w;~^nLSdb`Q24*B> ztO|_usW2YYD-=3zdrr2C5O8dTs48s5i#rsjZwMOlIhJLmPA{VMGkI?M!DeRS`>WIg zQywPIH#NZliN?&6E?bn8l~Jv4d9wA9OSO8*#0*nvUXnZdZZRNgK02>|22*$u%VvAt zjRG{4Ont-d;OM&QN`jG{FId8gXD0809&u_*a1wy(i7uX$@Y*Z)0UT1XjY4Fb?|~;x z)xCoN{Ply05`L5Bv=qv*cTbBg7gDDqO1!ChE#6n9n=eB4O?^u~w&#A< z4WG_pmL5Goz>;9ge!Ql{R%7O3F-N)OE7 z)>Gk~!2m?q&O9>@^cEg3zs2Ead*`K1n{BiSLl1<5L;LX!)P{#;asNTt(7vAfQO%=8 z0Ru|}k?RmR#aDPCX@gO25&0u*Go!Y)8KRb7#)6!j{uL}PC-Py=P6bz18!cP;R(}YX zXwp3bc0!^@rN#&?LAgno{r3h^*N}b+1ZQfueUqt;q%uogM0w4tJv?HAxYkr`#}u*EHIq1P1~#vjHX{$#t~!bK8Lbr?KS7&e#-UhH z=N^$p?cR#a3JI-TT)h^r+kc?KS=CV~Do6Ao0aHg~;W3snCg8!pmb`6X5tWf^?+H1b zfW1TZsr}NKh0)e$-xS0uZ7VRB?U`)*s%C4rZU+_mw96NrkX%+DT3okESbDL6ZVu&7 zYKxb90B6~qlro7R(aYp?vJ!(g`ZwVui(KS7*>rG_H80d7rhls((EV9Jlz~Iq>4Ewr zbs;eepywl)8kT4u8|$CDoI9zaMyZQ?Yo@x$kz6l zpC3vLvX8E<6B_LkwFxmCMu}tispmG*cEbSTScOZUtNVqj&o<~kla!kV^0YbSAY{8y zN+*aHhDi|7pomaA4FsJ!pFci5g!UuXQzwBh$cb#$+Nh5_h6ol5+$@D=%10%=E-lN# z)VU)4yx}4}2bE6)F`Pmty)qrtC8HA0jee=^z{V7S;O|&Gv+HqTo?^{@@!;RxAA& znIk6dPfnw@Z6FF|z>Jk(+1P&OCLv2SJHDvaB_r)xqr<#3y%lVlCk>+KtW-KWajEhV z^y?qorbVZ08MQp#k}oYeT;5?s8K-lD&9@1x%zjFXWuR=q;mA?$J}A#8+x00vw2TH1 zO?V@&oxP-pRWeYzUO(s$m@g;&veq$7gH@TdKE3O1L8l5r}d zhp69oQf=c)@@7AnH=yZ+z`^C~+eylK&wA1f_}W`|Ujr7%<=dc$OSXd%iu)U>2Y%zl zVC08}h^0TNM0z11s%;=5Eh+fYuAoE$a_KkgFH3jY>8a)yp68zht~dIdjq08G{^?Pl}+q}`Kq!t z$&k}xj^DJ*<3*6?Gfw{$#j<%pSP@|7w5eXi3WhUXgL2zgIxB9mWizrHe~7|!Ub%=4 X$9xmGVBX*H3DJgM`>0(wLnS7e=jz)v diff --git a/src/main/scripts/ci/after-success.sh b/src/main/scripts/ci/after-success.sh deleted file mode 100755 index 20a24d4..0000000 --- a/src/main/scripts/ci/after-success.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -DIRNAME=$(dirname $0) -AFTER_SUCCESS_EXEC_FILES=$(find $DIRNAME -name 'after-success-*.sh') - -echo Running $0 -echo *-*-*-*-*-*-*-*-*-*-*-*-*-* - -if [ -z "$CODACY_PROJECT_TOKEN" ]; then - echo [WARNING] Please go to https://app.codacy.com/app/$TRAVIS_REPO_SLUG/settings/coverage and add CODACY_PROJECT_TOKEN to travis settings -else - find -name jacoco.xml | xargs -i java -jar ~/codacy-coverage-reporter-assembly.jar report -l Java --partial -r {} - java -jar ~/codacy-coverage-reporter-assembly.jar final -fi; - -# extends after-success.sh -for script_file in $AFTER_SUCCESS_EXEC_FILES; do - . $script_file -done - diff --git a/src/main/scripts/ci/before-install.sh b/src/main/scripts/ci/before-install.sh deleted file mode 100755 index 49f7a9d..0000000 --- a/src/main/scripts/ci/before-install.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -DIRNAME=$(dirname $0) -BEFORE_INSTALL_EXEC_FILES=$(find $DIRNAME -name 'before-install-*.sh') - -echo Running $0 -echo *-*-*-*-*-*-*-*-*-*-*-*-*-* - -echo logging to docker image repository: -echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - -# get latest version of codacy reporter from sonatype -latest=$(curl "https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/maven-metadata.xml" | xpath -e "/metadata/versioning/release/text()") - -echo Downloading latest version $latest of codacy reporter from sonatype -# download latest assembly jar -mvn -B -q dependency:get dependency:copy \ - -DoutputDirectory=$HOME \ - -DoutputAbsoluteArtifactFilename=true \ - -Dmdep.stripVersion=true \ - -DrepoUrl=https://oss.sonatype.org/service/local/repositories/releases/content/ \ - -Dartifact=com.codacy:codacy-coverage-reporter:$latest:jar:assembly - -echo local file md5sum: -md5sum ~/codacy-coverage-reporter-assembly.jar -echo remote file md5sum: -curl "https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/$latest/codacy-coverage-reporter-$latest-assembly.jar.md5" - -# extends before-install.sh -for script_file in $BEFORE_INSTALL_EXEC_FILES; do - . $script_file -done - diff --git a/travis-settings.xml b/travis-settings.xml deleted file mode 100644 index 369079d..0000000 --- a/travis-settings.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - skipstyle - - true - - - - skippmd - - true - - - - bintray - - - central - bintray - https://jcenter.bintray.com - - false - - - - - - ossrh - - ${env.GPG_KEY} - - - - - - ossrh - ${env.SONATYPE_USERNAME} - ${env.SONATYPE_PASSWORD} - - - docker.io - ${env.DOCKER_USERNAME} - ${env.DOCKER_PASSWORD} - - - - bintray - ossrh - - From dee33095eff7b397d5fa5195a7593e4ae7011a72 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Thu, 17 Sep 2020 18:33:48 +0300 Subject: [PATCH 022/130] WIP on github actions --- pom.xml | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/pom.xml b/pom.xml index 1d2b1d3..370b0ab 100644 --- a/pom.xml +++ b/pom.xml @@ -58,8 +58,6 @@ 3.0.1 2.10.4 2.22.0 - 1.6 - 1.6.8 2.5.3 3.0.0-M1 3.10.0 @@ -239,17 +237,6 @@ ${env.GITHUB_TOKEN} - - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} - true - - ossrh - https://oss.sonatype.org/ - true - - maven-enforcer-plugin ${maven-enforcer-plugin.version} @@ -314,18 +301,6 @@ - - maven-gpg-plugin - ${maven-gpg-plugin.version} - - - sign-artifacts - - sign - - - - com.spotify @@ -447,26 +422,6 @@ true - - release - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - - maven-source-plugin - - - maven-javadoc-plugin - - - maven-gpg-plugin - - - - no-extra-tags From 1c9e584ce3249b8df3376d159b5c2a8fee9bf577 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Thu, 17 Sep 2020 18:35:47 +0300 Subject: [PATCH 023/130] WIP on github actions --- pom.xml | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/pom.xml b/pom.xml index 370b0ab..84dde1f 100644 --- a/pom.xml +++ b/pom.xml @@ -410,38 +410,6 @@ - - skipstyle - - true - - - - skippmd - - true - - - - no-extra-tags - - true - - - true - - - - extra-tags - - false - - - - extratags - - - SkipDockerGoals From 460dca7facddadbde9eadecc19e19292c90377a7 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Thu, 17 Sep 2020 18:39:15 +0300 Subject: [PATCH 024/130] WIP on github actions --- pom.xml | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/pom.xml b/pom.xml index 84dde1f..9b78736 100644 --- a/pom.xml +++ b/pom.xml @@ -60,12 +60,10 @@ 2.22.0 2.5.3 3.0.0-M1 - 3.10.0 3.0.0 3.2.0 3.1.2 2.7 - 0.8.5 google_checks.xml @@ -160,17 +158,6 @@ true - - maven-pmd-plugin - ${maven-pmd-plugin.version} - - - - check - - - - maven-checkstyle-plugin ${maven-checkstyle-plugin.version} @@ -204,25 +191,6 @@ maven-surefire-plugin ${maven-surefire-plugin.version} - - org.jacoco - jacoco-maven-plugin - ${jacoco-maven-plugin.version} - - - - prepare-agent - - - - report - test - - report - - - - maven-release-plugin @@ -402,10 +370,6 @@ maven-surefire-plugin - - org.jacoco - jacoco-maven-plugin - From 821b546a384ed24c0606ed21c44b1320c66e8efb Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Thu, 17 Sep 2020 19:43:04 +0300 Subject: [PATCH 025/130] WIP on github actions --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9b78736..2cb3e1c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,8 +32,9 @@ https://scalecube.io - scm:git:git@github.com:scalecube/scalecube-parent.git - scm:git:git@github.com:scalecube/scalecube-parent.git + scm:git:https://github.com/scalecube/scalecube-parent.git + scm:git:https://github.com/scalecube/scalecube-parent.git + HEAD From 2ec903c1e9723b94acad1316074b6a6027b88166 Mon Sep 17 00:00:00 2001 From: artem-v Date: Thu, 17 Sep 2020 16:43:51 +0000 Subject: [PATCH 026/130] [maven-release-plugin] prepare release v0.2.0 --- pom.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 2cb3e1c..f5c1a3e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.scalecube scalecube-parent-pom - 0.2.0-SNAPSHOT + 0.2.0 pom ScaleCube parent project @@ -35,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD + v0.2.0 @@ -221,7 +219,7 @@ The reactor is not valid true - + From 378689097d55492a917acf5fe7a506edb32662e5 Mon Sep 17 00:00:00 2001 From: artem-v Date: Thu, 17 Sep 2020 16:43:57 +0000 Subject: [PATCH 027/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f5c1a3e..f896394 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.0 + 0.2.1-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.0 + HEAD From 8b49e5af60d3e876c496d7b48f6ef5347033aba6 Mon Sep 17 00:00:00 2001 From: artem-v Date: Thu, 17 Sep 2020 16:44:15 +0000 Subject: [PATCH 028/130] [maven-release-plugin] rollback the release of v0.2.0 --- pom.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f896394..2cb3e1c 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 io.scalecube scalecube-parent-pom - 0.2.1-SNAPSHOT + 0.2.0-SNAPSHOT pom ScaleCube parent project @@ -219,7 +221,7 @@ The reactor is not valid true - + From f9948fb9dbfca29dfcbabfc50a6d216fa156130b Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Thu, 17 Sep 2020 19:47:33 +0300 Subject: [PATCH 029/130] WIP on github actions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2cb3e1c..1023542 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ github GitHub Packages - https://maven.pkg.github.com/scalecube/${project.artifactId} + https://maven.pkg.github.com/scalecube/scalecube-parent From ddf2eedae563c9974f51b10bfbc680953187790d Mon Sep 17 00:00:00 2001 From: artem-v Date: Thu, 17 Sep 2020 16:48:31 +0000 Subject: [PATCH 030/130] [maven-release-plugin] prepare release v0.2.0 --- pom.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 1023542..e2bcf4d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.scalecube scalecube-parent-pom - 0.2.0-SNAPSHOT + 0.2.0 pom ScaleCube parent project @@ -35,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD + v0.2.0 @@ -221,7 +219,7 @@ The reactor is not valid true - + From ee1c82c1419bac323d6d52a305c06517ced3e271 Mon Sep 17 00:00:00 2001 From: artem-v Date: Thu, 17 Sep 2020 16:48:37 +0000 Subject: [PATCH 031/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e2bcf4d..22eeba3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.0 + 0.2.1-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.0 + HEAD From a4aae2711672d0644e9259a7cc10b69031ecb641 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Thu, 17 Sep 2020 21:44:49 +0300 Subject: [PATCH 032/130] Updated javadoc plugin --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 22eeba3..c520414 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 3.7.0 3.0.1 - 2.10.4 + 3.2.0 2.22.0 2.5.3 3.0.0-M1 From 2a6de7298c97962d3fa6d64e0cec8343b039387d Mon Sep 17 00:00:00 2001 From: artem-v Date: Thu, 17 Sep 2020 18:45:41 +0000 Subject: [PATCH 033/130] [maven-release-plugin] prepare release v0.2.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c520414..fdf6005 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.1-SNAPSHOT + 0.2.1 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD + v0.2.1 From e01c8c9a5b24bd1f37a07ba2be5c254595cb7012 Mon Sep 17 00:00:00 2001 From: artem-v Date: Thu, 17 Sep 2020 18:45:47 +0000 Subject: [PATCH 034/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fdf6005..6e726f0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.1 + 0.2.2-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.1 + HEAD From 76c7a53e011ad6ec8ade8de3701e1df15b64af99 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 16:10:40 +0300 Subject: [PATCH 035/130] Updated feature-ci (make `develop` great again) --- .github/workflows/feature-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/feature-ci.yml b/.github/workflows/feature-ci.yml index c0611d2..e9a00a3 100644 --- a/.github/workflows/feature-ci.yml +++ b/.github/workflows/feature-ci.yml @@ -7,7 +7,6 @@ on: - 'README.md' branches-ignore: - 'master' - - 'develop' - 'release*' jobs: From 7adbc86ebe07443acd08873acedd100ca0db1e29 Mon Sep 17 00:00:00 2001 From: artem-v Date: Fri, 18 Sep 2020 13:14:22 +0000 Subject: [PATCH 036/130] [maven-release-plugin] prepare release v0.2.2 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 6e726f0..0182762 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.2-SNAPSHOT + 0.2.2 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD + v0.2.2 From a606d667a47f98008ee5959e84b4d5beb4295a8e Mon Sep 17 00:00:00 2001 From: artem-v Date: Fri, 18 Sep 2020 13:14:28 +0000 Subject: [PATCH 037/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0182762..d987f8e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.2 + 0.2.3-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.2 + HEAD From d4ccb62abfdd4b5fc66b09050f04986a1060c132 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 17:06:07 +0300 Subject: [PATCH 038/130] Added pre-release and release --- .github/workflows/pre-release-ci.yml | 35 ++++++++++++++++++++++++++++ .github/workflows/release-ci.yml | 5 +--- 2 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/pre-release-ci.yml diff --git a/.github/workflows/pre-release-ci.yml b/.github/workflows/pre-release-ci.yml new file mode 100644 index 0000000..b1fa7e4 --- /dev/null +++ b/.github/workflows/pre-release-ci.yml @@ -0,0 +1,35 @@ +name: Pre-release CI + +on: + release: + types: [prereleased] + +jobs: + build: + name: Pre-release CI + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/cache@v1 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + server-id: github + server-username: GITHUB_ACTOR + server-password: GITHUB_TOKEN + - name: Deploy pre-release version + run: | + # `tag` is the concatenation of `v` and a version by the tag convention. + pre_release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") + echo Pre-release version $pre_release_version + env: + GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }} + - name: Rollback pre-release (remove tag) + if: failure() + run: git push origin :refs/tags/${{ github.event.release.tag_name }} diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 5624043..c27a8e5 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -2,7 +2,7 @@ name: Release CI on: release: - types: [published] + types: [released] jobs: build: @@ -28,9 +28,6 @@ jobs: # `tag` is the concatenation of `v` and a version by the tag convention. release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") echo Release version $release_version - mvn versions:set -DnewVersion=$release_version -DgenerateBackupPoms=false - mvn versions:commit - mvn clean deploy -B -V env: GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }} - name: Rollback release (remove tag) From fd7214b530368ba65ac655106eb6a3a5fa2de939 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 17:28:35 +0300 Subject: [PATCH 039/130] Added pre-release and release --- .github/workflows/pre-release-ci.yml | 3 +++ .github/workflows/release-ci.yml | 38 +++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pre-release-ci.yml b/.github/workflows/pre-release-ci.yml index b1fa7e4..2bdd5f5 100644 --- a/.github/workflows/pre-release-ci.yml +++ b/.github/workflows/pre-release-ci.yml @@ -28,6 +28,9 @@ jobs: # `tag` is the concatenation of `v` and a version by the tag convention. pre_release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") echo Pre-release version $pre_release_version + mvn versions:set -DnewVersion=$pre_release_version -DgenerateBackupPoms=false + mvn versions:commit + mvn clean deploy -B -V env: GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }} - name: Rollback pre-release (remove tag) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index c27a8e5..c41af92 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -10,6 +10,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + with: + fetch-depth: 0 - uses: actions/cache@v1 with: path: ~/.m2/repository @@ -23,13 +25,41 @@ jobs: server-id: github server-username: GITHUB_ACTOR server-password: GITHUB_TOKEN - - name: Deploy release version + - name: Maven Build + run: mvn clean install -DskipTests=true -Ddockerfile.skip=true -B -V + env: + GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }} + - name: Maven Verify + run: mvn verify -B + - name: Configure git + run: | + echo "Git checkout branch ${GITHUB_REF##*/}, commit ${GITHUB_SHA} was pushed by ${GITHUB_ACTOR}" + git checkout ${GITHUB_REF##*/} + echo "Git reset hard to ${GITHUB_SHA}" + git reset --hard ${GITHUB_SHA} + git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" + git config --global user.name "${GITHUB_ACTOR}" + - name: Prepare release + id: prepare_release run: | # `tag` is the concatenation of `v` and a version by the tag convention. release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") echo Release version $release_version + mvn --batch-mode release:prepare -P release \ + -DreleaseVersion=$release_version \ + -DautoVersionSubmodules=true -Darguments="-DskipTests=true" + echo ::set-output name=release_tag::$(git describe --tags --abbrev=0) + - name: Perform release + run: mvn --batch-mode release:perform -P release -Darguments="-DskipTests=true -Ddocker.image.extra-tag=master" env: - GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }} - - name: Rollback release (remove tag) + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }} + - name: Rollback release if: failure() - run: git push origin :refs/tags/${{ github.event.release.tag_name }} + run: | + mvn release:rollback || echo "nothing to rollback" + if [ ! -z "${{ steps.prepare_release.outputs.release_tag }}" ] + then + git tag -d ${{ steps.prepare_release.outputs.release_tag }} + git push origin :refs/tags/${{ steps.prepare_release.outputs.release_tag }} + fi From fc2d3db326588dcab76336bc52fb525bb0e1d966 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 17:34:44 +0300 Subject: [PATCH 040/130] Added pre-release and release --- .github/workflows/release-ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index c41af92..800db22 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -48,7 +48,6 @@ jobs: mvn --batch-mode release:prepare -P release \ -DreleaseVersion=$release_version \ -DautoVersionSubmodules=true -Darguments="-DskipTests=true" - echo ::set-output name=release_tag::$(git describe --tags --abbrev=0) - name: Perform release run: mvn --batch-mode release:perform -P release -Darguments="-DskipTests=true -Ddocker.image.extra-tag=master" env: @@ -56,10 +55,4 @@ jobs: GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }} - name: Rollback release if: failure() - run: | - mvn release:rollback || echo "nothing to rollback" - if [ ! -z "${{ steps.prepare_release.outputs.release_tag }}" ] - then - git tag -d ${{ steps.prepare_release.outputs.release_tag }} - git push origin :refs/tags/${{ steps.prepare_release.outputs.release_tag }} - fi + run: git push origin :refs/tags/${{ github.event.release.tag_name }} From fbb999ffbe2fbccd7fb68ebf8be3a1f8e93c28c1 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 17:55:14 +0300 Subject: [PATCH 041/130] Added pre-release and release --- .github/workflows/release-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 800db22..58c7f52 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -33,8 +33,9 @@ jobs: run: mvn verify -B - name: Configure git run: | - echo "Git checkout branch ${GITHUB_REF##*/}, commit ${GITHUB_SHA} was pushed by ${GITHUB_ACTOR}" - git checkout ${GITHUB_REF##*/} + echo "github_ref=${GITHUB_REF}, github_ref_double_hashes=${GITHUB_REF##*/}, github_branch=${GITHUB_REF#refs/heads/}" + echo "Git checkout branch ${GITHUB_REF#refs/heads/}, commit ${GITHUB_SHA} was pushed by ${GITHUB_ACTOR}" + git checkout ${GITHUB_REF#refs/heads/} echo "Git reset hard to ${GITHUB_SHA}" git reset --hard ${GITHUB_SHA} git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" From 7e9ba0a74a6f7410b2ddd5b518a694579f100162 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 18:00:56 +0300 Subject: [PATCH 042/130] Added pre-release and release --- .github/workflows/release-ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 58c7f52..2632ce0 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -12,6 +12,7 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 + - run: git checkout HEAD^ - uses: actions/cache@v1 with: path: ~/.m2/repository @@ -33,11 +34,6 @@ jobs: run: mvn verify -B - name: Configure git run: | - echo "github_ref=${GITHUB_REF}, github_ref_double_hashes=${GITHUB_REF##*/}, github_branch=${GITHUB_REF#refs/heads/}" - echo "Git checkout branch ${GITHUB_REF#refs/heads/}, commit ${GITHUB_SHA} was pushed by ${GITHUB_ACTOR}" - git checkout ${GITHUB_REF#refs/heads/} - echo "Git reset hard to ${GITHUB_SHA}" - git reset --hard ${GITHUB_SHA} git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" git config --global user.name "${GITHUB_ACTOR}" - name: Prepare release From 96596f96fd424e5017964637ba05f604aed45cd6 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 18:06:49 +0300 Subject: [PATCH 043/130] Added pre-release and release --- .github/workflows/release-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 2632ce0..9e4f005 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -12,7 +12,6 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 - - run: git checkout HEAD^ - uses: actions/cache@v1 with: path: ~/.m2/repository @@ -39,6 +38,7 @@ jobs: - name: Prepare release id: prepare_release run: | + echo "### github_event = ${{ toJson(github.event) }}" # `tag` is the concatenation of `v` and a version by the tag convention. release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") echo Release version $release_version From 867e1d2eace0a01da37af59f51454e2daf51023d Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 18:12:15 +0300 Subject: [PATCH 044/130] Added target_commitish --- .github/workflows/release-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 9e4f005..6aa5d50 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -12,6 +12,7 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 0 + - run: git checkout ${{ github.event.release.target_commitish }} - uses: actions/cache@v1 with: path: ~/.m2/repository @@ -38,7 +39,6 @@ jobs: - name: Prepare release id: prepare_release run: | - echo "### github_event = ${{ toJson(github.event) }}" # `tag` is the concatenation of `v` and a version by the tag convention. release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") echo Release version $release_version From 68dc8191a45d7864e96f1a8e419eef46c25a3173 Mon Sep 17 00:00:00 2001 From: artem-v Date: Fri, 18 Sep 2020 15:14:02 +0000 Subject: [PATCH 045/130] [maven-release-plugin] prepare release v0.2.3 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d987f8e..78936b4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.3-SNAPSHOT + 0.2.3 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD + v0.2.3 From 310fe4e4d7af9c4a80168c7248126ff5b38a289e Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 18:19:05 +0300 Subject: [PATCH 046/130] Added update-versions --- .github/workflows/release-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 6aa5d50..18e6c3e 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -42,8 +42,8 @@ jobs: # `tag` is the concatenation of `v` and a version by the tag convention. release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") echo Release version $release_version - mvn --batch-mode release:prepare -P release \ - -DreleaseVersion=$release_version \ + mvn --batch-mode release:update-versions -P release \ + -DdevelopmentVersion=$release_version \ -DautoVersionSubmodules=true -Darguments="-DskipTests=true" - name: Perform release run: mvn --batch-mode release:perform -P release -Darguments="-DskipTests=true -Ddocker.image.extra-tag=master" From a3726cedaadca051ec4728054b1a4973ac576c10 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 18:23:18 +0300 Subject: [PATCH 047/130] Added remoteTagging=false --- .github/workflows/release-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 18e6c3e..7b8e8bd 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -42,8 +42,9 @@ jobs: # `tag` is the concatenation of `v` and a version by the tag convention. release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") echo Release version $release_version - mvn --batch-mode release:update-versions -P release \ - -DdevelopmentVersion=$release_version \ + mvn --batch-mode release:prepare -P release \ + -DremoteTagging=false \ + -DreleaseVersion=$release_version \ -DautoVersionSubmodules=true -Darguments="-DskipTests=true" - name: Perform release run: mvn --batch-mode release:perform -P release -Darguments="-DskipTests=true -Ddocker.image.extra-tag=master" From 41fa022f262029984350196c7fa36b80e052547b Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 18:26:07 +0300 Subject: [PATCH 048/130] Added `-SNAPSHOT` --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 78936b4..4acb0d5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.3 + 0.2.3-SNAPSHOT pom ScaleCube parent project From 76e34154017f09d4e834325275db3048cc4ecd98 Mon Sep 17 00:00:00 2001 From: artem-v Date: Fri, 18 Sep 2020 15:27:57 +0000 Subject: [PATCH 049/130] [maven-release-plugin] prepare release v0.2.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4acb0d5..78936b4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.3-SNAPSHOT + 0.2.3 pom ScaleCube parent project From 37fdd4ccde2c22c8e6a49b62a1a8694478ff0ad2 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 18:32:57 +0300 Subject: [PATCH 050/130] Added `-SNAPSHOT` (again) --- .github/workflows/release-ci.yml | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 7b8e8bd..07864d0 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -43,6 +43,7 @@ jobs: release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") echo Release version $release_version mvn --batch-mode release:prepare -P release \ + -DsuppressCommitBeforeTag=true \ -DremoteTagging=false \ -DreleaseVersion=$release_version \ -DautoVersionSubmodules=true -Darguments="-DskipTests=true" diff --git a/pom.xml b/pom.xml index 78936b4..ea184b7 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.3 + 0.2.4-SNAPSHOT pom ScaleCube parent project From f6a7e1c3a64dc712dd352291ae37ff3b0b04c3ad Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 18:51:39 +0300 Subject: [PATCH 051/130] Added `-Dtag` --- .github/workflows/release-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 07864d0..a66eda5 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -43,8 +43,7 @@ jobs: release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") echo Release version $release_version mvn --batch-mode release:prepare -P release \ - -DsuppressCommitBeforeTag=true \ - -DremoteTagging=false \ + -Dtag=${{ github.event.release.tag_name }} \ -DreleaseVersion=$release_version \ -DautoVersionSubmodules=true -Darguments="-DskipTests=true" - name: Perform release From 67a575b33457ea0f36d3bb44155ed2350086d219 Mon Sep 17 00:00:00 2001 From: artem-v Date: Fri, 18 Sep 2020 15:53:14 +0000 Subject: [PATCH 052/130] [maven-release-plugin] prepare release v0.2.4 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ea184b7..98c28e3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.4-SNAPSHOT + 0.2.4 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.3 + v0.2.4 From 775e4fd9af01929109d46bf1999471ae0f206333 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 18:54:09 +0300 Subject: [PATCH 053/130] Added tag removal procedure at prepare-relaese --- .github/workflows/release-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index a66eda5..fc779ba 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -42,6 +42,7 @@ jobs: # `tag` is the concatenation of `v` and a version by the tag convention. release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") echo Release version $release_version + git push origin :refs/tags/${{ github.event.release.tag_name }} mvn --batch-mode release:prepare -P release \ -Dtag=${{ github.event.release.tag_name }} \ -DreleaseVersion=$release_version \ From 87e87e7300982cc9e8facddb43272e3146eccd2b Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 18:54:38 +0300 Subject: [PATCH 054/130] Added tag removal procedure at prepare-relaese --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 98c28e3..deba00b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.4 + 0.2.4-SNAPSHOT pom ScaleCube parent project From 1072bca9bfadb7d64bb9afc7973b298305d33ed1 Mon Sep 17 00:00:00 2001 From: artem-v Date: Fri, 18 Sep 2020 15:56:39 +0000 Subject: [PATCH 055/130] [maven-release-plugin] prepare release v0.2.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index deba00b..98c28e3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.4-SNAPSHOT + 0.2.4 pom ScaleCube parent project From d50f53f2bb9d1ddf8b796d50b831416cd56e2384 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 18:59:00 +0300 Subject: [PATCH 056/130] Added tag removal procedure at prepare-relaese --- .github/workflows/release-ci.yml | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index fc779ba..7c69d69 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -42,6 +42,7 @@ jobs: # `tag` is the concatenation of `v` and a version by the tag convention. release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") echo Release version $release_version + git tag -d ${{ github.event.release.tag_name }} git push origin :refs/tags/${{ github.event.release.tag_name }} mvn --batch-mode release:prepare -P release \ -Dtag=${{ github.event.release.tag_name }} \ diff --git a/pom.xml b/pom.xml index 98c28e3..deba00b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.4 + 0.2.4-SNAPSHOT pom ScaleCube parent project From 97279fe3ac76389278bb0d31763acca3a5448664 Mon Sep 17 00:00:00 2001 From: artem-v Date: Fri, 18 Sep 2020 16:00:10 +0000 Subject: [PATCH 057/130] [maven-release-plugin] prepare release v0.2.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index deba00b..98c28e3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.4-SNAPSHOT + 0.2.4 pom ScaleCube parent project From 5036ea9c4dfc97a4ed612351c4beab3303254cc5 Mon Sep 17 00:00:00 2001 From: artem-v Date: Fri, 18 Sep 2020 16:00:17 +0000 Subject: [PATCH 058/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 98c28e3..083b515 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.4 + 0.2.5-SNAPSHOT pom ScaleCube parent project From 72ee1f52b920256f9e2cfa2857e190742ab55133 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 19:02:03 +0300 Subject: [PATCH 059/130] Added remoteTagging=false --- .github/workflows/release-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 7c69d69..11d24e3 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -43,9 +43,9 @@ jobs: release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") echo Release version $release_version git tag -d ${{ github.event.release.tag_name }} - git push origin :refs/tags/${{ github.event.release.tag_name }} mvn --batch-mode release:prepare -P release \ -Dtag=${{ github.event.release.tag_name }} \ + -DremoteTagging=false \ -DreleaseVersion=$release_version \ -DautoVersionSubmodules=true -Darguments="-DskipTests=true" - name: Perform release From 4cd16166698352c28daa5143f845882a942b4b20 Mon Sep 17 00:00:00 2001 From: artem-v Date: Fri, 18 Sep 2020 16:03:30 +0000 Subject: [PATCH 060/130] [maven-release-plugin] prepare release v0.2.5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 083b515..ded06f6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.5-SNAPSHOT + 0.2.5 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.4 + v0.2.5 From 3ed9c511f51702eb4484c468e7b0fef42388d3ad Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Fri, 18 Sep 2020 19:05:55 +0300 Subject: [PATCH 061/130] Fixed pre-pare release --- .github/workflows/release-ci.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 11d24e3..7c69d69 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -43,9 +43,9 @@ jobs: release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") echo Release version $release_version git tag -d ${{ github.event.release.tag_name }} + git push origin :refs/tags/${{ github.event.release.tag_name }} mvn --batch-mode release:prepare -P release \ -Dtag=${{ github.event.release.tag_name }} \ - -DremoteTagging=false \ -DreleaseVersion=$release_version \ -DautoVersionSubmodules=true -Darguments="-DskipTests=true" - name: Perform release diff --git a/pom.xml b/pom.xml index ded06f6..9df6c46 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.5 + 0.2.5-SNAPSHOT pom ScaleCube parent project From a08db55793ad765d95c8933d22543429fa15cdb2 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sat, 19 Sep 2020 15:07:02 +0300 Subject: [PATCH 062/130] Added `mvn release:rollback` --- .github/workflows/release-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 7c69d69..344338a 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -45,7 +45,6 @@ jobs: git tag -d ${{ github.event.release.tag_name }} git push origin :refs/tags/${{ github.event.release.tag_name }} mvn --batch-mode release:prepare -P release \ - -Dtag=${{ github.event.release.tag_name }} \ -DreleaseVersion=$release_version \ -DautoVersionSubmodules=true -Darguments="-DskipTests=true" - name: Perform release @@ -55,4 +54,6 @@ jobs: GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }} - name: Rollback release if: failure() - run: git push origin :refs/tags/${{ github.event.release.tag_name }} + run: | + git push origin :refs/tags/${{ github.event.release.tag_name }} + mvn release:rollback From 4d75f84d09b51142dd6d69b2179320f3e5a4c6f3 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 19 Sep 2020 12:09:14 +0000 Subject: [PATCH 063/130] [maven-release-plugin] prepare release v0.2.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9df6c46..ded06f6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.5-SNAPSHOT + 0.2.5 pom ScaleCube parent project From c042ce7f1589b8b4e842d1eee73ffe0b12878404 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 19 Sep 2020 12:09:20 +0000 Subject: [PATCH 064/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ded06f6..7cbfe87 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.5 + 0.2.6-SNAPSHOT pom ScaleCube parent project From 2d8cbe482fd6927fd3290dd749ab8deebf5ced1c Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 19 Sep 2020 12:14:54 +0000 Subject: [PATCH 065/130] [maven-release-plugin] prepare release v0.2.6 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7cbfe87..f6439ae 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.6-SNAPSHOT + 0.2.6 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.5 + v0.2.6 From cfe9d40262f38f76a004221b4660969177bd4149 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 19 Sep 2020 12:15:00 +0000 Subject: [PATCH 066/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f6439ae..87ed01b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.6 + 0.2.7-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.6 + v0.2.5 From 76a18df38dd766d94091cfe9ae755f9b166d1b7b Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sat, 19 Sep 2020 17:06:35 +0300 Subject: [PATCH 067/130] Added `mvn release:rollback` --- .github/workflows/master-ci.yml | 64 -------------------------------- .github/workflows/release-ci.yml | 2 +- 2 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 .github/workflows/master-ci.yml diff --git a/.github/workflows/master-ci.yml b/.github/workflows/master-ci.yml deleted file mode 100644 index b79bcd5..0000000 --- a/.github/workflows/master-ci.yml +++ /dev/null @@ -1,64 +0,0 @@ -name: Master branch CI - -on: - push: - branches: - - 'master' - -jobs: - build: - name: Master Branch CI - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - uses: actions/cache@v1 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - server-id: github - server-username: GITHUB_ACTOR - server-password: GITHUB_TOKEN - - name: Maven Build - run: mvn clean install -DskipTests=true -Ddockerfile.skip=true -B -V - env: - GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }} - - name: Maven Verify - run: mvn verify -B - - name: Configure git - run: | - echo "Git checkout branch ${GITHUB_REF##*/}, commit ${GITHUB_SHA} was pushed by ${GITHUB_ACTOR}" - git checkout ${GITHUB_REF##*/} - echo "Git reset hard to ${GITHUB_SHA}" - git reset --hard ${GITHUB_SHA} - git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" - git config --global user.name "${GITHUB_ACTOR}" - - name: Prepare release - id: prepare_release - run: | - mvn --batch-mode build-helper:parse-version release:prepare -P release \ - -DreleaseVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion} \ - -DdevelopmentVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.nextIncrementalVersion}-SNAPSHOT \ - -DautoVersionSubmodules=true -Darguments="-DskipTests=true" - echo ::set-output name=release_tag::$(git describe --tags --abbrev=0) - - name: Perform release - run: mvn --batch-mode release:perform -P release -Darguments="-DskipTests=true -Ddocker.image.extra-tag=master" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }} - - name: Rollback release - if: failure() - run: | - mvn release:rollback || echo "nothing to rollback" - if [ ! -z "${{ steps.prepare_release.outputs.release_tag }}" ] - then - git tag -d ${{ steps.prepare_release.outputs.release_tag }} - git push origin :refs/tags/${{ steps.prepare_release.outputs.release_tag }} - fi diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 344338a..c39edee 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -55,5 +55,5 @@ jobs: - name: Rollback release if: failure() run: | + mvn release:rollback || echo "nothing to rollback" git push origin :refs/tags/${{ github.event.release.tag_name }} - mvn release:rollback From 196e9530803cf1688040e30835a5936547762b34 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sat, 19 Sep 2020 17:08:21 +0300 Subject: [PATCH 068/130] Added `mvn release:rollback` --- .github/workflows/feature-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/feature-ci.yml b/.github/workflows/feature-ci.yml index e9a00a3..c123f98 100644 --- a/.github/workflows/feature-ci.yml +++ b/.github/workflows/feature-ci.yml @@ -6,7 +6,6 @@ on: - '.github/workflows/**' - 'README.md' branches-ignore: - - 'master' - 'release*' jobs: From b0b0414c5b417694590f5c145d0ab5ed7c5a8fce Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sat, 19 Sep 2020 18:12:22 +0300 Subject: [PATCH 069/130] Debug github event --- .github/workflows/{feature-ci.yml => branch-ci.yml} | 6 ++---- .github/workflows/release-ci.yml | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) rename .github/workflows/{feature-ci.yml => branch-ci.yml} (90%) diff --git a/.github/workflows/feature-ci.yml b/.github/workflows/branch-ci.yml similarity index 90% rename from .github/workflows/feature-ci.yml rename to .github/workflows/branch-ci.yml index c123f98..3215610 100644 --- a/.github/workflows/feature-ci.yml +++ b/.github/workflows/branch-ci.yml @@ -1,16 +1,14 @@ -name: Feature Branch CI +name: Branch CI on: push: paths-ignore: - '.github/workflows/**' - 'README.md' - branches-ignore: - - 'release*' jobs: build: - name: Feature Branch CI + name: Branch CI runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index c39edee..947e73e 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -34,6 +34,7 @@ jobs: run: mvn verify -B - name: Configure git run: | + echo "github --- ${{ toJson(github) }}" git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" git config --global user.name "${GITHUB_ACTOR}" - name: Prepare release From 065936a9726ab448b18652e3165f795feee43e72 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 19 Sep 2020 15:14:33 +0000 Subject: [PATCH 070/130] [maven-release-plugin] prepare release v0.2.7 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 87ed01b..b386179 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.7-SNAPSHOT + 0.2.7 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.5 + v0.2.7 From 6fa9ce785d8ec5fe09199a61f972cfc30f34c217 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 19 Sep 2020 15:14:40 +0000 Subject: [PATCH 071/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b386179..4b5013b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.7 + 0.2.8-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.7 + v0.2.5 From 35166ee42069e6f425261ab95da0f43d7c8fc281 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 19 Sep 2020 15:25:09 +0000 Subject: [PATCH 072/130] [maven-release-plugin] prepare release v0.2.8 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4b5013b..f015125 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.8-SNAPSHOT + 0.2.8 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.5 + v0.2.8 From 317864a647a2c5b85287785c4b3a3c99bc293613 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 19 Sep 2020 15:25:16 +0000 Subject: [PATCH 073/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f015125..b21d41d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.8 + 0.2.9-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.8 + v0.2.5 From c7af8ba4ba58ffbdda0a57a8738e72d832e63714 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sat, 19 Sep 2020 18:26:14 +0300 Subject: [PATCH 074/130] Added back branches-ignore: - 'release*' --- .github/workflows/branch-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml index 3215610..cc70819 100644 --- a/.github/workflows/branch-ci.yml +++ b/.github/workflows/branch-ci.yml @@ -5,6 +5,8 @@ on: paths-ignore: - '.github/workflows/**' - 'README.md' + branches-ignore: + - 'release*' jobs: build: From 7e7c05f0430426e0d8f74fb6eba80bc9266d6fb3 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 19 Sep 2020 15:28:30 +0000 Subject: [PATCH 075/130] [maven-release-plugin] prepare release v0.2.9 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b21d41d..2021bb1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.9-SNAPSHOT + 0.2.9 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.5 + v0.2.9 From c925697a6460b63d9179fcc258e7012a152c32ac Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 19 Sep 2020 15:28:36 +0000 Subject: [PATCH 076/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2021bb1..b0fe8c5 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.9 + 0.2.10-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.9 + v0.2.5 From a682561cf096d27f32f6e055fe05c2a0e1069c00 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sun, 20 Sep 2020 10:16:44 +0300 Subject: [PATCH 077/130] Updated ci\s with `prepare-` prefix --- .github/workflows/pre-release-ci.yml | 4 ++-- .github/workflows/release-ci.yml | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pre-release-ci.yml b/.github/workflows/pre-release-ci.yml index 2bdd5f5..3945e4f 100644 --- a/.github/workflows/pre-release-ci.yml +++ b/.github/workflows/pre-release-ci.yml @@ -25,8 +25,8 @@ jobs: server-password: GITHUB_TOKEN - name: Deploy pre-release version run: | - # `tag` is the concatenation of `v` and a version by the tag convention. - pre_release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") + # `tag` is the concatenation of `prepare-` and a version by the tag convention. + pre_release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/prepare-//") echo Pre-release version $pre_release_version mvn versions:set -DnewVersion=$pre_release_version -DgenerateBackupPoms=false mvn versions:commit diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 947e73e..ef25b55 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -40,16 +40,14 @@ jobs: - name: Prepare release id: prepare_release run: | - # `tag` is the concatenation of `v` and a version by the tag convention. - release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") + # `tag` is the concatenation of `prepare-` and a version by the tag convention. + release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/prepare-//") echo Release version $release_version - git tag -d ${{ github.event.release.tag_name }} - git push origin :refs/tags/${{ github.event.release.tag_name }} - mvn --batch-mode release:prepare -P release \ + mvn -B release:prepare \ -DreleaseVersion=$release_version \ -DautoVersionSubmodules=true -Darguments="-DskipTests=true" - name: Perform release - run: mvn --batch-mode release:perform -P release -Darguments="-DskipTests=true -Ddocker.image.extra-tag=master" + run: mvn -B release:perform -Darguments="-DskipTests=true -Ddocker.image.extra-tag=master" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }} @@ -58,3 +56,4 @@ jobs: run: | mvn release:rollback || echo "nothing to rollback" git push origin :refs/tags/${{ github.event.release.tag_name }} + git push origin :refs/tags/v$release_version From eee8785517e81e34e72560c24fdf1258726e9ae1 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 07:19:28 +0000 Subject: [PATCH 078/130] [maven-release-plugin] prepare release v0.2.10 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b0fe8c5..af874ab 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.10-SNAPSHOT + 0.2.10 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.5 + v0.2.10 From 66d042ed0e6054ef64026525cd183fb056c807b9 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 07:19:34 +0000 Subject: [PATCH 079/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index af874ab..cadba23 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.10 + 0.2.11-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.10 + v0.2.5 From 1ccfff068b3fdcbd26cea47e688fe998d9c9de16 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sun, 20 Sep 2020 10:24:45 +0300 Subject: [PATCH 080/130] Verify release:rollback --- .github/workflows/release-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index ef25b55..b0e91d8 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -44,7 +44,7 @@ jobs: release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/prepare-//") echo Release version $release_version mvn -B release:prepare \ - -DreleaseVersion=$release_version \ + -DreleaseVersion=0.2.10 \ -DautoVersionSubmodules=true -Darguments="-DskipTests=true" - name: Perform release run: mvn -B release:perform -Darguments="-DskipTests=true -Ddocker.image.extra-tag=master" From d8c7b736d1a341d381bfa046c7eb26d232d647fd Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 07:27:07 +0000 Subject: [PATCH 081/130] [maven-release-plugin] prepare release v0.2.10 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cadba23..af874ab 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.11-SNAPSHOT + 0.2.10 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.5 + v0.2.10 From 91206b5c1fdd4dbd5c9aa75dcddc9aa95ec18fcb Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 07:27:13 +0000 Subject: [PATCH 082/130] [maven-release-plugin] rollback the release of v0.2.10 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index af874ab..cadba23 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.10 + 0.2.11-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.10 + v0.2.5 From af31bb7d748c4211491caded77756c4d8892c729 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sun, 20 Sep 2020 10:35:32 +0300 Subject: [PATCH 083/130] Verify release:rollback --- .github/workflows/release-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index b0e91d8..948f889 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -34,7 +34,6 @@ jobs: run: mvn verify -B - name: Configure git run: | - echo "github --- ${{ toJson(github) }}" git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com" git config --global user.name "${GITHUB_ACTOR}" - name: Prepare release @@ -43,6 +42,7 @@ jobs: # `tag` is the concatenation of `prepare-` and a version by the tag convention. release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/prepare-//") echo Release version $release_version + echo ::set-output name=release_tag::0.2.10 mvn -B release:prepare \ -DreleaseVersion=0.2.10 \ -DautoVersionSubmodules=true -Darguments="-DskipTests=true" @@ -56,4 +56,4 @@ jobs: run: | mvn release:rollback || echo "nothing to rollback" git push origin :refs/tags/${{ github.event.release.tag_name }} - git push origin :refs/tags/v$release_version + git push origin :refs/tags/${{ steps.prepare_release.outputs.release_tag }} From 72dc7f2d8584a436a9904555c524217ceded00fc Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 07:39:21 +0000 Subject: [PATCH 084/130] [maven-release-plugin] prepare release v0.2.10 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cadba23..af874ab 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.11-SNAPSHOT + 0.2.10 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.5 + v0.2.10 From 802ea1db32e3350a279d5589a05d876b369459b8 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 07:39:27 +0000 Subject: [PATCH 085/130] [maven-release-plugin] rollback the release of v0.2.10 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index af874ab..cadba23 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.10 + 0.2.11-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.10 + v0.2.5 From 0d30230658be5bbe594ff03945071c5e627b23bb Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sun, 20 Sep 2020 14:06:10 +0300 Subject: [PATCH 086/130] Verify release:rollback --- .github/workflows/release-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 948f889..9744f67 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -56,4 +56,4 @@ jobs: run: | mvn release:rollback || echo "nothing to rollback" git push origin :refs/tags/${{ github.event.release.tag_name }} - git push origin :refs/tags/${{ steps.prepare_release.outputs.release_tag }} + git push origin :refs/tags/v${{ steps.prepare_release.outputs.release_tag }} From d019fb5baf198d5717147a0ff80c6e4eae663b02 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 11:08:17 +0000 Subject: [PATCH 087/130] [maven-release-plugin] prepare release v0.2.10 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cadba23..af874ab 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.11-SNAPSHOT + 0.2.10 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.5 + v0.2.10 From d5cc18d990cb1172dc8df4def1ca634f9c940ff9 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 11:08:21 +0000 Subject: [PATCH 088/130] [maven-release-plugin] rollback the release of v0.2.10 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index af874ab..cadba23 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.10 + 0.2.11-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.10 + v0.2.5 From 3e0eb7bdc372d122c9aadd6d29d176e4920558e9 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sun, 20 Sep 2020 14:22:35 +0300 Subject: [PATCH 089/130] Verify release:rollback --- .github/workflows/release-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 9744f67..e09922d 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -42,10 +42,10 @@ jobs: # `tag` is the concatenation of `prepare-` and a version by the tag convention. release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/prepare-//") echo Release version $release_version - echo ::set-output name=release_tag::0.2.10 mvn -B release:prepare \ -DreleaseVersion=0.2.10 \ -DautoVersionSubmodules=true -Darguments="-DskipTests=true" + echo ::set-output name=release_tag::v0.2.10 - name: Perform release run: mvn -B release:perform -Darguments="-DskipTests=true -Ddocker.image.extra-tag=master" env: @@ -56,4 +56,7 @@ jobs: run: | mvn release:rollback || echo "nothing to rollback" git push origin :refs/tags/${{ github.event.release.tag_name }} - git push origin :refs/tags/v${{ steps.prepare_release.outputs.release_tag }} + if [ ! -z "${{ steps.prepare_release.outputs.release_tag }}" ] + then + git push origin :refs/tags/${{ steps.prepare_release.outputs.release_tag }} + fi From 0679c22d22fbbcad70daa3cb19b1db25c71b517e Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sun, 20 Sep 2020 14:24:24 +0300 Subject: [PATCH 090/130] Fixed release:rollback --- .github/workflows/release-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index e09922d..85677ba 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -43,9 +43,9 @@ jobs: release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/prepare-//") echo Release version $release_version mvn -B release:prepare \ - -DreleaseVersion=0.2.10 \ + -DreleaseVersion=$release_version \ -DautoVersionSubmodules=true -Darguments="-DskipTests=true" - echo ::set-output name=release_tag::v0.2.10 + echo ::set-output name=release_tag::$(git describe --tags --abbrev=0) - name: Perform release run: mvn -B release:perform -Darguments="-DskipTests=true -Ddocker.image.extra-tag=master" env: From 9c10b1628fdf7350cd613f4d0597c527bc603758 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sun, 20 Sep 2020 14:38:04 +0300 Subject: [PATCH 091/130] Fixed release:rollback --- .github/workflows/release-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index 85677ba..bfb2781 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -47,7 +47,7 @@ jobs: -DautoVersionSubmodules=true -Darguments="-DskipTests=true" echo ::set-output name=release_tag::$(git describe --tags --abbrev=0) - name: Perform release - run: mvn -B release:perform -Darguments="-DskipTests=true -Ddocker.image.extra-tag=master" + run: mvn -B release:perform -Darguments="-DskipTests=true -Ddockerfile.skip=true" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }} @@ -58,5 +58,6 @@ jobs: git push origin :refs/tags/${{ github.event.release.tag_name }} if [ ! -z "${{ steps.prepare_release.outputs.release_tag }}" ] then + git tag -d ${{ steps.prepare_release.outputs.release_tag }} git push origin :refs/tags/${{ steps.prepare_release.outputs.release_tag }} fi From 614807a025951dd2acb59c9f813c2ec2b49a7ae8 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 11:58:56 +0000 Subject: [PATCH 092/130] [maven-release-plugin] prepare release v0.2.11 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index cadba23..7e7e022 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.11-SNAPSHOT + 0.2.11 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.5 + v0.2.11 From 780139baeb6da1bf42e8bc3a5bb1f5f4fc9db842 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 11:59:01 +0000 Subject: [PATCH 093/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7e7e022..c78bc48 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.11 + 0.2.12-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.11 + v0.2.5 From 3399e72b3460c86e7ca35c0c17fe997c7ceb407a Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sun, 20 Sep 2020 16:14:40 +0300 Subject: [PATCH 094/130] Fixed pom (changed scm.tag value) --- .github/workflows/pre-release-ci.yml | 4 ++-- .github/workflows/release-ci.yml | 7 ++----- pom.xml | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pre-release-ci.yml b/.github/workflows/pre-release-ci.yml index 3945e4f..2bdd5f5 100644 --- a/.github/workflows/pre-release-ci.yml +++ b/.github/workflows/pre-release-ci.yml @@ -25,8 +25,8 @@ jobs: server-password: GITHUB_TOKEN - name: Deploy pre-release version run: | - # `tag` is the concatenation of `prepare-` and a version by the tag convention. - pre_release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/prepare-//") + # `tag` is the concatenation of `v` and a version by the tag convention. + pre_release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") echo Pre-release version $pre_release_version mvn versions:set -DnewVersion=$pre_release_version -DgenerateBackupPoms=false mvn versions:commit diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index bfb2781..f055aeb 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -39,11 +39,8 @@ jobs: - name: Prepare release id: prepare_release run: | - # `tag` is the concatenation of `prepare-` and a version by the tag convention. - release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/prepare-//") - echo Release version $release_version - mvn -B release:prepare \ - -DreleaseVersion=$release_version \ + mvn -B build-helper:parse-version release:prepare \ + -DreleaseVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion} \ -DautoVersionSubmodules=true -Darguments="-DskipTests=true" echo ::set-output name=release_tag::$(git describe --tags --abbrev=0) - name: Perform release diff --git a/pom.xml b/pom.xml index c78bc48..7f45eac 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.5 + HEAD From f378a78363cf20836c99a656e7199cb062e78ae1 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 13:17:40 +0000 Subject: [PATCH 095/130] [maven-release-plugin] prepare release v0.2.12 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7f45eac..5a917ba 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.12-SNAPSHOT + 0.2.12 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD + v0.2.12 From 383d6501b8bbbac80b253de1da61b1287b7f0244 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 13:17:47 +0000 Subject: [PATCH 096/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5a917ba..3741522 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.12 + 0.2.13-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.12 + HEAD From c06af09a9c8838285675b33a0a5ba52cc28ff744 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sun, 20 Sep 2020 16:24:46 +0300 Subject: [PATCH 097/130] Fixed pre-release version calculation --- .github/workflows/pre-release-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pre-release-ci.yml b/.github/workflows/pre-release-ci.yml index 2bdd5f5..664e97c 100644 --- a/.github/workflows/pre-release-ci.yml +++ b/.github/workflows/pre-release-ci.yml @@ -25,8 +25,7 @@ jobs: server-password: GITHUB_TOKEN - name: Deploy pre-release version run: | - # `tag` is the concatenation of `v` and a version by the tag convention. - pre_release_version=$(echo ${{ github.event.release.tag_name }} | sed "s/v//") + pre_release_version=${{ github.event.release.tag_name }} echo Pre-release version $pre_release_version mvn versions:set -DnewVersion=$pre_release_version -DgenerateBackupPoms=false mvn versions:commit From eee534a0b61cbcd1857a8b08bdb4da9416808249 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sun, 20 Sep 2020 16:26:52 +0300 Subject: [PATCH 098/130] Removed scm.tag `HEAD` --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3741522..d57e2b8 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,6 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD From f74c01bcee9f6856c17f769ca82e76fd2b0e5796 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 13:29:35 +0000 Subject: [PATCH 099/130] [maven-release-plugin] prepare release v0.2.13 --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d57e2b8..a47c2ab 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.13-SNAPSHOT + 0.2.13 pom ScaleCube parent project @@ -33,6 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git + v0.2.13 From fb37dfe45aecb8fe3ae885017088064a0393df4b Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 13:29:40 +0000 Subject: [PATCH 100/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a47c2ab..f664070 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.13 + 0.2.14-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.13 + HEAD From 22ba318f1035c0c1d55fa5e03d04eecc44fe6fd5 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sun, 20 Sep 2020 16:30:24 +0300 Subject: [PATCH 101/130] Set back scm.tag to `HEAD` (otherwise maven keep adding its value) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a47c2ab..01dcbf1 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.13 + HEAD From b936c408cbca052113fdfa068c2b7d62e0099b34 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 13:41:50 +0000 Subject: [PATCH 102/130] [maven-release-plugin] prepare release v0.2.14 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f664070..f468f71 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.14-SNAPSHOT + 0.2.14 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD + v0.2.14 From 03fd58ac42b2bd651278453edf833d0e49dd317f Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 13:41:57 +0000 Subject: [PATCH 103/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f468f71..dbc5dde 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.14 + 0.2.15-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.14 + HEAD From 2341760af729f3d222ea5f2cd02199ba451a3abc Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 13:46:49 +0000 Subject: [PATCH 104/130] [maven-release-plugin] prepare release v0.2.15 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dbc5dde..2bde7ee 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.15-SNAPSHOT + 0.2.15 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD + v0.2.15 From 85411adb3095d8904513040821a916b98f7d1cce Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 13:46:54 +0000 Subject: [PATCH 105/130] [maven-release-plugin] rollback the release of v0.2.15 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2bde7ee..dbc5dde 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.15 + 0.2.15-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.15 + HEAD From b0197bd42e27f2b5cc0eef6c9a4c523963c5aa86 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 13:52:55 +0000 Subject: [PATCH 106/130] [maven-release-plugin] prepare release v0.2.15 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dbc5dde..2bde7ee 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.15-SNAPSHOT + 0.2.15 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD + v0.2.15 From c164c203c1106d6694cff1160d13a33d0445b32d Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 13:53:01 +0000 Subject: [PATCH 107/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2bde7ee..abd29b6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.15 + 0.2.16-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.15 + HEAD From 498f1bc5719f961e0648ed3e4ebc01725b7da845 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 13:59:00 +0000 Subject: [PATCH 108/130] [maven-release-plugin] prepare release v0.2.16 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index abd29b6..0309c5a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.16-SNAPSHOT + 0.2.16 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD + v0.2.16 From 795e6d1f749bd42387047628ac1982beb8a8162f Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 13:59:05 +0000 Subject: [PATCH 109/130] [maven-release-plugin] rollback the release of v0.2.16 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0309c5a..abd29b6 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.16 + 0.2.16-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - v0.2.16 + HEAD From d97b0c921dfc0bcb1df5dfe4c96452b23fde7c19 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sun, 20 Sep 2020 18:00:49 +0300 Subject: [PATCH 110/130] Changed tagNameFormat for release --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index abd29b6..98f7866 100644 --- a/pom.xml +++ b/pom.xml @@ -198,7 +198,7 @@ true true release - v@{project.version} + @{project.artifactId}/@{project.version} deploy ${env.GITHUB_ACTOR} ${env.GITHUB_TOKEN} From c311e619325ecd4f790a3787065eaaada610d24e Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 15:05:02 +0000 Subject: [PATCH 111/130] [maven-release-plugin] prepare release scalecube-parent-pom/0.2.16 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 98f7866..8f57da0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.16-SNAPSHOT + 0.2.16 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD + scalecube-parent-pom/0.2.16 From 30dafed0bd4124d4973cb5b7d172e52c91d63e45 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 15:05:08 +0000 Subject: [PATCH 112/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 8f57da0..690c952 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.16 + 0.2.17-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - scalecube-parent-pom/0.2.16 + HEAD From abae008a96e9a50bbdbc22e669ea7f564f559267 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sun, 20 Sep 2020 18:31:07 +0300 Subject: [PATCH 113/130] Changed tagNameFormat for release: became `release-$project.version` --- .github/workflows/release-ci.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index f055aeb..d674150 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -41,7 +41,7 @@ jobs: run: | mvn -B build-helper:parse-version release:prepare \ -DreleaseVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion} \ - -DautoVersionSubmodules=true -Darguments="-DskipTests=true" + -Darguments="-DskipTests=true -Ddockerfile.skip=true" echo ::set-output name=release_tag::$(git describe --tags --abbrev=0) - name: Perform release run: mvn -B release:perform -Darguments="-DskipTests=true -Ddockerfile.skip=true" diff --git a/pom.xml b/pom.xml index 690c952..40916c4 100644 --- a/pom.xml +++ b/pom.xml @@ -198,7 +198,7 @@ true true release - @{project.artifactId}/@{project.version} + release-@{project.version} deploy ${env.GITHUB_ACTOR} ${env.GITHUB_TOKEN} From 410a01affe0865807a2650e9f9c744c08d765440 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 15:35:29 +0000 Subject: [PATCH 114/130] [maven-release-plugin] prepare release release-0.2.17 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 40916c4..9009081 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.17-SNAPSHOT + 0.2.17 pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD + release-0.2.17 From de614d6675a3870628f846b44f444c993c588f5e Mon Sep 17 00:00:00 2001 From: artem-v Date: Sun, 20 Sep 2020 15:35:35 +0000 Subject: [PATCH 115/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9009081..d62abd3 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.17 + 0.2.18-SNAPSHOT pom ScaleCube parent project @@ -33,7 +33,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - release-0.2.17 + HEAD From c86296d0fccb57b0adea89ea0c43447bd6f74ebe Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Mon, 21 Sep 2020 08:52:04 +0300 Subject: [PATCH 116/130] Minor modification of ignored file format for workflows --- .github/workflows/branch-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/branch-ci.yml b/.github/workflows/branch-ci.yml index cc70819..b639968 100644 --- a/.github/workflows/branch-ci.yml +++ b/.github/workflows/branch-ci.yml @@ -4,7 +4,8 @@ on: push: paths-ignore: - '.github/workflows/**' - - 'README.md' + - '*.md' + - '*.txt' branches-ignore: - 'release*' From 6bd02fa0f85139e3fada6e16f659f1cb488b72c3 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Mon, 21 Sep 2020 08:53:34 +0300 Subject: [PATCH 117/130] Added LICENSE.txt --- LICENSE.txt | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From cd1452a62ecd62db2ff07de07183d9351b1ae158 Mon Sep 17 00:00:00 2001 From: segabriel Date: Tue, 12 Jan 2021 10:29:21 +0200 Subject: [PATCH 118/130] Deploy to maven central --- .github/workflows/pre-release-ci.yml | 26 ++++++++-- .github/workflows/release-ci.yml | 24 ++++++++- pom.xml | 74 +++++++++++++++++++++++----- 3 files changed, 108 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pre-release-ci.yml b/.github/workflows/pre-release-ci.yml index 664e97c..a7f3588 100644 --- a/.github/workflows/pre-release-ci.yml +++ b/.github/workflows/pre-release-ci.yml @@ -16,22 +16,42 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Set up JDK 1.8 + - name: Set up Java for publishing to GitHub Packages uses: actions/setup-java@v1 with: java-version: 1.8 server-id: github server-username: GITHUB_ACTOR server-password: GITHUB_TOKEN - - name: Deploy pre-release version + - name: Deploy pre-release version to GitHub Packages run: | pre_release_version=${{ github.event.release.tag_name }} echo Pre-release version $pre_release_version mvn versions:set -DnewVersion=$pre_release_version -DgenerateBackupPoms=false mvn versions:commit - mvn clean deploy -B -V + mvn clean deploy -Pdeploy2Github -B -V env: GITHUB_TOKEN: ${{ secrets.ORGANIZATION_TOKEN }} + - name: Set up Java for publishing to Maven Central Repository + uses: actions/setup-java@v1 + with: + java-version: 1.8 + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE + - name: Deploy pre-release version to the Maven Central Repository + run: | + pre_release_version=${{ github.event.release.tag_name }} + echo Pre-release version $pre_release_version + mvn versions:set -DnewVersion=$pre_release_version -DgenerateBackupPoms=false + mvn versions:commit + mvn deploy -Pdeploy2Maven -DskipTests -B -V + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - name: Rollback pre-release (remove tag) if: failure() run: git push origin :refs/tags/${{ github.event.release.tag_name }} diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index d674150..f4c7b08 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -19,7 +19,7 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - name: Set up JDK 1.8 + - name: Set up Java for publishing to GitHub Packages uses: actions/setup-java@v1 with: java-version: 1.8 @@ -44,10 +44,30 @@ jobs: -Darguments="-DskipTests=true -Ddockerfile.skip=true" echo ::set-output name=release_tag::$(git describe --tags --abbrev=0) - name: Perform release - run: mvn -B release:perform -Darguments="-DskipTests=true -Ddockerfile.skip=true" + run: mvn -B release:perform -Pdeploy2Github -Darguments="-DskipTests=true -Ddockerfile.skip=true -Pdeploy2Github" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_REPOSITORY: ${{ secrets.GITHUB_REPOSITORY }} + - name: Set up Java for publishing to Maven Central Repository + uses: actions/setup-java@v1 + with: + java-version: 1.8 + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} + gpg-passphrase: MAVEN_GPG_PASSPHRASE + - name: Deploy release version to the Maven Central Repository + run: | + release_version=$(echo ${{ steps.prepare_release.outputs.release_tag }} | sed "s/release-//") + echo release version $release_version + mvn versions:set -DnewVersion=$release_version -DgenerateBackupPoms=false + mvn versions:commit + mvn deploy -Pdeploy2Maven -DskipTests -B -V + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - name: Rollback release if: failure() run: | diff --git a/pom.xml b/pom.xml index d62abd3..c92b6c8 100644 --- a/pom.xml +++ b/pom.xml @@ -20,14 +20,6 @@ - - - github - GitHub Packages - https://maven.pkg.github.com/scalecube/scalecube-parent - - - https://scalecube.io scm:git:https://github.com/scalecube/scalecube-parent.git @@ -63,6 +55,8 @@ 3.2.0 3.1.2 2.7 + 1.6 + 1.6.8 google_checks.xml @@ -200,8 +194,17 @@ release release-@{project.version} deploy - ${env.GITHUB_ACTOR} - ${env.GITHUB_TOKEN} + + + + org.sonatype.plugins + nexus-staging-maven-plugin + ${nexus-staging-maven-plugin.version} + true + + ossrh + https://oss.sonatype.org/ + true @@ -219,7 +222,7 @@ The reactor is not valid true - + @@ -268,6 +271,24 @@ + + maven-gpg-plugin + ${maven-gpg-plugin.version} + + + --pinentry-mode + loopback + + + + + sign-artifacts + + sign + + + + com.spotify @@ -396,6 +417,37 @@ false + + deploy2Github + + + github + GitHub Packages + https://maven.pkg.github.com/scalecube/scalecube-parent + + + + + deploy2Maven + + + ossrh + Central Repository OSSRH + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + + + maven-gpg-plugin + + + + From 77c1e8f8773a95ba3b7ea50a050525475f29dd08 Mon Sep 17 00:00:00 2001 From: segabriel Date: Tue, 12 Jan 2021 13:13:43 +0000 Subject: [PATCH 119/130] [maven-release-plugin] prepare release release-0.2.18 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c92b6c8..075fece 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.18-SNAPSHOT + 0.2.18 pom ScaleCube parent project @@ -25,7 +25,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD + release-0.2.18 @@ -222,7 +222,7 @@ The reactor is not valid true - + From a6a54473a54e18e2d1ddafbbd97337469da1281d Mon Sep 17 00:00:00 2001 From: segabriel Date: Tue, 12 Jan 2021 13:13:54 +0000 Subject: [PATCH 120/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 075fece..891278d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.18 + 0.2.19-SNAPSHOT pom ScaleCube parent project @@ -25,7 +25,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - release-0.2.18 + HEAD From 17717ee6e985fa8907e76511d0ef8ba2a3460031 Mon Sep 17 00:00:00 2001 From: segabriel Date: Tue, 12 Jan 2021 16:07:18 +0200 Subject: [PATCH 121/130] Add javadoc and source plugins for maven deploying --- pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pom.xml b/pom.xml index 891278d..a4df857 100644 --- a/pom.xml +++ b/pom.xml @@ -442,6 +442,12 @@ org.sonatype.plugins nexus-staging-maven-plugin + + maven-source-plugin + + + maven-javadoc-plugin + maven-gpg-plugin From baacc51cae76e303322d8ffc70b0aaba0023ce54 Mon Sep 17 00:00:00 2001 From: segabriel Date: Tue, 12 Jan 2021 14:08:50 +0000 Subject: [PATCH 122/130] [maven-release-plugin] prepare release release-0.2.19 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a4df857..ddf1cd2 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.19-SNAPSHOT + 0.2.19 pom ScaleCube parent project @@ -25,7 +25,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - HEAD + release-0.2.19 From be1b838a1644ae04f9f6881d667778bee1535321 Mon Sep 17 00:00:00 2001 From: segabriel Date: Tue, 12 Jan 2021 14:08:56 +0000 Subject: [PATCH 123/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ddf1cd2..4975241 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent-pom - 0.2.19 + 0.2.20-SNAPSHOT pom ScaleCube parent project @@ -25,7 +25,7 @@ scm:git:https://github.com/scalecube/scalecube-parent.git scm:git:https://github.com/scalecube/scalecube-parent.git - release-0.2.19 + HEAD From ac53b285aa0fbff2c69261bcc56491b23ae72831 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Wed, 24 Mar 2021 14:24:21 +0200 Subject: [PATCH 124/130] Minor update --- .gitignore | 1 + requirements.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 requirements.txt diff --git a/.gitignore b/.gitignore index 7cab252..2e3d26e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ **/target/ *.iml **/logs/*.log +**/logs/*.log.* *.db *.csv *.log diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 5610e90..0000000 --- a/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -requests==2.20.1 From e3691be6ea888bcf4059628a4b659acc66a838d3 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sat, 1 Oct 2022 11:58:18 +0300 Subject: [PATCH 125/130] Cleanup --- pom.xml | 155 ++------------------------------------------------------ 1 file changed, 5 insertions(+), 150 deletions(-) diff --git a/pom.xml b/pom.xml index 4975241..7c751b8 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.scalecube - scalecube-parent-pom + scalecube-parent 0.2.20-SNAPSHOT pom ScaleCube parent project @@ -22,8 +22,8 @@ https://scalecube.io - scm:git:https://github.com/scalecube/scalecube-parent.git - scm:git:https://github.com/scalecube/scalecube-parent.git + scm:git:https://github.com/scalecube/${project.artifactId}.git + scm:git:https://github.com/scalecube/${project.artifactId}.git HEAD @@ -43,7 +43,6 @@ - UTF-8 3.7.0 3.0.1 @@ -61,14 +60,7 @@ google_checks.xml 8.14 - - scalecube/${project.artifactId} - 1.4.13 - 1.4.6 - true - false - - ${env.GITHUB_REPOSITORY} + UTF-8 @@ -96,39 +88,6 @@ false - - maven-jar-plugin - ${maven-jar-plugin.version} - - - - true - lib/ - ${mainClass} - - - - META-INF/*.SF - - - - - maven-dependency-plugin - ${maven-dependency-plugin.version} - - - package - - copy-dependencies - - - false - ${project.build.directory}/lib - true - - - - org.codehaus.mojo xml-maven-plugin @@ -289,87 +248,6 @@ - - - com.spotify - dockerfile-maven-plugin - ${dockerfile.maven.version} - - - default - - build - - install - - - ${project.build.finalName} - ${project.artifactId} - ${project.version} - - latest - - - - extra-tag - - tag - - install - - ${docker.image.extra-tag} - - - - push-extra-tags - - push - - deploy - - ${docker.image.extra-tag} - - - - tag-version - - tag - - install - - ${docker.image.tag} - - - - deployment - - push - - deploy - - latest - - - - tag-deployment - - push - - deploy - - ${docker.image.tag} - - - - - docker.pkg.github.com/${github.repository}/${project.artifactId} - - ${env.GITHUB_ACTOR} - ${env.GITHUB_TOKEN} - false - true - - @@ -394,36 +272,13 @@ - - SkipDockerGoals - - true - - - true - - - - RunDockerGoals - - - unix - - - /usr/bin/docker - - - - false - - deploy2Github github GitHub Packages - https://maven.pkg.github.com/scalecube/scalecube-parent + https://maven.pkg.github.com/scalecube/${project.artifactId} From 0ecece37903024cf9269e518a77b104adf046c45 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sat, 1 Oct 2022 12:49:54 +0300 Subject: [PATCH 126/130] Cleanup --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7c751b8..a277476 100644 --- a/pom.xml +++ b/pom.xml @@ -56,11 +56,13 @@ 2.7 1.6 1.6.8 + 8.14 + false google_checks.xml - 8.14 UTF-8 + UTF-8 From 90e77bdc8040fcddb071ec00f00227c80e5beeb6 Mon Sep 17 00:00:00 2001 From: Artem Vysochyn Date: Sat, 1 Oct 2022 13:02:19 +0300 Subject: [PATCH 127/130] Added property distributionManagement.url --- pom.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index a277476..cf31adc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 io.scalecube @@ -63,6 +65,9 @@ google_checks.xml UTF-8 UTF-8 + + https://maven.pkg.github.com/scalecube/${project.artifactId} + @@ -183,7 +188,7 @@ The reactor is not valid true - + @@ -280,7 +285,7 @@ github GitHub Packages - https://maven.pkg.github.com/scalecube/${project.artifactId} + ${distributionManagement.url} From 6ffd53dc04de7b5aec263226a0661653428da071 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 1 Oct 2022 10:24:27 +0000 Subject: [PATCH 128/130] [maven-release-plugin] prepare release release-0.2.20 --- pom.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index cf31adc..2edfc39 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 io.scalecube scalecube-parent - 0.2.20-SNAPSHOT + 0.2.20 pom ScaleCube parent project @@ -27,7 +25,7 @@ scm:git:https://github.com/scalecube/${project.artifactId}.git scm:git:https://github.com/scalecube/${project.artifactId}.git - HEAD + release-0.2.20 @@ -188,7 +186,7 @@ The reactor is not valid true - + From 4d065b74a5173504431b47845762f6e460605d23 Mon Sep 17 00:00:00 2001 From: artem-v Date: Sat, 1 Oct 2022 10:24:29 +0000 Subject: [PATCH 129/130] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2edfc39..439316d 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.scalecube scalecube-parent - 0.2.20 + 0.2.21-SNAPSHOT pom ScaleCube parent project @@ -25,7 +25,7 @@ scm:git:https://github.com/scalecube/${project.artifactId}.git scm:git:https://github.com/scalecube/${project.artifactId}.git - release-0.2.20 + HEAD From bd9245976fa735c43d7229f09190ad92ee53501e Mon Sep 17 00:00:00 2001 From: alexlikho Date: Fri, 12 Apr 2024 08:47:27 +0300 Subject: [PATCH 130/130] Upgrade to using Environment Files instead old set-output --- .github/workflows/release-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml index f4c7b08..a4f9266 100644 --- a/.github/workflows/release-ci.yml +++ b/.github/workflows/release-ci.yml @@ -42,7 +42,7 @@ jobs: mvn -B build-helper:parse-version release:prepare \ -DreleaseVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion} \ -Darguments="-DskipTests=true -Ddockerfile.skip=true" - echo ::set-output name=release_tag::$(git describe --tags --abbrev=0) + echo release_tag=$(git describe --tags --abbrev=0) >> $GITHUB_OUTPUT - name: Perform release run: mvn -B release:perform -Pdeploy2Github -Darguments="-DskipTests=true -Ddockerfile.skip=true -Pdeploy2Github" env: