diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 4049ca6..76c1972 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,8 +4,31 @@ updates: directory: "/" schedule: interval: "weekly" - target-branch: "2.4.x" - + target-branch: "2.5.x" + + - package-ecosystem: gradle + directory: "/" + target-branch: "2.5.x" + schedule: + interval: daily + commit-message: + prefix: "(2.5.x)" + labels: + - dependencies + ignore: + - dependency-name: "org.springframework.boot" + update-types: + - "version-update:semver-major" + - "version-update:semver-minor" + - dependency-name: "org.springframework.cloud:spring-cloud-starter-open-service-broker" + update-types: + - "version-update:semver-major" + - "version-update:semver-minor" + - dependency-name: "org.springframework.cloud:spring-cloud-open-service-broker-core" + update-types: + - "version-update:semver-major" + - "version-update:semver-minor" + - package-ecosystem: gradle directory: "/" target-branch: "2.4.x" diff --git a/gradle.properties b/gradle.properties index f9e7ce8..1bbf05b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=2.4.0-SNAPSHOT +version=2.5.0-SNAPSHOT group=org.springframework.cloud onlyShowStandardStreamsOnTestFailure = false diff --git a/scripts/set-pipelines.sh b/scripts/set-pipelines.sh index b5a6032..1afd803 100755 --- a/scripts/set-pipelines.sh +++ b/scripts/set-pipelines.sh @@ -8,7 +8,7 @@ readonly PIPELINE_TYPE=${1:-""} set_branch_pipeline() { local -r pipeline_name="app-broker${PIPELINE_NAME_SUFFIX:+"-$PIPELINE_NAME_SUFFIX"}" - local -r branches=("2.4.x" "2.3.x" "2.2.x" "2.1.x" "2.0.x" "1.6.x") + local -r branches=("2.5.x" "2.4.x" "2.3.x" "2.2.x" "2.1.x" "2.0.x" "1.6.x") for branch in "${branches[@]}"; do echo "Setting $pipeline_name $branch pipeline..." @@ -24,7 +24,7 @@ set_branch_pipeline() { set_pr_manager_pipeline() { local -r pipeline_name="app-broker-pull-requests${PIPELINE_NAME_SUFFIX:+"-$PIPELINE_NAME_SUFFIX"}" - local -r branch="2.3.x" + local -r branch="2.5.x" echo "Setting PR manager pipeline..." diff --git a/settings.gradle b/settings.gradle index 0c7445c..ebacd2a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,12 +2,18 @@ pluginManagement { plugins { id "io.spring.nohttp" version "0.0.11" id "io.spring.javaformat" version "0.0.43" - id 'org.springframework.boot' version "3.4.4" + id 'org.springframework.boot' version "3.5.0-SNAPSHOT" id 'org.asciidoctor.jvm.pdf' version '4.0.4' id 'org.asciidoctor.jvm.convert' version '4.0.4' } repositories { gradlePluginPortal() + if (version =~ /((-M|-RC)[0-9]+|-SNAPSHOT)$/) { + maven { url "https://repo.spring.io/milestone" } + } + if (version.endsWith('-SNAPSHOT')) { + maven { url "https://repo.spring.io/snapshot" } + } } } diff --git a/spring-cloud-app-broker-logging/build.gradle b/spring-cloud-app-broker-logging/build.gradle index 1b8d807..8bc4b02 100644 --- a/spring-cloud-app-broker-logging/build.gradle +++ b/spring-cloud-app-broker-logging/build.gradle @@ -32,4 +32,6 @@ dependencies { testImplementation "org.springframework.boot:spring-boot-starter-test" testImplementation "org.junit.jupiter:junit-jupiter-api" testImplementation "org.awaitility:awaitility" + + testRuntimeOnly "org.junit.platform:junit-platform-launcher" }