diff --git a/.github/dependabot.yml b/.github/dependabot.yml index bad09be..cf61d01 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,5 +1,19 @@ version: 2 updates: + - package-ecosystem: gradle + directory: "/" + target-branch: "3.3.x" + schedule: + interval: daily + open-pull-requests-limit: 15 + labels: + - "dependency-upgrade" + commit-message: + prefix: "3.3.x" + ignore: + - dependency-name: "*" + update-types: ["version-update:semver-major"] + - package-ecosystem: gradle directory: "/" target-branch: "3.2.x" diff --git a/.github/workflows/java-17.yml b/.github/workflows/java-17.yml index 97fbecf..45bd170 100644 --- a/.github/workflows/java-17.yml +++ b/.github/workflows/java-17.yml @@ -5,9 +5,9 @@ name: Java 17 on: push: - branches: [ 3.2.*, 3.1.* ] + branches: [ 3.3.*, 3.2.*, 3.1.* ] pull_request: - branches: [ 3.2.*, 3.1.* ] + branches: [ 3.3.*, 3.2.*, 3.1.* ] jobs: build: diff --git a/.github/workflows/java-21.yml b/.github/workflows/java-21.yml index 9221fea..69cbf55 100644 --- a/.github/workflows/java-21.yml +++ b/.github/workflows/java-21.yml @@ -5,9 +5,9 @@ name: Java 21 on: push: - branches: [ 3.2.*, 3.1.* ] + branches: [ 3.3.*, 3.2.*, 3.1.* ] pull_request: - branches: [ 3.2.*, 3.1.* ] + branches: [ 3.3.*, 3.2.*, 3.1.* ] jobs: build: diff --git a/build.gradle b/build.gradle index c983174..1821702 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { description = "Spring CredHub" ext { - springBootVersion = "3.2.8" + springBootVersion = "3.3.2" javadocLinks = [ "https://docs.oracle.com/en/java/javase/17/docs/api/", "https://docs.spring.io/spring-framework/docs/current/javadoc-api/" diff --git a/gradle.properties b/gradle.properties index a17e50f..0e34f11 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=3.2.0-SNAPSHOT +version=3.3.0-SNAPSHOT org.gradle.caching=true org.gradle.parallel=true diff --git a/scripts/set-pipelines.sh b/scripts/set-pipelines.sh index 7973387..dbcbf5e 100755 --- a/scripts/set-pipelines.sh +++ b/scripts/set-pipelines.sh @@ -39,12 +39,14 @@ set_pipeline() { set_pipelines() { fly -t "$FLY_TARGET" sync + set_pipeline spring-credhub pipeline.yml 3.3.x set_pipeline spring-credhub pipeline.yml 3.2.x set_pipeline spring-credhub pipeline.yml 3.1.x set_pipeline spring-credhub pipeline.yml 3.0.x set_pipeline spring-credhub pipeline.yml 2.3.x set_pipeline spring-credhub pipeline.yml 2.2.x + set_pipeline spring-credhub-pr pr-pipeline.yml 3.3.x set_pipeline spring-credhub-pr pr-pipeline.yml 3.2.x set_pipeline spring-credhub-pr pr-pipeline.yml 3.1.x set_pipeline spring-credhub-pr pr-pipeline.yml 3.0.x diff --git a/settings.gradle b/settings.gradle index d13d201..4107226 100644 --- a/settings.gradle +++ b/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { id 'io.spring.nohttp' version '0.0.11' id 'io.spring.javaformat' version '0.0.42' id 'org.asciidoctor.jvm.convert' version '3.3.2' - id 'org.springframework.boot' version '3.2.8' + id 'org.springframework.boot' version '3.3.2' } repositories { gradlePluginPortal() @@ -31,8 +31,8 @@ pluginManagement { } plugins { - id 'com.gradle.enterprise' version '3.17.6' - id 'io.spring.ge.conventions' version '0.0.17' + id 'com.gradle.enterprise' version '3.16.2' + id 'io.spring.ge.conventions' version '0.0.15' } dependencyResolutionManagement {