From bff650b77ee2c5b6225c5c31d0a8aa7da0960e11 Mon Sep 17 00:00:00 2001 From: Clayton Date: Sat, 26 Feb 2022 20:44:01 -0500 Subject: [PATCH] migrated to codezero.bluflametech.com * upgraded maven for cleaner logs and bc it's 2022 * moved build/test/deploy config to .codezero.yml * updated the build status in the README.md --- .codezero.yml | 68 +++++++++++++++++ .github/workflows/build.yml | 72 ------------------ .github/workflows/pr_puild.yml | 31 -------- .maven.key.enc | Bin 0 -> 2846 bytes README.md | 2 +- .../.mvn/wrapper/MavenWrapperDownloader.java | 2 +- tf-build-tools/.mvn/wrapper/maven-wrapper.jar | Bin 50710 -> 50710 bytes .../.mvn/wrapper/maven-wrapper.properties | 4 +- 8 files changed, 72 insertions(+), 107 deletions(-) create mode 100644 .codezero.yml delete mode 100644 .github/workflows/build.yml delete mode 100644 .github/workflows/pr_puild.yml create mode 100644 .maven.key.enc diff --git a/.codezero.yml b/.codezero.yml new file mode 100644 index 00000000..804c85a2 --- /dev/null +++ b/.codezero.yml @@ -0,0 +1,68 @@ +lang: + java: 8 + terraform: 0.12.31 +secrets: + - ~COVERALLS_REPO_TOKEN=lO7/P7etVaHwLNMnttcBtsTDDC64RrTbNGRbnvfA/3bG7vX4oKDE/TIi5TqSAR+S7jYRvr9VhXBE9JS83pExPvKqXNBR/qL4G2hXuMxhGtyj5rR6+3jdfxUjLUeiOY2YlBxv1BFVTQcjLWIvFWwv50K75Gc9Zel7jMjumyg7v3kuQwrijImFEDmrkKFAROei8MomZQYWkkzKR3y0byJqMvR6IXdMEpC7QgxfcrrtzE3IPNkNB5BNSMkpWRKmWxICg9B5E/KUVmN+wcGkO0aJS7j5657VXZo23hX8EUP63pEVN6YPZc3o6q/FLOptzifrStnh68ZHGaidRB7AoL+CPw== + - PASSPHRASE=iT4v78YgDU46UPkTvN7LBR6UVfIUdzliuffIWpCRVbomQzuYth84g55ZIFVIXxUoKoqVBMZB1Ejs3Vrx7Cnisd0Wu3oqtjl+pdV3YVyAwNeMnElBI7Wpb0tXb3G+IFEGr6vKISXZCdZ8EIkX1+Ycr67hU/q36zM7ewo0//KTW+PMbLoPVX0QaxsRgBkt1DQkfPASR7Iit1pSsgtBgWdTGGH4Ml0cyh19qFfOEngFdy19pCSdihVT5YAZZbNNdrdCiqXJbMH4XJ1K2Zy/ajET31+566ZIjRv8bv491tOZDiOzm+EFK/7Dgc1e2psWj3GHlmeAULNaEqgq0q9iZbY/Pg== + - SONATYPE_USER=K9rX2ukpx5raA5rzTWrAdHgNZeSEUA+K9dy8Pvx7e8gPbpytpIMiD1e3DkAxqb5hIcRZq0trT6F4q0EKuoM3pw92QpiQ6/H+oKMtdVWQsb5WERtGTS2CqmJ0diaDH8CDHlp2SQQgGeDh9B2w2acucYyFIT3V9hRzlDMsthTe9r+eeEXv0s06NgvR6Ddj2dPa0WCXcF92HZFkEwAmCCx46xp/X/vyRVZqfT9SyojQWFDlEBsv0kn1cgEKREVF8jxPxtzU7vIpN/AbwtdyBPvWavqP4STtLVI1vLrtpiN+t2yJDqOU7dL2EiV5qDUpEqqcTtg/1f9GO760n8+uBnVzWg== + - SONATYPE_PW=DQ/26gG/xzayZQWwh6lG7rTD/fubBtnCfIwvEmPb94sB6/7K7s6UfjyoflwJfmd2MCtX52ifItQYYb73yVKbJrwlvtc8GHWBcIjlg1g7fC5s9MdTUrNzeYzKFd+tC7rJBCy/totIJfAD5KY0A2CnLCDRAk324hloXTuZWaAlpbsiCEYUBeaaw0991lH4gwxfehpj4u8zTfwiAazQyzKq6QW8mEYihxLkG8U8bLoz3k9qSWiR5nrneu+OJEOjDgPBq2lMnaKRhSsFhNWMki7YOXIhmvsnCQ0Nr491r7xLcXX7v7XhTsanZkU67tTy05+pszqqTP9etKFnAibT+fDdCg== + - MAVEN_KEY_PW=QBSraoqlaUcckk2UNLIgl7GZVSBzVC8jpNr8kPRdQANmMNxYYnjAMDFOSfv7aK7l1UWqrI0V3p9Qu2/QvK3AvdeLIycDhkW/qvhmeiI1Aduvb8P9djxMl2erFC/osRkw/HIic5tCNgK8TNjGBjmevjApmksWGKr8Y10CkTjXKdoOL0RcrY20f8HGTJoX7c9iM/7QBC5DBhAyvXlWPum6x1K9oDUvDQyh2f6uowB4JDXfcJsutox/nCTFSa3ZGJlYy1Qlm/HNRupJ/p471OVmJElvmkLm13YNXAtPEnSC70XMV9BNylXjJtruZnYHYobcWSqW/lETvMhi+AyM62H6wA== + - MAVEN_KEY_ID=ls4Axr5lja/knrKIC5sAlbE3Ash5/W5Egrb3RTL3omrbzuNOlb+9kr93e12OwK8NSYYEjejdrhsXnqFXXbKmv+v3zYKJQxQ4aM0Suq6lHPK7cjeIp/Dp37iON5UzMakep6rsm+Mc9WUtcKrsgE9Anml2IQxCRTKt4GHF4gOz9PHKIlOQfLz0i894+fLUeasV1XZiN6F3bQP/FnWSqTm+7+HAEEvbI1c6ttYXNiMTSJh4YnLoPn5hT0Dvo0MwDR+/LKVaLFbhkr7Bvm8xB86rlFD/qY5XNRzAlDxaLY/0AVtHDQhnIckswi5QOxTaXvT35Sehvtxtp2YI8gTLFWMYew== +events: + git_branch: develop,master + git_pr: develop,master +ops: + setup: + - maven: + path: '' + script: | + export GPG_TTY=$(tty) + gpg --quiet --batch --yes --decrypt --passphrase="$SECRET_PASSPHRASE" --output codesigning.asc .maven.key.enc + gpg --batch --import codesigning.asc + shred --remove codesigning.asc + test: + - tf-build-tools: + script: | + ls ~/.m2 || mkdir ~/.m2 + cp ../.mvn.settings.xml ~/.m2/settings.xml + ./mvnw clean test coveralls:report -DrepoToken="$SECRET_COVERALLS_REPO_TOKEN" -Dbranch="$CODEZERO_BRANCH" -DpullRequest="$CODEZERO_PR" -B -no-transfer-progress + deploy: + - tf-build-tools: + env: + - OSSRH_USERNAME={{SECRET_SONATYPE_USER}} + - OSSRH_PASSWORD={{SECRET_SONATYPE_PW}} + - GPG_KEY_PW={{SECRET_MAVEN_KEY_PW}} + - GPG_KEY_ID={{SECRET_MAVEN_KEY_ID}} + script: | + VERSION=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -no-transfer-progress -DforceStdout) + PROFILE="SNAPSHOT" + if ! echo $VERSION | grep -q SNAPSHOT ; then + PROFILE="release" + echo "***** BRANCH_NAME is ${CODEZERO_BRANCH} *****" + if [ "${CODEZERO_BRANCH}" == "develop" ] ; then + # Always push a SNAPSHOT release on a merge into the 'develop' branch + ./mvnw versions:set -DnewVersion="${VERSION}-SNAPSHOT" -B -no-transfer-progress + ./mvnw deploy -DskipTests=true -B -P snapshot -no-transfer-progress + + #Stage a build release to Maven Central if merged to develop + VERSION="${VERSION}-${CODEZERO_JOB_NUM}" + echo "***** VERSION has been updated to $VERSION ******" + ./mvnw versions:set -DnewVersion="${VERSION}" -B -no-transfer-progress + fi + fi + # Stage for Maven Central Deployment if a release or SonaType SNAPSHOT repo if a SNAPSHOT + export GPG_TTY=$(tty) + ./mvnw deploy -DskipTests=true -B -P ${PROFILE} -no-transfer-progress +stages: + - Validate: + events: + git_pr: any + ops: + - test + - Deploy: + events: + git_branch: any + ops: + - setup + - test + - deploy diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index abba8a25..00000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,72 +0,0 @@ -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - -name: build - -on: - push: - branches: [ develop, master ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Set up Maven - env: - GPG_KEY: ${{ secrets.MAVEN_KEY }} - run: | - export GPG_TTY=$(tty) - cp .mvn.settings.xml $HOME/.m2/settings.xml - echo "$GPG_KEY" >> codesigning.asc - gpg --batch --import codesigning.asc - shred --remove codesigning.asc - - name: Set up Terraform - run: | - curl -g https://releases.hashicorp.com/terraform/0.12.24/terraform_0.12.24_linux_amd64.zip -o /tmp/terraform.zip - sudo unzip /tmp/terraform.zip -d /usr/bin - - name: Build with Maven - env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - run: | - cd tf-build-tools - ./mvnw clean test coveralls:report -DrepoToken="$COVERALLS_REPO_TOKEN" -Dbranch="$BRANCH_NAME" -B - cd .. - - name: Deploy - id: deploy - env: - OSSRH_USERNAME: ${{ secrets.SONATYPE_USER }} - OSSRH_PASSWORD: ${{ secrets.SONATYPE_PW }} - GPG_KEY_PW: ${{ secrets.MAVEN_KEY_PW }} - GPG_KEY_ID: ${{ secrets.MAVEN_KEY_ID }} - run: | - cd tf-build-tools - - VERSION=$(./mvnw org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout) - PROFILE="SNAPSHOT" - - if ! echo $VERSION | grep -q SNAPSHOT ; then - PROFILE="release" - - echo "***** BRANCH_NAME is ${GITHUB_REF} *****" - - if [ "${GITHUB_REF}" == "refs/heads/develop" ] ; then - # Always push a SNAPSHOT release on a merge into the 'develop' branch - ./mvnw versions:set -DnewVersion="${VERSION}-SNAPSHOT" -B - ./mvnw deploy -DskipTests=true -B -P snapshot - - VERSION="${VERSION}-${GITHUB_RUN_NUMBER}" - echo "***** VERSION has been updated to $VERSION ******" - ./mvnw versions:set -DnewVersion="${VERSION}" -B - fi - fi - - # Stage for Maven Central Deployment if a release or SonaType SNAPSHOT repo if a SNAPSHOT - export GPG_TTY=$(tty) - ./mvnw deploy -DskipTests=true -B -P ${PROFILE} diff --git a/.github/workflows/pr_puild.yml b/.github/workflows/pr_puild.yml deleted file mode 100644 index dad9a763..00000000 --- a/.github/workflows/pr_puild.yml +++ /dev/null @@ -1,31 +0,0 @@ -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - -name: pr build - -on: - pull_request: - branches: [ develop, master ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Set up Terraform - run: | - curl -g https://releases.hashicorp.com/terraform/0.12.24/terraform_0.12.24_linux_amd64.zip -o /tmp/terraform.zip - sudo unzip /tmp/terraform.zip -d /usr/bin - - name: Build with Maven - env: - COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} - run: | - pull_number=$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH") - cp .mvn.settings.xml $HOME/.m2/settings.xml - cd tf-build-tools && ./mvnw clean test coveralls:report -DrepoToken="$COVERALLS_REPO_TOKEN" -Dbranch="$BRANCH_NAME" -DpullRequest="$pull_number" -B diff --git a/.maven.key.enc b/.maven.key.enc new file mode 100644 index 0000000000000000000000000000000000000000..8dfd7867bf1d014ebd7d24d4953339ebcc9572af GIT binary patch literal 2846 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 literal 0 HcmV?d00001 diff --git a/README.md b/README.md index fe235025..16ebca01 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ ![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg) -[![Build Status](https://github.com/deliveredtechnologies/terraform-maven/workflows/build/badge.svg)](https://github.com/deliveredtechnologies/terraform-maven/actions?query=workflow%3A%22build%22) +[![Build Status](https://codezero.bluflametech.com/badge/project-24-develop.svg)](https://codezero.bluflametech.com/projects/24) [![Coverage Status](https://coveralls.io/repos/github/deliveredtechnologies/terraform-maven/badge.svg?branch=develop)](https://coveralls.io/github/deliveredtechnologies/terraform-maven?branch=develop) [![Maven Central][maven-badge]][tf-maven-plugin] diff --git a/tf-build-tools/.mvn/wrapper/MavenWrapperDownloader.java b/tf-build-tools/.mvn/wrapper/MavenWrapperDownloader.java index c32394f1..b901097f 100644 --- a/tf-build-tools/.mvn/wrapper/MavenWrapperDownloader.java +++ b/tf-build-tools/.mvn/wrapper/MavenWrapperDownloader.java @@ -20,7 +20,7 @@ public class MavenWrapperDownloader { - private static final String WRAPPER_VERSION = "0.5.5"; + private static final String WRAPPER_VERSION = "0.5.6"; /** * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided. */ diff --git a/tf-build-tools/.mvn/wrapper/maven-wrapper.jar b/tf-build-tools/.mvn/wrapper/maven-wrapper.jar index 0d5e649888a4843c1520054d9672f80c62ebbb48..2cc7d4a55c0cd0092912bf49ae38b3a9e3fd0054 100644 GIT binary patch delta 3148 zcmV-S472l=j02X81CVcj!Y~j;_kr9Y7f7fTMY^-DDhPtbt%PKXL)#=wW5wIsR#d1f zcf zy__;pIHO)tEBCe@*KSmDNtfx|J72@u6HrSB2uq>eF|!*1M*#ujlVbuf3QV*>1v&r# z0674YApsn-xdP=I0ade~9+M3U<)K>#+z$W%h#!+tNgT6SER_O(CC#v9TgqtCG)aeS zE5z}v?bvnF)?DPXtyH>GPN$3x3Z+0gv=u)G)3zY(Y%Z{rj)nH83$Adk`j%yK1U}anQK zEa2_TQ}`E$ zm@wiRMV9gicMrgyv`um4^ z`r6#^PM_-w_x2p_>vZD+fkoVrjQZPqy4_eMuyAK!cVMT0TYl&b4IFf1jlktIoa!u^ zorQg-Xsg-YYCaa#12;qyWVb&Oi|SG9a)FBahCzYKR%29i!AILmecFRCK5Bz9yp|O~){Y^nL z0s^j+GH^X(B`h7ZlxMjf+Z1fa4uPuuS*vTysWa%t#dJk55Z@sW?N)FJ_VAE|s6Hyt zJTDuv{<7unRj?2H>2J$$J_=k=Uq;7jFsKR^qKf!`>Wu1IcPf5NGY8aTF-_v!h^Vna z)r`uuz3D*(TBK3ysIWB=O$s!2&O6nZCY5nM1yJs z7Z0`WP|%4k(r0BIQccEg+Qz66JP?g(`y^$Lf?ixDuslnd#YR-4?ibb<)0a8kuV6qP zcbSHNVYNj~xi_d_NV<1PmgS&kCaISjO!V3T^?G{DXWQ<}8t?PqD6Vzk8iDn*daKhI zAJYjY&M)YGE2ni{8eCvn<^Qv&s~dNvz{@M$fQvJ7%P zgB$3`e74M~llmzSZpN)LGoLH4wM@Y%mu@aRkL7GuX}zj75lSYtIE}S& z{{jWK%cNUu(;a3_K4_QZ+wdYOIpM*Lc!_*_sqMnq&B*D$Z+4<0>9(>jV=0`KyoKqR zw78Ikrr%OcOX_?FS|mVTso+(3HIrC>vjf5iN6R69c4cw_nuDgC26j!WRPAJ|DI<|J zq!?-3NR)taS#n0YtSF!QEaIn%fk!aSAEdlz`=jH!YNbqyJv5Knuzx-{yPW8Mt3YU0 zJ=hZjOG`ql5s$0-sJxTdIi1v;aNdO$7v3%qn3Gq**Y| z=ws1w+s>VH0JSVPyP(~T_b7NT-X{xMEM}ZKtY5Da)jiJDC9tD@j_OdJtz`NE1s}v& z_Fs1476_LQ!knCKcB2LS_es<5SMUHn#1x1)?i6VIABNB5(=fB~aUsomPy`Ccy-vsk zTIUurpSTm4%Oj=k64>_tI@pDi8ee8TH^3_>>Euq)M}DRBGoz zsuq*C{iAq{7~UtUN($Oii+z_&$E%IE1dS2r=eUo8feg8>f4oBrBE~wax@fX~_OZ z_=yWYW^Xq)rGlU0XO7?G4AO6tzces^G#s=03jT;cG5Iaya9{h3W9dB14*nOv0L6)gil`DUiX(koCEhMAgSVq)G$;qS^VmkCg+~#KrlBvJ z3yH*SF2S*RO`#+D&*+wVI_FakQL$VgmlVf?E+J&rbuk!ieX?7u zCU&|FpDoar7s8OF^wEIq@_9#2h;@p%P^@R@Wrvo>Q3*Q^tzv_mik;C%p5EdXn`kOU zWH)`fJx%(O2`v&Gi)y33sO~!^$5fxGMYL$b;?uDx;1OFyy-RGJp7@G?#VMjePMixP zF(awD1;_MFtwxG`ieWYltgL+6bY3(w9|Y%j|J((uFhiJm<_u5QmUYAQUvUb{c5MOM zJPtU^iHjAnOa6(Xim}x6lbl|iqT%#;wWZ^7K=Q!`Hr^Egs!=Bgb-vZX#V3Ku_XYO; zqJp);^^$`1Qm&U3te10t?JZc>aD73+x|Zt|1?!bu*A=W+!^5|=SjU|UxpRfB9k6B! z>xaD?GPo#%hDijyJJZ;e#-$J7vit0VSMb-vC*UKKW?X6Sf^4?um<9P1d@l4)B9uQ? zWpA#xk0=fSTG3{EC5!{4dIsMs`Q@O^<|%6E;xm@Pq0Yt(y1V#))7PEB;k}i%npac7 zx=KgE431AGXsYV2^=i35uxefz-t01po4ACc*R%JKCGl>jUUPj1#1P_vbgGY}1*~lIxCmFZ~`g#ge z(u3ZICUGup%Q=epoA+O7JbfqXLA~{?5AUq1ROBR4A8Kc zh+f5<@ZmT%GiREaDccdJz6NPe@Vvp(308p<#D_^PNe0=nE%(!wYP5-<*k=2oS!`#< z2=b^~6C3EY1*BBygB^C%ZqG%{poY@R+r8DSX&wGYq1X|S?)NGgv2(bia7(`2kIU@f zpeQJ3_1WTda mF|$Rq7XbuJv_J*3V6{gB1m&Sy2a~I~r34XhbG@@vxxx%M3nM-N delta 3147 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 diff --git a/tf-build-tools/.mvn/wrapper/maven-wrapper.properties b/tf-build-tools/.mvn/wrapper/maven-wrapper.properties index 1ffe1859..642d572c 100644 --- a/tf-build-tools/.mvn/wrapper/maven-wrapper.properties +++ b/tf-build-tools/.mvn/wrapper/maven-wrapper.properties @@ -1,2 +1,2 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar