From 51904bb37dcf4272e72f08461da56a787f33136c Mon Sep 17 00:00:00 2001 From: Joe Grandja <10884212+jgrandja@users.noreply.github.com> Date: Mon, 23 Jun 2025 14:43:43 -0400 Subject: [PATCH] Bump next major version --- .github/dependabot.yml | 27 ++++++++++++++++++- .github/workflows/release-scheduler.yml | 2 +- git/hooks/prepare-forward-merge | 2 +- gradle.properties | 2 +- .../SpringAuthorizationServerVersion.java | 4 +-- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b77f82ed..7489251a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -40,7 +40,7 @@ updates: - version-update:semver-major - version-update:semver-minor - package-ecosystem: gradle - target-branch: main + target-branch: 1.5.x directory: / schedule: interval: daily @@ -55,6 +55,17 @@ updates: update-types: - version-update:semver-major - version-update:semver-minor + - package-ecosystem: gradle + target-branch: main + directory: / + schedule: + interval: daily + time: '03:00' + timezone: Etc/UTC + labels: + - 'type: dependency-upgrade' + registries: + - spring-milestones # GitHub Actions - package-ecosystem: github-actions @@ -71,6 +82,13 @@ updates: interval: weekly labels: - 'type: task' + - package-ecosystem: github-actions + target-branch: 1.5.x + directory: / + schedule: + interval: weekly + labels: + - 'type: task' - package-ecosystem: github-actions target-branch: main directory: / @@ -101,6 +119,13 @@ updates: interval: weekly labels: - 'type: task' + - package-ecosystem: npm + target-branch: 1.5.x + directory: /docs + schedule: + interval: weekly + labels: + - 'type: task' - package-ecosystem: npm target-branch: main directory: /docs diff --git a/.github/workflows/release-scheduler.yml b/.github/workflows/release-scheduler.yml index 931e7a4b..8eb27852 100644 --- a/.github/workflows/release-scheduler.yml +++ b/.github/workflows/release-scheduler.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: # List of active maintenance branches. - branch: [ main, 1.3.x, 1.4.x ] + branch: [ main, 1.3.x, 1.4.x, 1.5.x ] runs-on: ubuntu-latest steps: - name: Checkout diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge index eb9a2d6f..0b18000e 100755 --- a/git/hooks/prepare-forward-merge +++ b/git/hooks/prepare-forward-merge @@ -4,7 +4,7 @@ require 'net/http' require 'yaml' require 'logger' -$main_branch = "1.5.x" +$main_branch = "2.0.x" $log = Logger.new(STDOUT) $log.level = Logger::WARN diff --git a/gradle.properties b/gradle.properties index c348fae5..146cc328 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=1.5.2-SNAPSHOT +version=2.0.0-SNAPSHOT org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.parallel=true org.gradle.caching=true diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/SpringAuthorizationServerVersion.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/SpringAuthorizationServerVersion.java index ba5bc8fa..4964d990 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/SpringAuthorizationServerVersion.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/SpringAuthorizationServerVersion.java @@ -23,9 +23,9 @@ package org.springframework.security.oauth2.server.authorization.util; */ public final class SpringAuthorizationServerVersion { - private static final int MAJOR = 1; + private static final int MAJOR = 2; - private static final int MINOR = 5; + private static final int MINOR = 0; private static final int PATCH = 0;