From 7571e7210aa065f9baa9a0adb18b126367898f30 Mon Sep 17 00:00:00 2001 From: gaborflorian <114913193+gaborflorian@users.noreply.github.com> Date: Thu, 9 Mar 2023 12:57:16 +0100 Subject: [PATCH] JNG-4521 Release udo runtime core jsl (#143) * JNG-4521 Add to pom.xml the missing plugins, profiles, update java version, eliminate warnings because set-output * logback file debug => warn * Remove Send message to skype * Logback warn to info --- .github/ISSUE_TEMPLATE/2-feature.md | 2 +- .github/workflows/build-dependabot.yml | 18 +++++----- .github/workflows/build.yml | 34 ++++++++++--------- .github/workflows/bump-version.yml | 16 ++++----- .../workflows/create-release-on-master.yml | 12 +++---- .github/workflows/create-release-tagged.yml | 19 ++++------- .github/workflows/jira-description-to-pr.yml | 2 +- .github/workflows/merge-pr-tagged.yml | 6 ++-- .github/workflows/release.yml | 20 +++++------ logback-test.xml | 2 +- pom.xml | 30 ++++++++++++++-- 11 files changed, 90 insertions(+), 71 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/2-feature.md b/.github/ISSUE_TEMPLATE/2-feature.md index 0398b6c7..0e33256f 100644 --- a/.github/ISSUE_TEMPLATE/2-feature.md +++ b/.github/ISSUE_TEMPLATE/2-feature.md @@ -7,7 +7,7 @@ labels: "type: feature" -- [ ] I'd be willing to implement this feature ([contributing guide](https://github.com/BlackBeltTechnology/judo-runtime-core-jsl/blob/develop/CONTRIBUTING.md)) +- [ ] I'd be willing to implement this feature ([contributing guide](https://github.com/BlackBeltTechnology/judo-runtime-core-jsl/blob/develop/CONTRIBUTING.adoc)) ## Description diff --git a/.github/workflows/build-dependabot.yml b/.github/workflows/build-dependabot.yml index 63608403..83f2ac6a 100644 --- a/.github/workflows/build-dependabot.yml +++ b/.github/workflows/build-dependabot.yml @@ -19,25 +19,25 @@ jobs: steps: - name: โฌ‡๏ธ Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 2 - name: ๐Ÿ› ๏ธ Project context id: context - uses: zero88/gh-project-context@v1.1 + uses: zero88/gh-project-context@v1.2 - - name: ๐Ÿ› ๏ธ Set up JDK 11 - uses: actions/setup-java@v2 + - name: ๐Ÿ› ๏ธ Set up JDK 17 + uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'zulu' - name: ๐Ÿงน Remove settings.xml run: rm $HOME/.m2/settings.xml || true - name: ๐Ÿ› ๏ธ Setup maven settings.xml - uses: whelk-io/maven-settings-xml-action@v20 + uses: whelk-io/maven-settings-xml-action@v21 with: servers: > [ @@ -84,7 +84,7 @@ jobs: echo "Version from POM: ${POM_VERSION}" echo "Base version from POM: ${BASE_VERSION}" echo "Building version: ${VERSION_NUMBER}" - echo "::set-output name=version::${VERSION_NUMBER}" + echo "version=${VERSION_NUMBER}" >> $GITHUB_OUTPUT ########################## # MAVEN BUILD START @@ -110,12 +110,12 @@ jobs: if [ "${{ job.status }}" == "canceled" ]; then message=":x: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" fi - echo "::set-output name=message::${message}" + echo "message=${message}" >> $GITHUB_OUTPUT - name: ๐Ÿ“ข Send message to discord uses: sarisia/actions-status-discord@v1 if: always() with: webhook: ${{ secrets.JUDONG_DISCORD_WEBHOOK }} - title: "Gitub action" + title: "Github action" description: "${{ steps.message.outputs.message }}" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9784c28d..bf7c9f6d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,18 +22,18 @@ jobs: steps: - name: โฌ‡๏ธ Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 2 - - - name: ๐Ÿ› ๏ธ Project context + + - name: ๐Ÿ›  Project context id: context - uses: zero88/gh-project-context@v1.1 + uses: zero88/gh-project-context@v1.2 - - name: ๐Ÿ› ๏ธ Set up JDK 11 - uses: actions/setup-java@v2 + - name: ๐Ÿ›  Set up JDK 17 + uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'zulu' - name: ๐Ÿ”ข Get the current PR number @@ -44,9 +44,9 @@ jobs: - name: ๐Ÿงน Remove settings.xml run: rm $HOME/.m2/settings.xml || true - + - name: ๐Ÿ› ๏ธ Setup maven settings.xml - uses: whelk-io/maven-settings-xml-action@v20 + uses: whelk-io/maven-settings-xml-action@v21 with: servers: > [ @@ -66,13 +66,14 @@ jobs: "password": "${{ secrets.SONATYPE_PASSWORD }}" } ] + mirrors: > [ { "id": "judong-nexus-mirror", "mirrorOf": "*", "url": "https://nexus.judo.technology/repository/maven-judong/" - } + } ] - name: ๐Ÿ”ข Calculate version number @@ -93,7 +94,7 @@ jobs: echo "Version from POM: ${POM_VERSION}" echo "Base version from POM: ${BASE_VERSION}" echo "Building version: ${VERSION_NUMBER}" - echo "::set-output name=version::${VERSION_NUMBER}" + echo "version=${VERSION_NUMBER}" >> $GITHUB_OUTPUT ########################## # MAVEN BUILD START @@ -122,7 +123,8 @@ jobs: -P"sign-artifacts,release-judong" \ deploy - - name: ๐ŸŽ Deploy with Maven to central + # Phase 2 - Build and deploy to maven central + - name: ๐ŸŽ Deploy with Maven (central) if: ${{ always() && startsWith(github.head_ref, 'release') && job.status == 'success' }} run: |- ./mvnw -B -Dstyle.color=always \ @@ -147,7 +149,7 @@ jobs: ########################## - name: ๐Ÿ“Œ Create version tag - uses: actions/github-script@v5 + uses: actions/github-script@v6 with: github-token: ${{ secrets.OSS_PAT }} script: | @@ -163,7 +165,7 @@ jobs: ${{ always() && (startsWith(github.head_ref, 'increment') || startsWith(github.head_ref, 'release')) && job.status == 'success' }} - uses: actions/github-script@v5 + uses: actions/github-script@v6 with: github-token: ${{ secrets.OSS_PAT }} script: | @@ -211,12 +213,12 @@ jobs: if [ "${{ job.status }}" == "canceled" ]; then message=":x: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" fi - echo "::set-output name=message::${message}" + echo "message=${message}" >> $GITHUB_OUTPUT - name: ๐Ÿ“ข Send message to discord uses: sarisia/actions-status-discord@v1 if: always() with: webhook: ${{ secrets.JUDONG_DISCORD_WEBHOOK }} - title: "Gitub action" + title: "Github action" description: "${{ steps.message.outputs.message }}" diff --git a/.github/workflows/bump-version.yml b/.github/workflows/bump-version.yml index e73a4289..a852130c 100644 --- a/.github/workflows/bump-version.yml +++ b/.github/workflows/bump-version.yml @@ -31,19 +31,19 @@ jobs: - name: ๐Ÿ› ๏ธ Project context id: context - uses: zero88/gh-project-context@v1.1 + uses: zero88/gh-project-context@v1.2 - - name: ๐Ÿ› ๏ธ Set up JDK 11 - uses: actions/setup-java@v2 + - name: ๐Ÿ› ๏ธ Set up JDK 17 + uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'zulu' - name: ๐Ÿงน Remove settings.xml run: rm $HOME/.m2/settings.xml || true - name: ๐Ÿ› ๏ธ Setup maven settings.xml - uses: whelk-io/maven-settings-xml-action@v20 + uses: whelk-io/maven-settings-xml-action@v21 with: servers: > [ @@ -75,8 +75,8 @@ jobs: VERSION_NUMBER=${BASE_VERSION} echo "Base version from POM: $BASE_VERSION" echo "Building version: ${VERSION_NUMBER}" - echo "::set-output name=version::${VERSION_NUMBER}" - echo "::set-output name=base-version::${BASE_VERSION}" + echo "version=${VERSION_NUMBER}" >> $GITHUB_OUTPUT + echo "base-version=${BASE_VERSION}" >> $GITHUB_OUTPUT - name: โญ๏ธ Increase version number id: next_version @@ -98,7 +98,7 @@ jobs: NEXT_VERSION="${NEXT_VERSION}-SNAPSHOT" fi echo "Next version is: $NEXT_VERSION" - echo "::set-output name=version::${NEXT_VERSION}" + echo "version=${NEXT_VERSION}" >> $GITHUB_OUTPUT - name: Set next version run: |- diff --git a/.github/workflows/create-release-on-master.yml b/.github/workflows/create-release-on-master.yml index 96b46e43..dade6329 100644 --- a/.github/workflows/create-release-on-master.yml +++ b/.github/workflows/create-release-on-master.yml @@ -18,17 +18,17 @@ jobs: with: fetch-depth: 0 - - name: ๐Ÿ› ๏ธ Set up JDK 11 - uses: actions/setup-java@v2 + - name: ๐Ÿ› ๏ธ Set up JDK 17 + uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'zulu' - name: ๐Ÿงน Remove settings.xml run: rm $HOME/.m2/settings.xml || true - name: ๐Ÿ› ๏ธ Setup maven settings.xml - uses: whelk-io/maven-settings-xml-action@v20 + uses: whelk-io/maven-settings-xml-action@v21 with: servers: > [ @@ -73,7 +73,7 @@ jobs: fi echo "Version from POM: ${POM_VERSION}" echo "Base version from POM: ${BASE_VERSION}" - echo "::set-output name=version::${BASE_VERSION}" + echo "version=${BASE_VERSION}" >> $GITHUB_OUTPUT - name: ๐Ÿ—๏ธ Build Changelog id: create_changelog @@ -98,5 +98,5 @@ jobs: if: ${{ always() && job.status == 'failure' }} with: webhook: ${{ secrets.JUDONG_DISCORD_WEBHOOK }} - title: "Gitub action" + title: "Github action" description: ":x: Could not trigger github release! https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" diff --git a/.github/workflows/create-release-tagged.yml b/.github/workflows/create-release-tagged.yml index 0eb4b9ca..0d5cc7fa 100644 --- a/.github/workflows/create-release-tagged.yml +++ b/.github/workflows/create-release-tagged.yml @@ -15,13 +15,13 @@ jobs: run: echo "$GITHUB_CONTEXT" - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 2 - name: Project context id: context - uses: zero88/gh-project-context@v1.1 + uses: zero88/gh-project-context@v1.2 - name: Print git references run: |- @@ -35,8 +35,8 @@ jobs: version=$(echo ${{ github.ref }} | cut -d/ -f4) branch=$(echo ${{ github.event.base_ref }} | cut -d/ -f3) echo "Version: $version" - echo "::set-output name=version::$version" - echo "::set-output name=branch::$branch" + echo "version=$version" >> $GITHUB_OUTPUT + echo "branch=$branch" >> $GITHUB_OUTPUT - name: Create release note uses: ncipollo/release-action@v1 @@ -76,19 +76,12 @@ jobs: message=":cross_mark: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" message="${message} Release notes canceled" fi - echo "::set-output name=message::${message}" + echo "message=${message}" >> $GITHUB_OUTPUT - name: Write message to file run: |- echo "${{ steps.message.outputs.message }}" echo "${{ steps.message.outputs.message }}" > build.msg - # - name: Send message to skype - # uses: Eloco/docker-action-send-skype@v2 - # if: always() - # with: - # skype_username: ${{ secrets.SKYPE_USERNAME }} - # skype_password: ${{ secrets.SKYPE_PASSWORD }} - # skype_ids: 19:0503749da2e44ed9910046678012bdf7@thread.skype - # send_msg_path: build.msg + diff --git a/.github/workflows/jira-description-to-pr.yml b/.github/workflows/jira-description-to-pr.yml index 5ceac0c9..b232817b 100644 --- a/.github/workflows/jira-description-to-pr.yml +++ b/.github/workflows/jira-description-to-pr.yml @@ -30,6 +30,6 @@ jobs: if: ${{ always() && job.status == 'failure' }} with: webhook: ${{ secrets.JUDONG_DISCORD_WEBHOOK }} - title: "Gitub action" + title: "Github action" description: ":x: Please add issue number to PR message! https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" diff --git a/.github/workflows/merge-pr-tagged.yml b/.github/workflows/merge-pr-tagged.yml index 63d92fe6..11af3110 100644 --- a/.github/workflows/merge-pr-tagged.yml +++ b/.github/workflows/merge-pr-tagged.yml @@ -21,14 +21,14 @@ jobs: run: | pr=$(echo ${{ github.ref }} | cut -d/ -f4) echo "PR: $pr" - echo "::set-output name=pr::$pr" + echo "pr=$pr" >> $GITHUB_OUTPUT - name: ๐Ÿ”ข Get version id: version run: | version=$(echo ${{ github.event.base_ref }} | cut -d/ -f3) echo "Version: $version" - echo "::set-output name=version::$version" + echo "version=$version" >> $GITHUB_OUTPUT - name: ๐Ÿงช Check the version format is in release format uses: actions-ecosystem/action-regex-match@v2 @@ -67,5 +67,5 @@ jobs: if: ${{ always() && job.status == 'failure' }} with: webhook: ${{ secrets.JUDONG_DISCORD_WEBHOOK }} - title: "Gitub action" + title: "Github action" description: ":x: Could not merge PR! https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fb44b78f..09715cad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,9 +8,7 @@ on: type: string required: false default: "Auto" - push: - tags: - - 'perform-release-on-*' + jobs: release: runs-on: judong @@ -33,19 +31,19 @@ jobs: - name: ๐Ÿ› ๏ธ Project context id: context - uses: zero88/gh-project-context@v1.1 + uses: zero88/gh-project-context@v1.2 - - name: ๐Ÿ› ๏ธ Set up JDK 11 - uses: actions/setup-java@v2 + - name: ๐Ÿ› ๏ธ Set up JDK 17 + uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'zulu' - name: ๐Ÿงน Remove settings.xml run: rm $HOME/.m2/settings.xml || true - name: ๐Ÿ› ๏ธ Setup maven settings.xml - uses: whelk-io/maven-settings-xml-action@v20 + uses: whelk-io/maven-settings-xml-action@v21 with: servers: > [ @@ -94,8 +92,8 @@ jobs: fi echo "Base version from POM: $BASE_VERSION" echo "Building version: ${VERSION_NUMBER}" - echo "::set-output name=version::${VERSION_NUMBER}" - echo "::set-output name=base-version::${BASE_VERSION}" + echo "version=${VERSION_NUMBER}" >> $GITHUB_OUTPUT + echo "base-version=${BASE_VERSION}" >> $GITHUB_OUTPUT - name: ๐Ÿ”€ Merge master branch to release branch run: | @@ -143,7 +141,7 @@ jobs: NEXT_VERSION="${NEXT_VERSION}-SNAPSHOT" fi echo "Next version is: $NEXT_VERSION" - echo "::set-output name=version::${NEXT_VERSION}" + echo "version=${NEXT_VERSION}" >> $GITHUB_OUTPUT - name: Set next version run: |- diff --git a/logback-test.xml b/logback-test.xml index ad01e818..05b85e92 100644 --- a/logback-test.xml +++ b/logback-test.xml @@ -8,7 +8,7 @@ - + diff --git a/pom.xml b/pom.xml index 778eb19a..1597ac95 100644 --- a/pom.xml +++ b/pom.xml @@ -325,6 +325,32 @@ + + org.projectlombok + lombok-maven-plugin + 1.18.20.0 + + ${project.basedir}/src/main/java + ${project.basedir}/target/delombok + false + + + + generate-sources + + delombok + + + + + + org.projectlombok + lombok + 1.18.24 + + + + org.apache.maven.plugins maven-javadoc-plugin @@ -464,13 +490,13 @@ ch.qos.logback logback-classic - 1.4.1 + 1.2.11 ch.qos.logback logback-core - 1.4.1 + 1.2.11