diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml deleted file mode 100644 index b9c6da9f..00000000 --- a/.github/workflows/ci-release.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Spring Cloud CI Job (Commercial Release Branch) - -on: - workflow_dispatch: - inputs: - branches: - description: "Which branch should be built (can be a comma-separated list of branches)" - required: true - default: 'release/5.1.0-M1' - type: string - push: - branches: - - release/5.1.0-M1 - -permissions: - actions: write - contents: read - -jobs: - deploy: - uses: spring-cloud/spring-cloud-github-actions/.github/workflows/deploy.yml@b6a6b1963b8762420526591c3d363bd7d09e7d4b # v1.1.1 - with: - branches: ${{ inputs.branches }} - # Commercial Artifactory only serves runners in the spring-enterprise-builds - # group and refuses anything else with a 403, before authentication is even - # attempted. This branch resolves its dependencies from there, so a - # GitHub-hosted runner will fail no matter how the credentials are set up. - runs_on: ubuntu22-2-8 - # The branches this workflow builds carry -INTERNAL-SNAPSHOT versions until - # release-train-ready stamps the release versions. The antora-component-version - # plugin derives the component version by stripping only -SNAPSHOT, producing - # e.g. 5.0.3-INTERNAL, which @springio/antora-extensions cannot parse. Building - # the docs profile would fail, so it is disabled here. - build_docs: false - secrets: - ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} - ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - COMMERCIAL_ARTIFACTORY_USERNAME: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }} - COMMERCIAL_ARTIFACTORY_PASSWORD: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }} - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml deleted file mode 100644 index 3371c65d..00000000 --- a/.github/workflows/ci.yaml +++ /dev/null @@ -1,34 +0,0 @@ -name: Spring Cloud Build CI Job - -on: - workflow_call: - push: - branches: - - main - - 4.3.x - - # Scheduled builds run daily at midnight UTC - schedule: - - cron: '0 0 * * *' - - # Manual trigger with optional branch override - workflow_dispatch: - inputs: - branches: - description: "Which branch should be built (can be a comma-separated list of branches)" - required: true - default: 'main' - type: string - -jobs: - deploy: - uses: spring-cloud/spring-cloud-github-actions/.github/workflows/deploy.yml@b6a6b1963b8762420526591c3d363bd7d09e7d4b # v1.1.1 - with: - branches: ${{ inputs.branches }} - secrets: - ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }} - ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }} - COMMERCIAL_ARTIFACTORY_USERNAME: ${{ secrets.COMMERCIAL_ARTIFACTORY_USERNAME }} - COMMERCIAL_ARTIFACTORY_PASSWORD: ${{ secrets.COMMERCIAL_ARTIFACTORY_PASSWORD }} - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml deleted file mode 100644 index 71f11885..00000000 --- a/.github/workflows/pr.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: PR - -on: - pull_request: - branches: [ main, 4.3.x ] - -jobs: - build: - uses: spring-cloud/spring-cloud-github-actions/.github/workflows/pr.yml@b6a6b1963b8762420526591c3d363bd7d09e7d4b # v1.1.1 diff --git a/docs/pom.xml b/docs/pom.xml index 2154b1df..7d4afacc 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 5.1.0-INTERNAL-SNAPSHOT + 5.1.0-M1 spring-cloud-build diff --git a/pom.xml b/pom.xml index 55846786..d2f77e70 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build - 5.1.0-INTERNAL-SNAPSHOT + 5.1.0-M1 pom Spring Cloud Parent Spring Cloud parent pom, managing plugins and dependencies for Spring @@ -32,8 +32,8 @@ ${java.version} ${basedir} ${project.artifactId} - 4.2.0-INTERNAL-SNAPSHOT - 5.1.0-INTERNAL-SNAPSHOT + 4.2.0-M2 + 5.1.0-M1 2.4.10 ${project.build.directory}/build-docs ${project.build.directory}/build-docs-classes diff --git a/release-ci-settings.xml b/release-ci-settings.xml deleted file mode 100644 index 07449fc3..00000000 --- a/release-ci-settings.xml +++ /dev/null @@ -1,162 +0,0 @@ - - - - - - - - spring-commercial-snapshot - ${env.COMMERCIAL_ARTIFACTORY_USERNAME} - ${env.COMMERCIAL_ARTIFACTORY_PASSWORD} - - - spring-commercial-release - ${env.COMMERCIAL_ARTIFACTORY_USERNAME} - ${env.COMMERCIAL_ARTIFACTORY_PASSWORD} - - - - repo.spring.io - ${env.COMMERCIAL_ARTIFACTORY_USERNAME} - ${env.COMMERCIAL_ARTIFACTORY_PASSWORD} - - - repo-spring-io-spring-commercial-snapshot - ${env.COMMERCIAL_ARTIFACTORY_USERNAME} - ${env.COMMERCIAL_ARTIFACTORY_PASSWORD} - - - repo-spring-io-spring-commercial-release - ${env.COMMERCIAL_ARTIFACTORY_USERNAME} - ${env.COMMERCIAL_ARTIFACTORY_PASSWORD} - - - - - - - spring - - - spring-commercial-snapshot - Spring Commercial Snapshot Repository - https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-dev-local - - true - - - false - - - - spring-commercial-release - Spring Commercial Release Repository - https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-prod-local - - false - - - - repo-spring-io-spring-commercial-snapshot - Spring Commercial Snapshot Repository On repo.spring.io - https://repo.spring.io/artifactory/spring-commercial-snapshot-remote - - true - - - false - - - - repo-spring-io-spring-commercial-release - Spring Commercial Release Repository On repo.spring.io - https://repo.spring.io/artifactory/spring-commercial-release-remote - - false - - - - - - spring-commercial-snapshot - Spring Commercial Snapshot Repository - https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-dev-local - - true - - - false - - - - spring-commercial-release - Spring Commercial Release Repository - https://usw1.packages.broadcom.com/artifactory/spring-enterprise-maven-prod-local - - false - - - - repo-spring-io-spring-commercial-snapshot - Spring Commercial Snapshot Repository On repo.spring.io - https://repo.spring.io/artifactory/spring-commercial-snapshot-remote - - true - - - false - - - - repo-spring-io-spring-commercial-release - Spring Commercial Release Repository On repo.spring.io - https://repo.spring.io/artifactory/spring-commercial-release-remote - - false - - - - - - - diff --git a/spring-cloud-build-dependencies/pom.xml b/spring-cloud-build-dependencies/pom.xml index 361c0513..510a6364 100644 --- a/spring-cloud-build-dependencies/pom.xml +++ b/spring-cloud-build-dependencies/pom.xml @@ -5,7 +5,7 @@ 4.0.0 org.springframework.cloud spring-cloud-build-dependencies - 5.1.0-INTERNAL-SNAPSHOT + 5.1.0-M1 spring-cloud-build-dependencies pom Spring Cloud Build Dependencies: an internal BOM for use with Spring @@ -14,12 +14,12 @@ org.springframework.boot spring-boot-dependencies - 4.2.0-INTERNAL-SNAPSHOT + 4.2.0-M2 UTF-8 - 4.2.0-INTERNAL-SNAPSHOT + 4.2.0-M2 1980-02-01T00:00:00Z diff --git a/spring-cloud-build-tools/pom.xml b/spring-cloud-build-tools/pom.xml index 6bce0662..0bd9be26 100644 --- a/spring-cloud-build-tools/pom.xml +++ b/spring-cloud-build-tools/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-build - 5.1.0-INTERNAL-SNAPSHOT + 5.1.0-M1 diff --git a/spring-cloud-dependencies-parent/pom.xml b/spring-cloud-dependencies-parent/pom.xml index f25b7059..aaac4ae3 100644 --- a/spring-cloud-dependencies-parent/pom.xml +++ b/spring-cloud-dependencies-parent/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.cloud - 5.1.0-INTERNAL-SNAPSHOT + 5.1.0-M1 spring-cloud-dependencies-parent pom spring-cloud-dependencies-parent