From e7eb6bd3cb0620efdc12ec09ef73cd74610e0b19 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 9 Oct 2024 18:03:14 +0200 Subject: [PATCH 1/6] Fix GH actions setup. --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5aa9ab40..e377f099 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,9 @@ name: Build on: push: - branches: [ main ] + branches: [ main, 4.1.x ] pull_request: - branches: [ main ] + branches: [ main, 4.1.x ] jobs: build: From f6a2984baae628a11582ebd665cebaa26eb9bdb0 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 11 Oct 2024 13:23:01 +0200 Subject: [PATCH 2/6] Update dependabot setup. --- .github/dependabot.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bd7d641f..5b829a0c 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,6 +10,11 @@ updates: target-branch: "4.0.x" # oldest OSS supported branch schedule: interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + target-branch: "4.1.x" + schedule: + interval: "weekly" - package-ecosystem: "github-actions" directory: "/" target-branch: "main" @@ -37,6 +42,17 @@ updates: update-types: - version-update:semver-major - version-update:semver-minor + - package-ecosystem: maven + directory: / + schedule: + interval: daily + target-branch: 4.1.x + ignore: + # only upgrade patch versions for maintenance branch + - dependency-name: "*" + update-types: + - version-update:semver-major + - version-update:semver-minor - package-ecosystem: maven directory: / schedule: @@ -47,3 +63,18 @@ updates: - dependency-name: "*" update-types: - version-update:semver-major + - package-ecosystem: npm + target-branch: docs-build + directory: / + schedule: + interval: weekly + - package-ecosystem: npm + target-branch: main + directory: /docs + schedule: + interval: weekly + - package-ecosystem: npm + target-branch: 4.1.x + directory: /docs + schedule: + interval: weekly From d314ba81674cb7d60a4d98ed6d363200cf78158b Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 11 Oct 2024 13:27:14 +0200 Subject: [PATCH 3/6] Upgrade to Feign-Bom 13.5. --- spring-cloud-openfeign-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index c1cb9e99..0fa15977 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -15,7 +15,7 @@ spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies - 13.4 + 13.5 3.8.0 From 26e403d6f2aa3f16f66bc843b362d1f45f279dcd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 13:44:51 +0200 Subject: [PATCH 4/6] Bump @antora/collector-extension in /docs (#1108) --- updated-dependencies: - dependency-name: "@antora/collector-extension" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index 07706522..ce2335c3 100644 --- a/docs/package.json +++ b/docs/package.json @@ -2,7 +2,7 @@ "dependencies": { "antora": "3.2.0-alpha.6", "@antora/atlas-extension": "1.0.0-alpha.2", - "@antora/collector-extension": "1.0.0-beta.2", + "@antora/collector-extension": "1.0.0-beta.3", "@asciidoctor/tabs": "1.0.0-beta.6", "@springio/antora-extensions": "1.14.2", "@springio/asciidoctor-extensions": "1.0.0-alpha.14" From d11a4259605288bb9dec3bad15f149d0ee0fd778 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Oct 2024 13:45:16 +0200 Subject: [PATCH 5/6] Bump io.vavr:vavr from 0.10.4 to 0.10.5 (#1107) Bumps [io.vavr:vavr](https://github.com/vavr-io/vavr) from 0.10.4 to 0.10.5. - [Release notes](https://github.com/vavr-io/vavr/releases) - [Changelog](https://github.com/vavr-io/vavr/blob/master/RELEASE.md) - [Commits](https://github.com/vavr-io/vavr/compare/v0.10.4...v0.10.5) --- updated-dependencies: - dependency-name: io.vavr:vavr dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring-cloud-openfeign-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index c6ecc934..ea82b9a5 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -189,7 +189,7 @@ io.vavr vavr - 0.10.4 + 0.10.5 test From 013e00c78458bf8b41f59f5babc6b205609d4450 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Thu, 17 Oct 2024 15:45:34 +0200 Subject: [PATCH 6/6] Adjust to blocking lower/uper-casing without locale. --- src/checkstyle/checkstyle-suppressions.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index e3cf17bb..8a6d8271 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -14,6 +14,8 @@ + +