diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9a93bcbd..24e39783 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,27 +1,22 @@ version: 2 updates: -- package-ecosystem: maven - directory: "/" - schedule: - interval: daily - open-pull-requests-limit: 10 - ignore: - - dependency-name: io.projectreactor.tools:blockhound - versions: - - 1.0.5.RELEASE - - dependency-name: org.springframework.boot:spring-boot-dependencies - versions: - - 2.4.2 - - 2.4.3 - - 2.4.4 - - dependency-name: org.openjdk.jmh:jmh-generator-annprocess - versions: - - "1.27" - - "1.28" - - dependency-name: org.openjdk.jmh:jmh-core - versions: - - "1.27" - - "1.28" - - dependency-name: org.springframework.cloud:spring-cloud-dependencies - versions: - - Hoxton.SR10 + - package-ecosystem: "maven" + directory: "/" + target-branch: "develop" + schedule: + interval: "weekly" + open-pull-requests-limit: 50 + ignore: + - dependency-name: "com.amazonaws:*" + update-types: ["version-update:semver-patch"] + - package-ecosystem: "github-actions" + directory: "/" + target-branch: "develop" + labels: + - "housekeeping" + schedule: + interval: "monthly" + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 00000000..23f44c4e --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,2 @@ +"documentation": + - /**/*.adoc \ No newline at end of file diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index ea044ed3..c4810a76 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -20,9 +20,12 @@ categories: - title: 🐞 Fixes label: bug - - title: 📁 Dependencies updates + - title: 📁 Java Dependencies updates label: dependencies + - title: 📁 Docker images updates + label: docker-update-images + - title: 📖 Documentation label: documentation diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 54e05578..40cc30de 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -7,10 +7,10 @@ on: jobs: build: name: Trivy vulnerability scanner - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Run Trivy vulnerability scanner in repo mode uses: aquasecurity/trivy-action@master diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml new file mode 100644 index 00000000..3807d5af --- /dev/null +++ b/.github/workflows/labeler.yml @@ -0,0 +1,14 @@ +name: "Pull Request Auto Labeler" +on: + - pull_request_target + +jobs: + triage: + permissions: + contents: read + pull-requests: write + runs-on: ubuntu-latest + steps: + - uses: actions/labeler@v4 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" \ No newline at end of file diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 01a4573b..ac55ccc2 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,11 @@ name: Java CI with Maven on: push: - branches: [ develop ] + branches: + - develop pull_request: - branches: [ develop ] + branches: + - develop jobs: build-jdk17: @@ -18,8 +20,8 @@ jobs: group: ${{ github.event_name == 'pull_request' && github.head_ref || github.sha}} cancel-in-progress: true steps: - - uses: actions/checkout@v3 - #needed for gitflow-incremental-builder + - name: Checkout repository + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Cache Maven packages @@ -33,7 +35,5 @@ jobs: with: java-version: '17' distribution: 'corretto' - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml - settings-path: ${{ github.workspace }} # location for the settings.xml file - name: Build with Maven - run: ./mvnw -version && whoami && ./mvnw clean verify --batch-mode --no-transfer-progress + run: ./mvnw -version && whoami && umask -S && umask a+rw && umask -S && ./mvnw clean verify -P docker-clean -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.count=3 --no-snapshot-updates --batch-mode --no-transfer-progress \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a9a79c8c..58270df7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,40 +1,19 @@ name: Publish to the Maven Central Repository on: - workflow_dispatch: - inputs: - version: - description: Version to be released - required: true + release: + types: [ published ] jobs: publish: runs-on: ubuntu-latest steps: - - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v4 with: + ref: ${{github.event.release.target_commitish}} token: ${{ secrets.RELEASE_PERSONAL_ACCESS_TOKEN }} - - name: Validate ${{ github.event.inputs.version }} release exists - uses: actions/github-script@v6 - with: - github-token: ${{secrets.GITHUB_TOKEN}} - script: | - const response = await github.rest.repos.listReleases({ - owner: context.repo.owner, - repo: context.repo.repo - }); - if (!response) { - throw new Error(`There are no available releases`); - } - for (const release of response.data) { - if (release.name === "${{ github.event.inputs.version }}") { - return - } - } - throw new Error(`Release ${{ github.event.inputs.version }} is not available`); - - name: Set up JDK uses: actions/setup-java@v3 with: @@ -45,23 +24,24 @@ jobs: server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }} gpg-passphrase: MAVEN_GPG_PASSPHRASE + cache: 'maven' + - name: Update version - run: | - ./mvnw --batch-mode --no-transfer-progress versions:set -DnewVersion=${{ github.event.inputs.version }} versions:commit - git config user.name "jenkins" - git config user.email "jenkins@playtika.com" - git commit -m "Release ${{ github.event.inputs.version }}" -a - git push + if: ${{ success() }} + run: ./mvnw --batch-mode --no-transfer-progress versions:set -DnewVersion=${{github.event.release.tag_name}} versions:commit - name: Publish to the Maven Central Repository - run: ./mvnw --batch-mode --no-transfer-progress -Dgib.disable=true -Ddocker.cleanup.skip=true -P ossrh -DskipTests deploy + if: ${{ success() }} + run: ./mvnw --batch-mode --no-transfer-progress -Dgib.disable=true -P ossrh -DskipTests deploy env: MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - - name: Publish release on GitHub - uses: test-room-7/action-publish-release-drafts@v0 + - name: Commit & Push changes + if: ${{ success() }} + uses: actions-js/push@master with: - github-token: ${{ secrets.GITHUB_TOKEN }} - tag-name: ${{ github.event.inputs.version }} + github_token: ${{ secrets.GITHUB_TOKEN }} + message: 'Release ${{github.event.release.tag_name}}' + branch: ${{ github.event.release.target_commitish }} diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml new file mode 100644 index 00000000..62b9aaba --- /dev/null +++ b/.github/workflows/renovate.yml @@ -0,0 +1,39 @@ +name: Renovate for update docker images + +on: + workflow_dispatch: + inputs: + dryRun: + description: "Dry-Run" + default: false + required: false + type: boolean + logLevel: + description: "Log-Level" + required: false + default: 'debug' + type: choice + options: + - info + - warn + - debug + - error + - fatal + schedule: + - cron: '0 8 * * *' + +jobs: + renovate: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Self-hosted Renovate + uses: renovatebot/github-action@v39.1.1 + with: + configurationFile: .github/renovate/renovate.json + token: ${{ secrets.RELEASE_PERSONAL_ACCESS_TOKEN }} + env: + DRY_RUN: ${{ inputs.dryRun || 'false' }} + LOG_LEVEL: ${{ inputs.logLevel || 'debug' }} \ No newline at end of file diff --git a/.github/workflows/required-labels.yml b/.github/workflows/required-labels.yml index ecfef869..089af346 100644 --- a/.github/workflows/required-labels.yml +++ b/.github/workflows/required-labels.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest name: Verify Pull Request has labels steps: - - uses: mheap/github-action-required-labels@v3 + - uses: mheap/github-action-required-labels@v5 with: mode: minimum count: 1 diff --git a/feign-reactor-benchmarks/pom.xml b/feign-reactor-benchmarks/pom.xml index 2e95523b..4179bc30 100644 --- a/feign-reactor-benchmarks/pom.xml +++ b/feign-reactor-benchmarks/pom.xml @@ -6,14 +6,14 @@ com.playtika.reactivefeign feign-reactor-parent ../feign-reactor-parent - 4.0.0 + 4.0.2 feign-reactor-benchmarks 11 - 1.36 + 1.37 @@ -96,7 +96,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.4.1 + 3.5.1 package @@ -117,7 +117,7 @@ org.skife.maven really-executable-jar-maven-plugin - 1.5.0 + 2.1.1 benchmark diff --git a/feign-reactor-bom/pom.xml b/feign-reactor-bom/pom.xml index 70060afc..91fcb402 100644 --- a/feign-reactor-bom/pom.xml +++ b/feign-reactor-bom/pom.xml @@ -7,7 +7,7 @@ com.playtika.reactivefeign feign-reactor - 4.0.0 + 4.0.2 pom diff --git a/feign-reactor-cloud/pom.xml b/feign-reactor-cloud/pom.xml index 7211e404..cacbc1cb 100644 --- a/feign-reactor-cloud/pom.xml +++ b/feign-reactor-cloud/pom.xml @@ -6,7 +6,7 @@ com.playtika.reactivefeign feign-reactor-parent ../feign-reactor-parent - 4.0.0 + 4.0.2 feign-reactor-cloud diff --git a/feign-reactor-core/pom.xml b/feign-reactor-core/pom.xml index 2aae2b00..8cae8f15 100644 --- a/feign-reactor-core/pom.xml +++ b/feign-reactor-core/pom.xml @@ -23,7 +23,7 @@ com.playtika.reactivefeign feign-reactor-parent ../feign-reactor-parent - 4.0.0 + 4.0.2 feign-reactor-core diff --git a/feign-reactor-core/src/main/java/reactivefeign/client/ReactiveFeignException.java b/feign-reactor-core/src/main/java/reactivefeign/client/ReactiveFeignException.java index 83286e64..5d4b1ca6 100644 --- a/feign-reactor-core/src/main/java/reactivefeign/client/ReactiveFeignException.java +++ b/feign-reactor-core/src/main/java/reactivefeign/client/ReactiveFeignException.java @@ -9,7 +9,6 @@ public class ReactiveFeignException extends RuntimeException { public ReactiveFeignException(Throwable cause, ReactiveHttpRequest request) { super(String.format(MESSAGE_PATTERN, request, cause.getMessage()), cause); this.request = request; - cause.printStackTrace(); } public ReactiveHttpRequest getRequest() { diff --git a/feign-reactor-java11/pom.xml b/feign-reactor-java11/pom.xml index 277466d0..86579e39 100644 --- a/feign-reactor-java11/pom.xml +++ b/feign-reactor-java11/pom.xml @@ -6,7 +6,7 @@ com.playtika.reactivefeign feign-reactor-parent ../feign-reactor-parent - 4.0.0 + 4.0.2 feign-reactor-java11 diff --git a/feign-reactor-jetty/pom.xml b/feign-reactor-jetty/pom.xml index e7e5ffed..ab062b86 100644 --- a/feign-reactor-jetty/pom.xml +++ b/feign-reactor-jetty/pom.xml @@ -6,7 +6,7 @@ com.playtika.reactivefeign feign-reactor-parent ../feign-reactor-parent - 4.0.0 + 4.0.2 feign-reactor-jetty diff --git a/feign-reactor-parent/pom.xml b/feign-reactor-parent/pom.xml index f6665de7..331eb788 100644 --- a/feign-reactor-parent/pom.xml +++ b/feign-reactor-parent/pom.xml @@ -5,7 +5,7 @@ com.playtika.reactivefeign feign-reactor - 4.0.0 + 4.0.2 feign-reactor-parent @@ -18,7 +18,7 @@ UTF-8 - 2022.0.3 + 2022.0.4 3.0.1 @@ -36,15 +36,16 @@ 5.16.0 - 0.8.8 + 0.8.11 4.3.0 3.11.0 - 3.1.2 + 3.2.1 - 3.3.2 + 3.5.0 3.3.0 + 3EEF24C7 false diff --git a/feign-reactor-rx2/pom.xml b/feign-reactor-rx2/pom.xml index a778a83a..0a79d271 100644 --- a/feign-reactor-rx2/pom.xml +++ b/feign-reactor-rx2/pom.xml @@ -6,7 +6,7 @@ com.playtika.reactivefeign feign-reactor-parent ../feign-reactor-parent - 4.0.0 + 4.0.2 feign-reactor-rx2 diff --git a/feign-reactor-spring-cloud-starter/pom.xml b/feign-reactor-spring-cloud-starter/pom.xml index 9d7e92ce..ed014fb8 100644 --- a/feign-reactor-spring-cloud-starter/pom.xml +++ b/feign-reactor-spring-cloud-starter/pom.xml @@ -8,7 +8,7 @@ com.playtika.reactivefeign feign-reactor-parent ../feign-reactor-parent - 4.0.0 + 4.0.2 pom diff --git a/feign-reactor-spring-configuration/pom.xml b/feign-reactor-spring-configuration/pom.xml index a8c02cfa..019d50bd 100644 --- a/feign-reactor-spring-configuration/pom.xml +++ b/feign-reactor-spring-configuration/pom.xml @@ -6,7 +6,7 @@ com.playtika.reactivefeign feign-reactor-parent ../feign-reactor-parent - 4.0.0 + 4.0.2 feign-reactor-spring-configuration diff --git a/feign-reactor-test/feign-reactor-server-configurations/pom.xml b/feign-reactor-test/feign-reactor-server-configurations/pom.xml index fe102513..4291b1fc 100644 --- a/feign-reactor-test/feign-reactor-server-configurations/pom.xml +++ b/feign-reactor-test/feign-reactor-server-configurations/pom.xml @@ -5,7 +5,7 @@ com.playtika.reactivefeign feign-reactor-test - 4.0.0 + 4.0.2 feign-reactor-server-configurations diff --git a/feign-reactor-test/feign-reactor-spring-configuration-cloud2-test/pom.xml b/feign-reactor-test/feign-reactor-spring-configuration-cloud2-test/pom.xml index 6a557062..a85ed030 100644 --- a/feign-reactor-test/feign-reactor-spring-configuration-cloud2-test/pom.xml +++ b/feign-reactor-test/feign-reactor-spring-configuration-cloud2-test/pom.xml @@ -5,7 +5,7 @@ com.playtika.reactivefeign feign-reactor-test - 4.0.0 + 4.0.2 feign-reactor-spring-configuration-cloud2-test diff --git a/feign-reactor-test/feign-reactor-spring-configuration-test/pom.xml b/feign-reactor-test/feign-reactor-spring-configuration-test/pom.xml index 751e8fa1..7aea8052 100644 --- a/feign-reactor-test/feign-reactor-spring-configuration-test/pom.xml +++ b/feign-reactor-test/feign-reactor-spring-configuration-test/pom.xml @@ -5,7 +5,7 @@ com.playtika.reactivefeign feign-reactor-test - 4.0.0 + 4.0.2 feign-reactor-spring-configuration-test diff --git a/feign-reactor-test/feign-reactor-spring-mvc-test/pom.xml b/feign-reactor-test/feign-reactor-spring-mvc-test/pom.xml index e330c3ae..01f52602 100644 --- a/feign-reactor-test/feign-reactor-spring-mvc-test/pom.xml +++ b/feign-reactor-test/feign-reactor-spring-mvc-test/pom.xml @@ -5,7 +5,7 @@ com.playtika.reactivefeign feign-reactor-test - 4.0.0 + 4.0.2 feign-reactor-spring-mvc-test diff --git a/feign-reactor-test/pom.xml b/feign-reactor-test/pom.xml index 88e3e3ca..7b6eda3c 100644 --- a/feign-reactor-test/pom.xml +++ b/feign-reactor-test/pom.xml @@ -6,7 +6,7 @@ com.playtika.reactivefeign feign-reactor-parent ../feign-reactor-parent - 4.0.0 + 4.0.2 feign-reactor-test diff --git a/feign-reactor-webclient-apache-client5/pom.xml b/feign-reactor-webclient-apache-client5/pom.xml index c32d338a..206dd60d 100644 --- a/feign-reactor-webclient-apache-client5/pom.xml +++ b/feign-reactor-webclient-apache-client5/pom.xml @@ -6,7 +6,7 @@ com.playtika.reactivefeign feign-reactor-parent ../feign-reactor-parent - 4.0.0 + 4.0.2 feign-reactor-webclient-apache-client5 diff --git a/feign-reactor-webclient-core/pom.xml b/feign-reactor-webclient-core/pom.xml index 373daead..db0a0f0c 100644 --- a/feign-reactor-webclient-core/pom.xml +++ b/feign-reactor-webclient-core/pom.xml @@ -6,7 +6,7 @@ com.playtika.reactivefeign feign-reactor-parent ../feign-reactor-parent - 4.0.0 + 4.0.2 feign-reactor-webclient-core diff --git a/feign-reactor-webclient-jetty/pom.xml b/feign-reactor-webclient-jetty/pom.xml index a19dc4a2..ad06229f 100644 --- a/feign-reactor-webclient-jetty/pom.xml +++ b/feign-reactor-webclient-jetty/pom.xml @@ -6,7 +6,7 @@ com.playtika.reactivefeign feign-reactor-parent ../feign-reactor-parent - 4.0.0 + 4.0.2 feign-reactor-webclient-jetty diff --git a/feign-reactor-webclient/pom.xml b/feign-reactor-webclient/pom.xml index 77123eb6..69143c05 100644 --- a/feign-reactor-webclient/pom.xml +++ b/feign-reactor-webclient/pom.xml @@ -6,7 +6,7 @@ com.playtika.reactivefeign feign-reactor-parent ../feign-reactor-parent - 4.0.0 + 4.0.2 feign-reactor-webclient diff --git a/pom.xml b/pom.xml index fd51e9d5..d8c9e7b9 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.playtika.reactivefeign feign-reactor - 4.0.0 + 4.0.2 pom