Skip to content

Commit 51904bb

Browse files
committed
Bump next major version
1 parent 6b0ebdf commit 51904bb

File tree

5 files changed

+31
-6
lines changed

5 files changed

+31
-6
lines changed

.github/dependabot.yml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ updates:
4040
- version-update:semver-major
4141
- version-update:semver-minor
4242
- package-ecosystem: gradle
43-
target-branch: main
43+
target-branch: 1.5.x
4444
directory: /
4545
schedule:
4646
interval: daily
@@ -55,6 +55,17 @@ updates:
5555
update-types:
5656
- version-update:semver-major
5757
- version-update:semver-minor
58+
- package-ecosystem: gradle
59+
target-branch: main
60+
directory: /
61+
schedule:
62+
interval: daily
63+
time: '03:00'
64+
timezone: Etc/UTC
65+
labels:
66+
- 'type: dependency-upgrade'
67+
registries:
68+
- spring-milestones
5869

5970
# GitHub Actions
6071
- package-ecosystem: github-actions
@@ -71,6 +82,13 @@ updates:
7182
interval: weekly
7283
labels:
7384
- 'type: task'
85+
- package-ecosystem: github-actions
86+
target-branch: 1.5.x
87+
directory: /
88+
schedule:
89+
interval: weekly
90+
labels:
91+
- 'type: task'
7492
- package-ecosystem: github-actions
7593
target-branch: main
7694
directory: /
@@ -101,6 +119,13 @@ updates:
101119
interval: weekly
102120
labels:
103121
- 'type: task'
122+
- package-ecosystem: npm
123+
target-branch: 1.5.x
124+
directory: /docs
125+
schedule:
126+
interval: weekly
127+
labels:
128+
- 'type: task'
104129
- package-ecosystem: npm
105130
target-branch: main
106131
directory: /docs

.github/workflows/release-scheduler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
# List of active maintenance branches.
17-
branch: [ main, 1.3.x, 1.4.x ]
17+
branch: [ main, 1.3.x, 1.4.x, 1.5.x ]
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout

git/hooks/prepare-forward-merge

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require 'net/http'
44
require 'yaml'
55
require 'logger'
66

7-
$main_branch = "1.5.x"
7+
$main_branch = "2.0.x"
88

99
$log = Logger.new(STDOUT)
1010
$log.level = Logger::WARN

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=1.5.2-SNAPSHOT
1+
version=2.0.0-SNAPSHOT
22
org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError
33
org.gradle.parallel=true
44
org.gradle.caching=true

oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/SpringAuthorizationServerVersion.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
*/
2424
public final class SpringAuthorizationServerVersion {
2525

26-
private static final int MAJOR = 1;
26+
private static final int MAJOR = 2;
2727

28-
private static final int MINOR = 5;
28+
private static final int MINOR = 0;
2929

3030
private static final int PATCH = 0;
3131

0 commit comments

Comments
 (0)