Merge branch '1.13.x' into 1.14.x

Author: marcingrzejszczak

.github/dependabot.yml

@@ -5,29 +5,29 @@ updates:
     target-branch: "main"
     schedule:
       interval: "weekly"
-#  - package-ecosystem: gradle
-#    directory: "/"
-#    schedule:
-#      interval: monthly
-#    target-branch: "1.9.x"
-#    milestone: 136
-#    ignore:
-#      # metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
-#      # in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
-#      # <=1.5.11 or 1.5.18 doesn't break with Micrometer, but open metrics won't be correct necessarily.
-#      - dependency-name: "com.netflix.hystrix:hystrix-core"
-#      # only upgrade patch versions
-#      - dependency-name: "*"
-#        update-types:
-#          - version-update:semver-major
-#          - version-update:semver-minor
-#    open-pull-requests-limit: 30
+  #  - package-ecosystem: gradle
+  #    directory: "/"
+  #    schedule:
+  #      interval: monthly
+  #    target-branch: "1.9.x"
+  #    milestone: 136
+  #    ignore:
+  #      # metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
+  #      # in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
+  #      # <=1.5.11 or 1.5.18 doesn't break with Micrometer, but open metrics won't be correct necessarily.
+  #      - dependency-name: "com.netflix.hystrix:hystrix-core"
+  #      # only upgrade patch versions
+  #      - dependency-name: "*"
+  #        update-types:
+  #          - version-update:semver-major
+  #          - version-update:semver-minor
+  #    open-pull-requests-limit: 30
   - package-ecosystem: gradle
     directory: "/"
     schedule:
-      interval: monthly
-    target-branch: "1.12.x"
-    milestone: 211
+      interval: daily
+    target-branch: "1.13.x"
+    milestone: 233
     ignore:
       # metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
       # in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
@@ -42,9 +42,9 @@ updates:
   - package-ecosystem: gradle
     directory: "/"
     schedule:
-      interval: monthly
-    target-branch: "1.13.x"
-    milestone: 233
+      interval: daily
+    target-branch: "1.14.x"
+    milestone: 250
     ignore:
       # metrics are better with https://github.com/Netflix/Hystrix/pull/1568 introduced
       # in hystrix 1.5.12, but Netflix re-released 1.5.11 as 1.5.18 late in 2018.
@@ -59,7 +59,7 @@ updates:
   - package-ecosystem: gradle
     directory: "/"
     schedule:
-      interval: monthly
+      interval: daily
     target-branch: "main"
     milestone: 185
     ignore:

.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,18 @@
+name: Merge Dependabot PR
+
+on:
+  pull_request:
+    branches:
+      - main
+      - '*.x'
+
+run-name: Merge Dependabot PR ${{ github.ref_name }}
+
+jobs:
+  merge-dependabot-pr:
+    permissions: write-all
+
+    uses: spring-io/spring-github-workflows/.github/workflows/spring-merge-dependabot-pr.yml@v5
+    with:
+      mergeArguments: --auto --squash
+      autoMergeSnapshots: true

gradle/libs.versions.toml

@@ -43,7 +43,6 @@ jaxb = "2.3.1"
 jetty9 = "9.4.57.v20241219"
 jetty11 = "11.0.16"
 jetty12 = "12.0.6"
-jersey2 = "2.45"
 jersey3 = "3.1.10"
 jmh = "1.37"
 # 3.14.x is the newest version of OSS jOOQ that supports Java 8
@@ -151,10 +150,10 @@ jetty9Servlet = { module = "org.eclipse.jetty:jetty-servlet", version.ref = "jet
 jetty11Server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty11" }
 jetty12Server = { module = "org.eclipse.jetty:jetty-server", version.ref = "jetty12" }
 jetty12Client = { module = "org.eclipse.jetty:jetty-client", version.ref = "jetty12" }
-jersey2Server = { module = "org.glassfish.jersey.core:jersey-server", version.ref = "jersey2" }
-jersey2Hk2 = { module = "org.glassfish.jersey.inject:jersey-hk2", version.ref = "jersey2" }
-jersey2TestFrameworkInmemory = { module = "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory", version.ref = "jersey2" }
-jersey2TestFrameworkJdkHttp = { module = "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http", version.ref = "jersey2" }
+jersey2Server = { module = "org.glassfish.jersey.core:jersey-server", version = "2.45" }
+jersey2Hk2 = { module = "org.glassfish.jersey.inject:jersey-hk2", version = "2.45" }
+jersey2TestFrameworkInmemory = { module = "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-inmemory", version = "2.45" }
+jersey2TestFrameworkJdkHttp = { module = "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http", version = "2.45" }
 jersey3ContainerJdkHttp = { module = "org.glassfish.jersey.containers:jersey-container-jdk-http", version.ref = "jersey3" }
 jersey3Hk2 = { module = "org.glassfish.jersey.inject:jersey-hk2", version.ref = "jersey3" }
 jersey3TestFrameworkJdkHttp = { module = "org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-jdk-http", version.ref = "jersey3" }