From 4e56073b06b5b2a1bf571ef57f7153717ca926c1 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Tue, 19 Dec 2023 15:14:43 -0500 Subject: [PATCH] Bump next minor version --- .github/workflows/release-scheduler.yml | 2 +- git/hooks/prepare-forward-merge | 2 +- gradle.properties | 2 +- .../authorization/util/SpringAuthorizationServerVersion.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-scheduler.yml b/.github/workflows/release-scheduler.yml index 75413eda7..03efb3e86 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.1.x ] + branch: [ main, 1.2.x, 1.1.x ] runs-on: ubuntu-latest steps: - name: Checkout diff --git a/git/hooks/prepare-forward-merge b/git/hooks/prepare-forward-merge index 24dea7698..3d3ad3658 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.2.x" +$main_branch = "1.3.x" $log = Logger.new(STDOUT) $log.level = Logger::WARN diff --git a/gradle.properties b/gradle.properties index 8e81b704b..1e626c097 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=1.2.2-SNAPSHOT +version=1.3.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 c32cafda7..8eaf3ba27 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,7 +23,7 @@ */ public final class SpringAuthorizationServerVersion { private static final int MAJOR = 1; - private static final int MINOR = 2; + private static final int MINOR = 3; private static final int PATCH = 0; /**