From e4e40837e7a1ac02f4df21226e353561208b6ec6 Mon Sep 17 00:00:00 2001 From: Miguel Pontes Date: Tue, 14 Feb 2023 13:53:40 +0000 Subject: [PATCH 1/4] chore: move to Github Actions --- .travis.settings.xml | 21 ------------- .travis.yml | 69 ----------------------------------------- bin/tag.sh | 27 ---------------- cd/deploy.sh | 12 ++++--- cd/tag.sh | 27 ++++++++++++++++ {bin => cd}/version.sh | 21 +++---------- gpg.asc.enc | Bin 6816 -> 0 bytes pom.xml | 6 ++-- 8 files changed, 43 insertions(+), 140 deletions(-) delete mode 100644 .travis.settings.xml delete mode 100644 .travis.yml delete mode 100755 bin/tag.sh create mode 100755 cd/tag.sh rename {bin => cd}/version.sh (75%) delete mode 100644 gpg.asc.enc diff --git a/.travis.settings.xml b/.travis.settings.xml deleted file mode 100644 index 8f2ba47..0000000 --- a/.travis.settings.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - dice - - - dice-repo - s3://dge-artifacts/ - - - dice-external-repo - s3://dge-artifacts/ext - - - - - - - dice - - diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 867e698..0000000 --- a/.travis.yml +++ /dev/null @@ -1,69 +0,0 @@ -language: java -jdk: - - openjdk8 - -sudo: false - -services: - - docker - -branches: - only: - - master - - "/^feature.*$/" - - "/^issue.*$/" - - "/^hotfix.*$/" - -before_script: - - "./bin/version.sh" - -script: - - mvn clean install -q || travis_terminate 1 - -before_install: - - openssl aes-256-cbc -K $encrypted_044baa266d1a_key -iv $encrypted_044baa266d1a_iv - -in gpg.asc.enc -out gpg.asc -d - -env: - global: - # OSSRH_USERNAME - - secure: "HXSUM1NvgAxAlpPSFtNQaK0ZtR6NbKaws0A9ZR3VqhvELT4uf7Tf9z6Cdo2obRMTWLT4EiLgVjt/TkwAtMjFAb78pC5RWyZ7+5cP7PKI4edSQuQgr2ixrq0/9Pvtub2Xb28fk7S0xesEtTaHBtZMdIe37OL/B+pcLOkaG3DzdKfNxHVQlVZ3YaY/2vk1EhCmBlaG6WHk3kskkf7NPUZLPpWTqg9KYeoJgvBXw89redSJ7qdI8p8f8CMfaNTZfCLfo13CEzeMPwlKZGzl3pQUsHXnrCnsssJttq4MBJ/i14GnwPNnh/mX/3IMIIk6+0B2pBQW3pH0dhBEXst39Cqcce8TXqpobYBiU6tGJEHEptiT/ajIZHfzBi4U8JkNqQQ2MpZ14tZ6jjgvVp+BuYKBx+Wq08c5keqkUgRIGfIdeYMVhZ9fsKhMqbhWJZd97Zv68OXrrM++MZjZ2qF5NjKIxYh2dkRzAfz/mqqwigTqGEZRt68so9aoufvNskWd2MMD8gOZmjPxoJ3GEBWgwDIyyvuf+ImeOgOGFni2Fq3DpwZcSQ0zCe5Yv7gksR1g+/29UXTC2iOEUj28d294yugukWk2QxPOZcPbxxer2FeeBXSbXKsn2gpfVtTC1sgIc55R++KyMlL1fGPJTnggpmHtZ01/cmFWPKkp3QirifjT/Z4=" - # OSSRH_PASSWORD - - secure: "V30kibZa6vNAc+sUKdYQnS+gZUL0AO/6+9lWYbcWGzZXIDX1S3U/fb0U1VCCVyltWBHJ58PqdGUHCoZ+2bNkfg2oVWnJgt2I4+er2stgFTT+vW/XQRWu1zIJYOnefGVAYNWr8lSDJhK3a12zAyxcRg0p/NbD6UGSPuqrBDUZzyUGydUrWaD9D07W7SYP1C21TY8Ay+ZHb60XtQSA0+cuprjQU2+ThrlYUEf41HsyV9kgi0T9RRpnhZedvEJrQ6LhiOg7bMljLcw+38T9adZkaGz0x5pQD1O3wZrBpcNq4Hd+Q7O5Z5PBXwusx7dOJYOtEcO2kXMzi+/zCvTsSU38+AQDz+EgqB858aa+IT0oyXu89Yshtat1oHb8yjzc2kc7koQtVKFDIXNo/HnlA5Ik3GYt9JcwpavT7nrVGC6QltOESRS6OvTeU+pKBIkA7nrymB2mvl0dMscKGxkTYaqUy7vowcvGVKCQPdZ+kWZcj2Kck2CwqIiPEIPb1+/Pf5+7kiGI63SA7Xc/T5vF6MNrz4Vwh6d2e6i1Fb1NYQSBbCXmepWgH3xALGhqcI1Bqh07KvqBXlrPv7t6kuZeai1+J/vCMfjuToiRQXr5XUubf8OSZYx6lw0tc2dHWkBjvXUx7J0jqjBvL39xwkmdRZtJKMz04DKeZlKFGQWXYzrlNaE=" - # GPG_PASSPHRASE - - secure: "qO+6mxECq2e0al1g/fetNH0mkcHgn60xZfdy2Bj/MdJM1PBm6fVHqA6/fDsy4ADjJnV6QuBbPQ5jnffDpEd90ut1y53pMZ45bV4D6OrNeyfU5a6jQcnL+4rGtbqYZXpgbxWtFyFU50Uz6FOyINhFZWqpBJkQt+CnwwegULjSFzWQQuT9u4o9zsT7aysOsq+FPIEIozKVA09s4UIkwylkihaiVhUXVK70K4F/1xHB5CaUeFDtiA25jVlHs3JnAnSf1Um55g53z7qbe1KqVYgCXY35TANW/ASURF71Tk2qEf31EoIRX2J/ypsVjENrpkQrYdne9cPXpSXwsQf0bNVSaKxn6W/ihCUTXusHnGEfhUFow9xpzwnSuTqhcxF8gKhcZYSws8Fw5nKzTrf4i+CbLcKc/2h4kliO6RmzD9IaaLfFroOYUSzvBXfeXzicyDwpnVMBmJOkRCEBdt+dJzy94+NLksdY09oKVAKPxgNgqwpe7MTVLbANByvrNaXQC1vC6Hfrr2KdGolrySRj3KTaYVv9VSPwHPvLZ6ujpnJPGLayXmqLL5we89+mAew9ZLwcrd2baEc6Ic+xpfbKNa/ehQN7tiBWX9Ks7tvEPUqHtNIFPS6RGv2rtMJcpwL4SFKFqvIsDhEX/lmruePmL6k/G3C+XYXZu622Zy20/M5KETM=" - # CODECOV_TOKEN - - secure: "Umm0tKXosZmdhLJm4HHTbl/WkmyuS6oFIi0CvopXrL9iQw+zNCgD2P7X6woCmsTMFXEEQKClPqK++JqCQ8hAmXVQZb6K3k41qDeDNWhYIecE/o0conLBQ4v+1vJehPJquzHkZ/EFXs7YJVTGX9MAm3irGcDswRGHHPtxFlf1uVP+DfrYN0t/t0absiX259Z6aM2OkGl8oldaIK5VKyxln6k/dGui++HHyZyLY6B2qeoD8w3PCIMJ6MtBSNAt2NrzhVsj9o4iPWw6Xqvg2O4GLB9UBTBmGzFZBZKfNireqsF5wBjvOXmuiRtFNlRVboULXDkqhogJHamNpXjXv6AHO9vdtsvwDr9GRxUGfeti863gRjQ0RNhp5Y9QQ8okRO/HN84scOMMZF0x45yhiIxmJGbGLWUwuGR6zAmZWftGG6hoIcwVjVHPiV4eUYPgFJJeFRhRE/rPvC+S/vG2qwtjHjO4Rbt6larT/sH1hF8LbrxGhR7J1mIipPAyQaiclpScVpfl3Jx2Di7j5i9dnVsts0bz7fTrofqk/x/iC6RZkRSdkNNbrdmS9CSrNMwSLveK83HPFvS3wtvoULrPJLDq+LPlZj+di8TyXQwj1nrwMSEUExWA5ckSANzJSjefxeKXgocpQ4coi81Icujl/t1pVDLQR5GmlZEgWyHifl7xhS0=" - # TRAVIS_DICEOSS_GITHUB_TOKEN - - secure: "FT3soD2MLIwrdfmOkJ6HjSKqVs8vp2a6DmEOEsLOYS4yFLibQ9pCMl4BXOUR0lIr1WXQ8v95jmP2dOWhSepOWvZjwPRUtfL5LqSK7AxTgtfQPQrzfDUeBTGY8gWmxqc7RXIPQQghVficP/3iDRxEeqgEQv76XDI9MWcmvVAxH7bDfaD9QfvWbuZGucutZgSfpWDA9KqBOBzqr4ZIkmtRfWFZf1aKnds4wnSe/9XyimSCYdS/m3Ewvprk7utVfkKopRNI9/hScZi7qbp9ZTjKPk1hgGWhd2j4fXPUu5H/LtLSipLALeo1N+UFGfXLxM220KlaL3U4DLD98s5fYocLm9/Y/poCrA6L2lE1jHaK1YVFxqbF558SJx9jCJjhoXkerZwxQMCPIKvRwH/8cW4pq2h69de7c7yxsw0k5B/l+4/vWz8RBlFXbGf0eHjWx7Jynp5Yd2i4MEsg4M+ku09Rznus9q63RGBX2/bW10jHAipdCZZ+wIByJTiWzBTRTEyRn0Q91nt1ZR01wFk2piTQ+csqoc+0CB5yOWvdxKAA2KPzGPQtnt9RqtKGfm1He3hze2eqWr51Zya71gJHHrSAONluPPLbOe6Gl1bFor1pAMSlP5u6VOvp6uEeBJDxoNlCxs+VWgmzqJP0AvGPY/zXd8xu8KGaZDDk8vRgobyYMt8=" - -cache: - directories: - - "~/.m2/repository" - -after_success: - - bash <(curl -s https://codecov.io/bash) -t $CODECOV_TOKEN - -deploy: - - provider: script - script: "./bin/version.sh" - skip_cleanup: true - on: - branch: master - - provider: script - script: "./bin/tag.sh" - skip_cleanup: true - on: - branch: master - - provider: script - script: "./cd/deploy.sh" - skip_cleanup: true - on: - branch: master - -notifications: - slack: - on_success: never - on_failure: always - rooms: - - dicetechnology: "$encrypted_SLACK_ROOM_API_KEY" diff --git a/bin/tag.sh b/bin/tag.sh deleted file mode 100755 index 954594e..0000000 --- a/bin/tag.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# Script to tag the GIT repository with a specific version taken from the POM file - -#set -x - -function slack { - local PAYLOAD="payload={\"channel\": \"dice-opensource\", \"text\":\" $1 \", \"username\": \"Travis\", \"icon_url\": \"https://fst.slack-edge.com/66f9/img/services/travis_36.png\"}" - echo Sending message to slack - curl -o /dev/null -s -w "%{http_code}\n" -X POST --data-urlencode "$PAYLOAD" $encrypted_SLACK_URL -} - -# Get VERSION from top level POM -VERSION_POM=$( mvn help:evaluate -Dexpression=project.version | grep -v '\[.*' | tail -n1 ) - -# Get ARTIFACT_ID from top level POM -ARTIFACT_ID_POM=$( mvn help:evaluate -Dexpression=project.artifactId | grep -v '\[.*' | tail -n1 ) - -# Setup Git Configuration -git config --global user.email "build@travis-ci.com" -git config --global user.name "Travis CI" -GITHUB_REPO_URL_TOKEN="https://${TRAVIS_DICEOSS_GITHUB_TOKEN}:x-oauth-basic@github.com/${TRAVIS_REPO_SLUG}.git" - -git remote set-url origin "${GITHUB_REPO_URL_TOKEN}" && \ -git tag "${VERSION_POM}" -m "[Travis] Released ${VERSION_POM}" 2>/dev/null && \ -git push origin --tags 2>/dev/null && \ -echo "Tagged $ARTIFACT_ID_POM with version $VERSION_POM" && \ -slack "Tagged $ARTIFACT_ID_POM with version $VERSION_POM" diff --git a/cd/deploy.sh b/cd/deploy.sh index 2d31cb2..4845856 100755 --- a/cd/deploy.sh +++ b/cd/deploy.sh @@ -1,5 +1,9 @@ #!/usr/bin/env bash -if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then - gpg --batch --fast-import gpg.asc - mvn deploy -P publish --settings cd/mvnsettings.xml -fi + +set +x +echo $GPG_KEY | base64 --decode | gpg --batch --fast-import +set -x + +./cd/version.sh && \ +./cd/tag.sh && \ +mvn deploy -P publish -DskipTests=true --settings cd/mvnsettings.xml diff --git a/cd/tag.sh b/cd/tag.sh new file mode 100755 index 0000000..daa65de --- /dev/null +++ b/cd/tag.sh @@ -0,0 +1,27 @@ +#!/bin/bash +# Script to tag the GIT repository with a specific version taken from the POM file + +set -x + +function slack { + local PAYLOAD="{\"text\":\"$1\"}" + echo Sending message to slack + set +x + curl -o /dev/null -s -w "%{http_code}\n" -X POST -H 'Content-type: application/json' --data "$PAYLOAD" $SLACK_URL + set -x +} + +# Get VERSION from top level POM +VERSION_POM=$( mvn help:evaluate -Dexpression=project.version | grep -v '\[.*' | tail -n1 ) + +# Get ARTIFACT_ID from top level POM +ARTIFACT_ID_POM=$( mvn help:evaluate -Dexpression=project.artifactId | grep -v '\[.*' | tail -n1 ) + +# Setup Git Configuration +git config --global user.email "build@dice.technology" +git config --global user.name "DiceTech CI" + +git tag "${VERSION_POM}" -m "[GH] Released ${VERSION_POM}" 2>/dev/null && \ +git push origin --tags 2>/dev/null && \ +echo "Tagged $ARTIFACT_ID_POM with version $VERSION_POM" && \ +slack "Tagged $ARTIFACT_ID_POM with version $VERSION_POM" diff --git a/bin/version.sh b/cd/version.sh similarity index 75% rename from bin/version.sh rename to cd/version.sh index 5ad4db1..f45ff13 100755 --- a/bin/version.sh +++ b/cd/version.sh @@ -27,28 +27,17 @@ function getPatchFromGitHash { echo "$PATCH" } -# Extract branch from Travis CI -if [[ "$TRAVIS_PULL_REQUEST" = "false" ]] -then - BRANCH=$TRAVIS_BRANCH -else - BRANCH=$TRAVIS_PULL_REQUEST_BRANCH -fi - # Get MAJOR and MINOR from top level POM VERSION_POM=$( mvn help:evaluate -Dexpression=project.version | grep -v '\[.*' | tail -n1 ) VERSION_POM_BITS=(${VERSION_POM//./ }) MAJOR=${VERSION_POM_BITS[0]} MINOR=${VERSION_POM_BITS[1]} +PATCH=$(getPatchFromGitTag) +VERSION="${MAJOR}.${MINOR}.${PATCH}" -# Get PATCH depending on branch -if [[ "$BRANCH" = "master" ]] -then - PATCH=$(getPatchFromGitTag) -else - PATCH=$(getPatchFromGitHash) -fi +echo "Setting version to ${VERSION}" +echo "NEW_VERSION=${VERSION}" >> $GITHUB_ENV # Set the new version in POM -mvn versions:set -DgenerateBackupPoms=false -DnewVersion="${MAJOR}.${MINOR}.${PATCH}" +mvn versions:set -DgenerateBackupPoms=false -DnewVersion=${VERSION} diff --git a/gpg.asc.enc b/gpg.asc.enc deleted file mode 100644 index bc905dbe8f50f06b0f2810c47a50d7c5aac32e50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6816 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 maven-scm-plugin - 1.10.0 + 2.0.0-M3 ${project.version} @@ -285,7 +285,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.6.0 + 3.8.1 1.8 1.8 @@ -302,7 +302,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts From d0e35f21e0142327e062b41b79af97ea18875138 Mon Sep 17 00:00:00 2001 From: Miguel Pontes Date: Tue, 14 Feb 2023 13:55:58 +0000 Subject: [PATCH 2/4] chore: move to Github Actions --- .github/workflows/main.yml | 43 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..32cf25e --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,43 @@ +name: Java CI + +on: + push: + branches: + - master + pull_request: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout Git repo (with tags) + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Cache Maven packages + uses: actions/cache@v3 + with: + key: ${{ runner.os }}-1 + path: | + ~/.m2/repository + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + - name: Build with Maven + run: mvn --batch-mode --update-snapshots install + - name: Run Codecov + uses: codecov/codecov-action@v3 + with: + token: ${{ secrets.CODECOV_TOKEN }} + - name: Set version, sign artifacts and deploy to Maven Central + if: ${{ github.ref == 'refs/heads/master' && github.repository == 'DiceTechnology/dice-where' }} + run: cd/deploy.sh + env: + GPG_KEY: ${{ secrets.GPG_KEY }} + GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + SLACK_URL: ${{ secrets.SLACK_URL }} From 1ac5cbb0a51ca8f2c73418890660e0d4d9cb840a Mon Sep 17 00:00:00 2001 From: Miguel Pontes Date: Tue, 14 Feb 2023 14:43:33 +0000 Subject: [PATCH 3/4] chore: move to Github Actions --- .github/workflows/main.yml | 2 +- pom.xml | 27 +++++++++------------------ 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 32cf25e..7e6d06c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: with: token: ${{ secrets.CODECOV_TOKEN }} - name: Set version, sign artifacts and deploy to Maven Central - if: ${{ github.ref == 'refs/heads/master' && github.repository == 'DiceTechnology/dice-where' }} + if: ${{ github.ref == 'refs/heads/master' && github.repository == 'DiceTechnology/dice-fairlink' }} run: cd/deploy.sh env: GPG_KEY: ${{ secrets.GPG_KEY }} diff --git a/pom.xml b/pom.xml index aab4455..61f9a16 100644 --- a/pom.xml +++ b/pom.xml @@ -71,13 +71,13 @@ software.amazon.awssdk rds - 2.7.23 + 2.20.3 provided software.amazon.awssdk resourcegroupstaggingapi - 2.7.23 + 2.20.3 provided @@ -91,21 +91,18 @@ assertj-core 3.9.1 test - jar org.powermock powermock-module-junit4 1.7.3 test - jar org.powermock powermock-api-mockito2 1.7.3 test - jar org.easymock @@ -126,21 +123,21 @@ test - org.jacoco - jacoco-maven-plugin - 0.8.4 + org.testcontainers + testcontainers + 1.17.6 test org.testcontainers - testcontainers - 1.7.3 + mysql + 1.17.6 test org.testcontainers - mysql - 1.7.3 + postgresql + 1.17.6 test @@ -149,12 +146,6 @@ 8.0.17 test - - org.testcontainers - postgresql - 1.7.3 - test - org.postgresql postgresql From fa0613b72db88f1f52a6df74319fa19699ff0afb Mon Sep 17 00:00:00 2001 From: Miguel Pontes Date: Tue, 14 Feb 2023 16:51:39 +0000 Subject: [PATCH 4/4] chore: bump Wiremock version --- pom.xml | 4 ++-- src/test/resources/logback.xml | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 61f9a16..e63d5a7 100644 --- a/pom.xml +++ b/pom.xml @@ -172,8 +172,8 @@ com.github.tomakehurst - wiremock-jre8 - 2.24.1 + wiremock + 2.27.2 test diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml index fd0e057..ba30b95 100644 --- a/src/test/resources/logback.xml +++ b/src/test/resources/logback.xml @@ -1,20 +1,20 @@ - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - + + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n + + + - - - + + + - - - + + + \ No newline at end of file