Merge branch 'develop' into id-for-annotation

PlaytikaOSS · Nov 10, 2023 · e71681f · e71681f
2 parents 61c4db6 + 114a56c
commit e71681f
Show file tree

Hide file tree

Showing 30 changed files with 134 additions and 101 deletions.
diff --git 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
@@ -0,0 +1,2 @@
+"documentation":
+  - /**/*.adoc
diff --git 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
@@ -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
@@ -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 }}"
diff --git 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
diff --git 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 "[email protected]"
-          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
@@ -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/[email protected]
+        with:
+          configurationFile: .github/renovate/renovate.json
+          token: ${{ secrets.RELEASE_PERSONAL_ACCESS_TOKEN }}
+        env:
+          DRY_RUN: ${{ inputs.dryRun || 'false' }}
+          LOG_LEVEL: ${{ inputs.logLevel || 'debug' }}
diff --git 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
@@ -6,14 +6,14 @@
         <groupId>com.playtika.reactivefeign</groupId>
         <artifactId>feign-reactor-parent</artifactId>
         <relativePath>../feign-reactor-parent</relativePath>
-        <version>4.0.0</version>
+        <version>4.0.2</version>
     </parent>
 
     <artifactId>feign-reactor-benchmarks</artifactId>
 
     <properties>
         <java.version>11</java.version>
-        <jmh.version>1.36</jmh.version>
+        <jmh.version>1.37</jmh.version>
     </properties>
 
     <dependencies>
@@ -96,7 +96,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.4.1</version>
+                <version>3.5.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -117,7 +117,7 @@
             <plugin>
                 <groupId>org.skife.maven</groupId>
                 <artifactId>really-executable-jar-maven-plugin</artifactId>
-                <version>1.5.0</version>
+                <version>2.1.1</version>
                 <configuration>
                     <programFile>benchmark</programFile>
                 </configuration>

diff --git a/feign-reactor-bom/pom.xml b/feign-reactor-bom/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.playtika.reactivefeign</groupId>
         <artifactId>feign-reactor</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.2</version>
     </parent>
 
     <packaging>pom</packaging>

diff --git a/feign-reactor-cloud/pom.xml b/feign-reactor-cloud/pom.xml
@@ -6,7 +6,7 @@
         <groupId>com.playtika.reactivefeign</groupId>
         <artifactId>feign-reactor-parent</artifactId>
         <relativePath>../feign-reactor-parent</relativePath>
-        <version>4.0.0</version>
+        <version>4.0.2</version>
     </parent>
 
     <artifactId>feign-reactor-cloud</artifactId>

diff --git a/feign-reactor-core/pom.xml b/feign-reactor-core/pom.xml
@@ -23,7 +23,7 @@
         <groupId>com.playtika.reactivefeign</groupId>
         <artifactId>feign-reactor-parent</artifactId>
         <relativePath>../feign-reactor-parent</relativePath>
-        <version>4.0.0</version>
+        <version>4.0.2</version>
     </parent>
 
     <artifactId>feign-reactor-core</artifactId>

diff --git 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
@@ -6,7 +6,7 @@
         <groupId>com.playtika.reactivefeign</groupId>
         <artifactId>feign-reactor-parent</artifactId>
         <relativePath>../feign-reactor-parent</relativePath>
-        <version>4.0.0</version>
+        <version>4.0.2</version>
     </parent>
 
     <artifactId>feign-reactor-java11</artifactId>

diff --git a/feign-reactor-jetty/pom.xml b/feign-reactor-jetty/pom.xml
@@ -6,7 +6,7 @@
         <groupId>com.playtika.reactivefeign</groupId>
         <artifactId>feign-reactor-parent</artifactId>
         <relativePath>../feign-reactor-parent</relativePath>
-        <version>4.0.0</version>
+        <version>4.0.2</version>
     </parent>
 
     <artifactId>feign-reactor-jetty</artifactId>

diff --git a/feign-reactor-parent/pom.xml b/feign-reactor-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.playtika.reactivefeign</groupId>
         <artifactId>feign-reactor</artifactId>
-        <version>4.0.0</version>
+        <version>4.0.2</version>
     </parent>
 
     <artifactId>feign-reactor-parent</artifactId>
@@ -18,7 +18,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!--BOMs-->
-        <spring-cloud-bom.version>2022.0.3</spring-cloud-bom.version>
+        <spring-cloud-bom.version>2022.0.4</spring-cloud-bom.version>
         <spring-boot-dependencies-bom.version>3.0.1</spring-boot-dependencies-bom.version>
 
         <!--other-->
@@ -36,15 +36,16 @@
         <brave-tests.version>5.16.0</brave-tests.version>
 
         <!-- Plugins -->
-        <jacoco-plugin.version>0.8.8</jacoco-plugin.version>
+        <jacoco-plugin.version>0.8.11</jacoco-plugin.version>
         <coveralls-plugin.version>4.3.0</coveralls-plugin.version>
 
         <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-        <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.2.1</maven-surefire-plugin.version>
 
-        <maven.javadoc.plugin.version>3.3.2</maven.javadoc.plugin.version>
+        <maven.javadoc.plugin.version>3.5.0</maven.javadoc.plugin.version>
         <maven.source.plugin.version>3.3.0</maven.source.plugin.version>
 
+
         <!-- GPG -->
         <gpg.keyname>3EEF24C7</gpg.keyname>
         <gpg.defaultKeyring>false</gpg.defaultKeyring>

diff --git a/feign-reactor-rx2/pom.xml b/feign-reactor-rx2/pom.xml
@@ -6,7 +6,7 @@
         <groupId>com.playtika.reactivefeign</groupId>
         <artifactId>feign-reactor-parent</artifactId>
         <relativePath>../feign-reactor-parent</relativePath>
-        <version>4.0.0</version>
+        <version>4.0.2</version>
     </parent>
 
     <artifactId>feign-reactor-rx2</artifactId>