diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml new file mode 100644 index 00000000..a422e941 --- /dev/null +++ b/.github/dependabot.yaml @@ -0,0 +1,82 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 + +updates: + - package-ecosystem: "github-actions" + directory: "/" + target-branch: "main" + schedule: + interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + target-branch: "2024.0.x" + schedule: + interval: "weekly" + - package-ecosystem: "github-actions" + directory: "/" + target-branch: "2025.0.x" + schedule: + interval: "weekly" + - package-ecosystem: maven + directory: / + schedule: + interval: daily + ignore: + # JRuby updates are causing docs generation to fail + - dependency-name: "org.jruby:jruby-complete" + - package-ecosystem: maven + directory: / + schedule: + interval: daily + target-branch: main + ignore: + # only upgrade by minor or patch + - dependency-name: "*" + update-types: + - version-update:semver-major + - package-ecosystem: maven + directory: / + schedule: + interval: daily + target-branch: 2024.0.x + ignore: + # only upgrade by minor or patch + - dependency-name: "*" + update-types: + - version-update:semver-major + - version-update:semver-minor + - package-ecosystem: maven + directory: / + schedule: + interval: daily + target-branch: 2025.0.x + ignore: + # only upgrade by minor or patch + - dependency-name: "*" + update-types: + - version-update:semver-major + - version-update:semver-minor + - package-ecosystem: npm + target-branch: docs-build + directory: / + schedule: + interval: weekly + - package-ecosystem: npm + target-branch: main + directory: /docs + schedule: + interval: weekly + - package-ecosystem: npm + target-branch: 2024.0.x + directory: /docs + schedule: + interval: weekly + - package-ecosystem: npm + target-branch: 2025.0.x + directory: /docs + schedule: + interval: weekly diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 833dcbe0..19839c05 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -16,7 +16,7 @@ jobs: # if: github.repository_owner == 'spring-cloud' steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: ref: docs-build fetch-depth: 1 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b400a895..a42c0968 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,9 @@ name: Build on: push: - branches: [ main, 2024.0.x, 2023.0.x ] + branches: [ main, 2025.0.x, 2024.0.x, 2023.0.x ] pull_request: - branches: [ main, 2024.0.x, 2023.0.x ] + branches: [ main, 2025.0.x, 2024.0.x, 2023.0.x ] jobs: build: @@ -15,14 +15,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: 17 distribution: 'temurin' - name: Cache local Maven repository - uses: actions/cache@v4 + uses: actions/cache@v5 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} diff --git a/README.adoc b/README.adoc index 4ab9b3bb..b55257d8 100644 --- a/README.adoc +++ b/README.adoc @@ -142,7 +142,7 @@ Checkstyle rules are *disabled by default*. To add checkstyle to your project ju If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example: -.projectRoot/src/checkstyle/checkstyle-suppresions.xml +.projectRoot/src/checkstyle/checkstyle-suppressions.xml ---- org.springframework.cloud spring-cloud-starter-build - 2024.0.1 + 2025.1.1 jar Spring Cloud Starter Docs @@ -14,10 +14,10 @@ ${basedir}/.. - 3.8.8 - 4.3.1 + 3.9.12 + 4.5.0 2.5.3 - 2.14.0 + 2.21.0 @@ -51,7 +51,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.4.0 + 3.6.1 generate-sources @@ -132,7 +132,6 @@ org.springframework.cloud.internal.GenerateReleaseTrainDocs ${maven.multiModuleProjectDirectory}/spring-cloud-dependencies/pom.xml - ${maven.multiModuleProjectDirectory}/spring-cloud-starter-parent/pom.xml ${project.basedir}/modules/ROOT/pages/ diff --git a/docs/src/main/java/org/springframework/cloud/internal/ArtifactFetcher.java b/docs/src/main/java/org/springframework/cloud/internal/ArtifactFetcher.java index 1b3a6e4c..805eba3e 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/ArtifactFetcher.java +++ b/docs/src/main/java/org/springframework/cloud/internal/ArtifactFetcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-present the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java b/docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java index d51db77b..875e6b35 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java +++ b/docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-present the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/main/java/org/springframework/cloud/internal/ConfigurationProperty.java b/docs/src/main/java/org/springframework/cloud/internal/ConfigurationProperty.java index 14934f1e..92555528 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/ConfigurationProperty.java +++ b/docs/src/main/java/org/springframework/cloud/internal/ConfigurationProperty.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-present the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/main/java/org/springframework/cloud/internal/GenerateReleaseTrainDocs.java b/docs/src/main/java/org/springframework/cloud/internal/GenerateReleaseTrainDocs.java index 612f2b31..c79d5937 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/GenerateReleaseTrainDocs.java +++ b/docs/src/main/java/org/springframework/cloud/internal/GenerateReleaseTrainDocs.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-present the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,15 +31,14 @@ public class GenerateReleaseTrainDocs { public static void main(String... args) { File bomPath = new File(args[0]); - File starterParentPath = new File(args[1]); - File generatedTrainDocs = new File(args[2]); - new GenerateReleaseTrainDocs().generate(bomPath, starterParentPath, generatedTrainDocs); + File generatedTrainDocs = new File(args[1]); + new GenerateReleaseTrainDocs().generate(bomPath, generatedTrainDocs); } - void generate(File bomPath, File starterParentPath, File generatedTrainDocs) { + void generate(File bomPath, File generatedTrainDocs) { List projects = mavenPropertiesToDocsProjects(bomPath); info("Found the following projects [" + projects + "]"); - projects.add(springBootVersion(starterParentPath)); + projects.add(springBootVersion(bomPath)); projects.sort(Comparator.comparing(o -> o.name)); File file = renderAsciidocTemplates(generatedTrainDocs, projects); info("Rendered docs templates to [" + file + "]"); @@ -57,7 +56,8 @@ List mavenPropertiesToDocsProjects(File file) { Project springBootVersion(File file) { Model model = PomReader.readPom(file); - return new Project("spring-boot", model.getParent().getVersion()); + Properties properties = model.getProperties(); + return new Project("spring-boot", properties.getProperty("spring-boot.version")); } File renderAsciidocTemplates(File generatedTrainDocs, List projects) { diff --git a/docs/src/main/java/org/springframework/cloud/internal/HandlebarsHelper.java b/docs/src/main/java/org/springframework/cloud/internal/HandlebarsHelper.java index 093c88a8..b663bb6b 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/HandlebarsHelper.java +++ b/docs/src/main/java/org/springframework/cloud/internal/HandlebarsHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-present the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/main/java/org/springframework/cloud/internal/Logger.java b/docs/src/main/java/org/springframework/cloud/internal/Logger.java index 41cde9be..39708df7 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/Logger.java +++ b/docs/src/main/java/org/springframework/cloud/internal/Logger.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-present the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/main/java/org/springframework/cloud/internal/PomReader.java b/docs/src/main/java/org/springframework/cloud/internal/PomReader.java index 57eb4492..c41243ab 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/PomReader.java +++ b/docs/src/main/java/org/springframework/cloud/internal/PomReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-present the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/main/java/org/springframework/cloud/internal/Project.java b/docs/src/main/java/org/springframework/cloud/internal/Project.java index d6c01cb3..b59568ea 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/Project.java +++ b/docs/src/main/java/org/springframework/cloud/internal/Project.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-present the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/main/java/org/springframework/cloud/internal/TemplateGenerator.java b/docs/src/main/java/org/springframework/cloud/internal/TemplateGenerator.java index 27f3668d..22758bf0 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/TemplateGenerator.java +++ b/docs/src/main/java/org/springframework/cloud/internal/TemplateGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-present the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/main/java/org/springframework/cloud/internal/TemplateProject.java b/docs/src/main/java/org/springframework/cloud/internal/TemplateProject.java index 03c3cac0..9e6948a3 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/TemplateProject.java +++ b/docs/src/main/java/org/springframework/cloud/internal/TemplateProject.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-present the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/main/java/org/springframework/cloud/internal/ZipCategory.java b/docs/src/main/java/org/springframework/cloud/internal/ZipCategory.java index 7d6444e3..f697d19d 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/ZipCategory.java +++ b/docs/src/main/java/org/springframework/cloud/internal/ZipCategory.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-present the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java b/docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java index ce230ee7..b2671663 100644 --- a/docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java +++ b/docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-present the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java b/docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java index 49c675f4..f1f0af3a 100644 --- a/docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java +++ b/docs/src/test/java/org/springframework/cloud/internal/ZipCategoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2020 the original author or authors. + * Copyright 2013-present the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,10 @@ import java.nio.file.Files; import org.assertj.core.api.BDDAssertions; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Fail.fail; + class ZipCategoryTests { @Test @@ -49,7 +50,7 @@ void should_not_allow_malicious_traversal() throws Exception { // when: try { ZipCategory.unzipTo(zipFile, tempDir); - Assertions.fail("Should throw exception"); + fail("Should throw exception"); } catch (Exception e) { BDDAssertions.then(e.getCause()).hasMessageContaining("is trying to leave the target output directory"); diff --git a/docs/src/test/resources/test/pom.xml b/docs/src/test/resources/test/pom.xml index 51938b6b..fdf12196 100644 --- a/docs/src/test/resources/test/pom.xml +++ b/docs/src/test/resources/test/pom.xml @@ -5,11 +5,11 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.2.1 + 5.0.1 spring-cloud-dependencies - 2024.0.1 + 2025.1.1 spring-cloud-dependencies Spring Cloud Dependencies pom diff --git a/pom.xml b/pom.xml index beb41562..ddb71187 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2024.0.1 + 2025.1.1 org.springframework.cloud spring-cloud-build - 4.2.1 + 5.0.1 @@ -20,6 +20,64 @@ scm:git:ssh://git@github.com/spring-cloud/spring-cloud-release.git HEAD + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + + dsyer + Dave Syer + david.syer at broadcom.com + Broadcom, Inc. + https://www.spring.io + + lead + + + + sgibb + Spencer Gibb + spencer.gibb at broadcom.com + Broadcom, Inc. + https://www.spring.io + + lead + + + + mgrzejszczak + Marcin Grzejszczak + >marcin.grzejszczak at broadcom.com + Broadcom, Inc. + https://www.spring.io + + developer + + + + rbaxter + Ryan Baxter + ryan.baxter at broadcom.com + Broadcom, Inc. + https://www.spring.io + + developer + + + + omaciaszeksharma + Olga Maciaszek-Sharma + olga.maciaszek-sharma at broadcom.com + Broadcom, Inc. + https://www.spring.io + + developer + + + starters @@ -27,7 +85,6 @@ spring-cloud-dependencies - spring-cloud-starter-parent docs @@ -46,7 +103,7 @@ - commons-logging:*:* + commons-logging:*:*:*.* true @@ -106,7 +163,6 @@ all spring-cloud-dependencies - spring-cloud-starter-parent docs diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index d918938a..25d4d40e 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,33 +5,35 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.2.1 + 5.0.1 spring-cloud-dependencies - 2024.0.1 + 2025.1.1 spring-cloud-dependencies Spring Cloud Dependencies https://spring.io/projects/spring-cloud pom ${basedir}/../.. - 4.2.1 - 4.2.1 - 4.2.1 - 3.2.1 - 4.2.1 - 4.2.1 - 4.2.1 - 4.2.2 - 4.2.1 - 3.2.1 - 4.2.1 - 4.2.1 - 4.2.1 - 3.2.1 - 4.2.1 - 4.2.1 + + 4.0.2 + 5.0.1 + 5.0.1 + 5.0.1 + 5.0.1 + 5.0.1 + 5.0.1 + 5.0.2 + 5.0.1 + 5.0.1 + 5.0.1 + 5.0.1 + 5.0.1 + 5.0.1 + 5.0.1 + 5.0.1 + 5.0.1 scm:git:git://github.com/spring-cloud/spring-cloud-release.git/spring-cloud-dependencies diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml deleted file mode 100644 index ec6fc78d..00000000 --- a/spring-cloud-starter-parent/pom.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-starter-parent - 3.4.3 - - - org.springframework.cloud - spring-cloud-starter-parent - 2024.0.1 - spring-cloud-starter-parent - Spring Cloud Starter Parent - pom - https://projects.spring.io/spring-cloud - - Pivotal Software, Inc. - https://www.spring.io - - - ${basedir}/../.. - 2024.0.1 - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - https://github.com/spring-cloud - - spring-docs - - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} - - - - repo.spring.io - Spring Release Repository - https://repo.spring.io/libs-release-local - - - repo.spring.io - Spring Snapshot Repository - https://repo.spring.io/libs-snapshot-local - - - - - spring - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - false - - - - spring-releases - Spring Releases - https://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/libs-milestone-local - - false - - - - - - milestone - - - repo.spring.io - Spring Milestone Repository - https://repo.spring.io/libs-milestone-local - - - - - bintray - - - bintray - Jcenter Repository - https://api.bintray.com/maven/spring/jars/org.springframework.cloud:${bintray.package} - - - - - central - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://s01.oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - diff --git a/spring-cloud-starter-parent/src/main/resources/META-INF/spring.provides b/spring-cloud-starter-parent/src/main/resources/META-INF/spring.provides deleted file mode 100644 index 3628be6e..00000000 --- a/spring-cloud-starter-parent/src/main/resources/META-INF/spring.provides +++ /dev/null @@ -1 +0,0 @@ -provides: spring-cloud-config-client \ No newline at end of file