diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b59702b77..f684614fc 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,7 @@ version: 2 updates: - package-ecosystem: "maven" - target-branch: "spring-boot-4" + target-branch: "main" directory: "/" schedule: interval: "daily" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9dc45cfdb..534d8d6a3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,13 +2,13 @@ name: Build on: push: - branches: [ "spring-boot-4" ] + branches: [ "main" ] paths-ignore: - '**.md' - 'docs/**' - '**.adoc' pull_request: - branches: [ "spring-boot-4" ] + branches: [ "main" ] paths-ignore: - '**.md' - 'docs/**' @@ -37,7 +37,7 @@ jobs: - name: Build with Maven run: ./mvnw --no-transfer-progress -B -T 1C install --file pom.xml - - name: Deploy SNAPSHOT to Maven Central (only on push to spring-boot-4 with Java 17) + - name: Deploy SNAPSHOT to Maven Central if: github.event_name == 'push' && matrix.java == 17 run: | MY_POM_VERSION=$(./mvnw -q -DforceStdout help:evaluate -Dexpression=project.version --non-recursive) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index db81d8be7..d355aec5f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,9 +2,9 @@ name: "Code scanning - action" on: push: - branches: [ "spring-boot-4" ] + branches: [ "main" ] pull_request: - branches: [ "spring-boot-4" ] + branches: [ "main" ] schedule: - cron: '0 19 * * 1' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a48f97ba9..383380994 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,7 +12,7 @@ on: - rc - release default: 'release' - branches: ["spring-boot-4"] + branches: [ "main" ] jobs: build: @@ -82,7 +82,7 @@ jobs: if: success() run: . ./CI/prepare-javadocs.sh - - name: Bump SNAPSHOT version + - name: Bump SNAPSHOT version on master (final release only) if: success() && github.event.inputs.release_type == 'release' run: . ./CI/bump-snapshot.sh env: diff --git a/CI/bump-snapshot.sh b/CI/bump-snapshot.sh index 63bc7827b..53581d0be 100644 --- a/CI/bump-snapshot.sh +++ b/CI/bump-snapshot.sh @@ -6,9 +6,9 @@ set -e RELEASE_VERSION="${RELEASE_VERSION:?}" CURRENT_BRANCH=$(git branch --show-current) -if [ "$CURRENT_BRANCH" != "spring-boot-4" ]; then - git checkout spring-boot-4 - git pull origin spring-boot-4 +if [ "$CURRENT_BRANCH" != "main" ]; then + git checkout main + git pull origin main fi # Compute next snapshot version: increment patch, e.g., 3.0.0 -> 3.0.1-SNAPSHOT @@ -33,4 +33,4 @@ git config user.email "action@github.com" git config user.name "GitHub Action" git add -A git commit -m "Bump version to ${NEXT_SNAPSHOT}" -git push origin spring-boot-4 \ No newline at end of file +git push origin main \ No newline at end of file