Merge branch 'feature/feign-vertx' of github.com:hosuaby/feign into f…

…eature/feign-vertx
OpenFeign · Nov 4, 2024 · 4c202b1 · 4c202b1
2 parents 8fb1332 + 02764c6
commit 4c202b1
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 12 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,5 +8,5 @@ updates:
   - package-ecosystem: "maven"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "daily"
     open-pull-requests-limit: 100
diff --git a/.github/workflows/auto-merge-dependabot.yml b/.github/workflows/auto-merge-dependabot.yml
@@ -0,0 +1,28 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'OpenFeign/feign'
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v2.2.0
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Auto-approve Dependabot PRs
+        uses: hmarr/auto-approve-action@v3
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/feign-form-spring/pom.xml b/feign-form-spring/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -100,13 +100,13 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/feign-form/pom.xml b/feign-form/pom.xml
@@ -56,13 +56,13 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
-      <version>3.3.4</version>
+      <version>3.3.5</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/hc5/pom.xml b/hc5/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.apache.httpcomponents.client5</groupId>
       <artifactId>httpclient5</artifactId>
-      <version>5.4</version>
+      <version>5.4.1</version>
     </dependency>
 
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -176,8 +176,8 @@
     <slf4j.version>2.0.16</slf4j.version>
     <json.version>20240303</json.version>
 
-    <junit5.version>5.11.2</junit5.version>
-    <jackson.version>2.18.0</jackson.version>
+    <junit5.version>5.11.3</junit5.version>
+    <jackson.version>2.18.1</jackson.version>
     <assertj.version>3.26.3</assertj.version>
     <mockito.version>5.14.2</mockito.version>
     <fastjson2.version>2.0.53</fastjson2.version>
@@ -990,18 +990,18 @@
           <plugin>
             <groupId>org.openrewrite.maven</groupId>
             <artifactId>rewrite-maven-plugin</artifactId>
-            <version>5.42.2</version>
+            <version>5.43.3</version>
 
             <dependencies>
               <dependency>
                 <groupId>org.openrewrite.recipe</groupId>
                 <artifactId>rewrite-testing-frameworks</artifactId>
-                <version>2.20.1</version>
+                <version>2.21.0</version>
               </dependency>
               <dependency>
                 <groupId>org.openrewrite.recipe</groupId>
                 <artifactId>rewrite-migrate-java</artifactId>
-                <version>2.27.1</version>
+                <version>2.28.0</version>
               </dependency>
             </dependencies>