Merge branch '3.5.x' of github.com:freefair/okhttp-spring-boot into 4.0.x

larsgrefer · larsgrefer · commit 9052b23fefcb · 2026-01-24T00:26:59.000+01:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,17 +7,17 @@ version: 2
 updates:
   - package-ecosystem: "gradle"
     directory: "/"
-    target-branch: "3.4.x"
+    target-branch: "3.5.x"
     schedule:
       interval: "daily"
   - package-ecosystem: "gradle"
     directory: "/"
-    target-branch: "3.5.x"
+    target-branch: "4.0.x"
     schedule:
       interval: "daily"
   - package-ecosystem: "gradle"
     directory: "/"
-    target-branch: "4.0.x"
+    target-branch: "4.1.x"
     schedule:
       interval: "daily"
 
diff --git a/settings.gradle b/settings.gradle
@@ -7,7 +7,7 @@ pluginManagement {
 
 plugins {
     id "io.freefair.settings.plugin-versions" version "9.2.0"
-    id "com.gradle.develocity" version "4.3"
+    id "com.gradle.develocity" version "4.3.1"
 }
 
 boolean isCiServer = System.getenv().containsKey("CI")

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ pluginManagement {`
`7`	`7`
`8`	`8`	`plugins {`
`9`	`9`	`id "io.freefair.settings.plugin-versions" version "9.2.0"`
`10`		`- id "com.gradle.develocity" version "4.3"`
	`10`	`+ id "com.gradle.develocity" version "4.3.1"`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`boolean isCiServer = System.getenv().containsKey("CI")`