Browse Source

Bump next major version

pull/2062/head
Joe Grandja 6 months ago
parent
commit
51904bb37d
  1. 27
      .github/dependabot.yml
  2. 2
      .github/workflows/release-scheduler.yml
  3. 2
      git/hooks/prepare-forward-merge
  4. 2
      gradle.properties
  5. 4
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/util/SpringAuthorizationServerVersion.java

27
.github/dependabot.yml

@ -40,7 +40,7 @@ updates:
- version-update:semver-major - version-update:semver-major
- version-update:semver-minor - version-update:semver-minor
- package-ecosystem: gradle - package-ecosystem: gradle
target-branch: main target-branch: 1.5.x
directory: / directory: /
schedule: schedule:
interval: daily interval: daily
@ -55,6 +55,17 @@ updates:
update-types: update-types:
- version-update:semver-major - version-update:semver-major
- version-update:semver-minor - 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 # GitHub Actions
- package-ecosystem: github-actions - package-ecosystem: github-actions
@ -71,6 +82,13 @@ updates:
interval: weekly interval: weekly
labels: labels:
- 'type: task' - 'type: task'
- package-ecosystem: github-actions
target-branch: 1.5.x
directory: /
schedule:
interval: weekly
labels:
- 'type: task'
- package-ecosystem: github-actions - package-ecosystem: github-actions
target-branch: main target-branch: main
directory: / directory: /
@ -101,6 +119,13 @@ updates:
interval: weekly interval: weekly
labels: labels:
- 'type: task' - 'type: task'
- package-ecosystem: npm
target-branch: 1.5.x
directory: /docs
schedule:
interval: weekly
labels:
- 'type: task'
- package-ecosystem: npm - package-ecosystem: npm
target-branch: main target-branch: main
directory: /docs directory: /docs

2
.github/workflows/release-scheduler.yml

@ -14,7 +14,7 @@ jobs:
strategy: strategy:
matrix: matrix:
# List of active maintenance branches. # 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 runs-on: ubuntu-latest
steps: steps:
- name: Checkout - name: Checkout

2
git/hooks/prepare-forward-merge

@ -4,7 +4,7 @@ require 'net/http'
require 'yaml' require 'yaml'
require 'logger' require 'logger'
$main_branch = "1.5.x" $main_branch = "2.0.x"
$log = Logger.new(STDOUT) $log = Logger.new(STDOUT)
$log.level = Logger::WARN $log.level = Logger::WARN

2
gradle.properties

@ -1,4 +1,4 @@
version=1.5.2-SNAPSHOT version=2.0.0-SNAPSHOT
org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError org.gradle.jvmargs=-Xmx3g -XX:+HeapDumpOnOutOfMemoryError
org.gradle.parallel=true org.gradle.parallel=true
org.gradle.caching=true org.gradle.caching=true

4
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 { 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; private static final int PATCH = 0;

Loading…
Cancel
Save