From 787068c2c93b34c7821bc14d4b1d5aa8b5ce49b1 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 10 Jul 2024 20:25:28 +0000 Subject: [PATCH 01/22] Going back to snapshots --- .../ROOT/pages/_spring-cloud-links.adoc | 32 ++++++++--------- docs/pom.xml | 2 +- docs/src/test/resources/test/pom.xml | 4 +-- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 36 +++++++++---------- spring-cloud-starter-parent/pom.xml | 4 +-- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/modules/ROOT/pages/_spring-cloud-links.adoc b/docs/modules/ROOT/pages/_spring-cloud-links.adoc index 678468b8..a6fccc89 100644 --- a/docs/modules/ROOT/pages/_spring-cloud-links.adoc +++ b/docs/modules/ROOT/pages/_spring-cloud-links.adoc @@ -1,17 +1,17 @@ - https://docs.spring.io/spring-cloud-build/reference/4.1/[spring-cloud-build] :: Reference Documentation, version 4.1.3 - https://docs.spring.io/spring-cloud-bus/reference/4.1/[spring-cloud-bus] :: Reference Documentation, version 4.1.2 - https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.1/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.1.2 - https://docs.spring.io/spring-cloud-commons/reference/4.1/[spring-cloud-commons] :: Reference Documentation, version 4.1.4 - https://docs.spring.io/spring-cloud-config/reference/4.1/[spring-cloud-config] :: Reference Documentation, version 4.1.3 - https://docs.spring.io/spring-cloud-consul/reference/4.1/[spring-cloud-consul] :: Reference Documentation, version 4.1.2 - https://docs.spring.io/spring-cloud-contract/reference/4.1/[spring-cloud-contract] :: Reference Documentation, version 4.1.4 - https://docs.spring.io/spring-cloud-function/reference/4.1/[spring-cloud-function] :: Reference Documentation, version 4.1.3 - https://docs.spring.io/spring-cloud-gateway/reference/4.1/[spring-cloud-gateway] :: Reference Documentation, version 4.1.5 - https://docs.spring.io/spring-cloud-kubernetes/reference/3.1/[spring-cloud-kubernetes] :: Reference Documentation, version 3.1.3 - https://docs.spring.io/spring-cloud-netflix/reference/4.1/[spring-cloud-netflix] :: Reference Documentation, version 4.1.3 - https://docs.spring.io/spring-cloud-openfeign/reference/4.1/[spring-cloud-openfeign] :: Reference Documentation, version 4.1.3 - https://docs.spring.io/spring-cloud-stream/reference/4.1/[spring-cloud-stream] :: Reference Documentation, version 4.1.3 - https://docs.spring.io/spring-cloud-task/reference/3.1/[spring-cloud-task] :: Reference Documentation, version 3.1.2 - https://docs.spring.io/spring-cloud-vault/reference/4.1/[spring-cloud-vault] :: Reference Documentation, version 4.1.3 - https://docs.spring.io/spring-cloud-zookeeper/reference/4.1/[spring-cloud-zookeeper] :: Reference Documentation, version 4.1.2 + https://docs.spring.io/spring-cloud-build/reference/4.1-SNAPSHOT/[spring-cloud-build] :: Reference Documentation, version 4.1.3-SNAPSHOT + https://docs.spring.io/spring-cloud-bus/reference/4.1-SNAPSHOT/[spring-cloud-bus] :: Reference Documentation, version 4.1.2-SNAPSHOT + https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.1-SNAPSHOT/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.1.2-SNAPSHOT + https://docs.spring.io/spring-cloud-commons/reference/4.1-SNAPSHOT/[spring-cloud-commons] :: Reference Documentation, version 4.1.4-SNAPSHOT + https://docs.spring.io/spring-cloud-config/reference/4.1-SNAPSHOT/[spring-cloud-config] :: Reference Documentation, version 4.1.3-SNAPSHOT + https://docs.spring.io/spring-cloud-consul/reference/4.1-SNAPSHOT/[spring-cloud-consul] :: Reference Documentation, version 4.1.2-SNAPSHOT + https://docs.spring.io/spring-cloud-contract/reference/4.1-SNAPSHOT/[spring-cloud-contract] :: Reference Documentation, version 4.1.4-SNAPSHOT + https://docs.spring.io/spring-cloud-function/reference/4.1-SNAPSHOT/[spring-cloud-function] :: Reference Documentation, version 4.1.3-SNAPSHOT + https://docs.spring.io/spring-cloud-gateway/reference/4.1-SNAPSHOT/[spring-cloud-gateway] :: Reference Documentation, version 4.1.5-SNAPSHOT + https://docs.spring.io/spring-cloud-kubernetes/reference/3.1-SNAPSHOT/[spring-cloud-kubernetes] :: Reference Documentation, version 3.1.3-SNAPSHOT + https://docs.spring.io/spring-cloud-netflix/reference/4.1-SNAPSHOT/[spring-cloud-netflix] :: Reference Documentation, version 4.1.3-SNAPSHOT + https://docs.spring.io/spring-cloud-openfeign/reference/4.1-SNAPSHOT/[spring-cloud-openfeign] :: Reference Documentation, version 4.1.3-SNAPSHOT + https://docs.spring.io/spring-cloud-stream/reference/4.1-SNAPSHOT/[spring-cloud-stream] :: Reference Documentation, version 4.1.3-SNAPSHOT + https://docs.spring.io/spring-cloud-task/reference/3.1-SNAPSHOT/[spring-cloud-task] :: Reference Documentation, version 3.1.2-SNAPSHOT + https://docs.spring.io/spring-cloud-vault/reference/4.1-SNAPSHOT/[spring-cloud-vault] :: Reference Documentation, version 4.1.3-SNAPSHOT + https://docs.spring.io/spring-cloud-zookeeper/reference/4.1-SNAPSHOT/[spring-cloud-zookeeper] :: Reference Documentation, version 4.1.2-SNAPSHOT diff --git a/docs/pom.xml b/docs/pom.xml index 7ee77c9b..47f4d20f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2023.0.3 + 2023.0.3-SNAPSHOT jar Spring Cloud Starter Docs diff --git a/docs/src/test/resources/test/pom.xml b/docs/src/test/resources/test/pom.xml index 900714ff..f5650968 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.1.3 + 4.1.3-SNAPSHOT spring-cloud-dependencies - 2023.0.3 + 2023.0.3-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom diff --git a/pom.xml b/pom.xml index 724e14dd..26a42e1c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2023.0.3 + 2023.0.3-SNAPSHOT org.springframework.cloud spring-cloud-build - 4.1.3 + 4.1.3-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index d84eb2b1..bc83ff05 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,33 +5,33 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.1.3 + 4.1.3-SNAPSHOT spring-cloud-dependencies - 2023.0.3 + 2023.0.3-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies https://spring.io/projects/spring-cloud pom ${basedir}/../.. - 4.1.2 - 4.1.3 - 4.1.4 - 3.1.2 - 4.1.3 - 4.1.2 - 4.1.4 - 4.1.3 - 4.1.5 - 3.1.3 - 4.1.3 - 4.1.3 - 4.1.3 - 3.1.2 - 4.1.3 - 4.1.2 + 4.1.2-SNAPSHOT + 4.1.3-SNAPSHOT + 4.1.4-SNAPSHOT + 3.1.2-SNAPSHOT + 4.1.3-SNAPSHOT + 4.1.2-SNAPSHOT + 4.1.4-SNAPSHOT + 4.1.3-SNAPSHOT + 4.1.5-SNAPSHOT + 3.1.3-SNAPSHOT + 4.1.3-SNAPSHOT + 4.1.3-SNAPSHOT + 4.1.3-SNAPSHOT + 3.1.2-SNAPSHOT + 4.1.3-SNAPSHOT + 4.1.2-SNAPSHOT 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 index b57f12ed..8ae093c5 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.3 + 2023.0.3-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -21,7 +21,7 @@ ${basedir}/../.. - 2023.0.3 + 2023.0.3-SNAPSHOT From eeda1ccb1588156c6bd56b0aedef5def3791aee4 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Wed, 10 Jul 2024 20:25:28 +0000 Subject: [PATCH 02/22] Bumping versions to 2023.0.4-SNAPSHOT after release --- docs/pom.xml | 2 +- docs/src/test/resources/test/pom.xml | 4 ++-- pom.xml | 4 ++-- spring-cloud-dependencies/pom.xml | 36 ++++++++++++++-------------- spring-cloud-starter-parent/pom.xml | 4 ++-- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 47f4d20f..832d50ac 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2023.0.3-SNAPSHOT + 2023.0.4-SNAPSHOT jar Spring Cloud Starter Docs diff --git a/docs/src/test/resources/test/pom.xml b/docs/src/test/resources/test/pom.xml index f5650968..01b4eec9 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.1.3-SNAPSHOT + 4.1.4-SNAPSHOT spring-cloud-dependencies - 2023.0.3-SNAPSHOT + 2023.0.4-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom diff --git a/pom.xml b/pom.xml index 26a42e1c..2fb00091 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2023.0.3-SNAPSHOT + 2023.0.4-SNAPSHOT org.springframework.cloud spring-cloud-build - 4.1.3-SNAPSHOT + 4.1.4-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index bc83ff05..416959ad 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,33 +5,33 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.1.3-SNAPSHOT + 4.1.4-SNAPSHOT spring-cloud-dependencies - 2023.0.3-SNAPSHOT + 2023.0.4-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies https://spring.io/projects/spring-cloud pom ${basedir}/../.. - 4.1.2-SNAPSHOT - 4.1.3-SNAPSHOT - 4.1.4-SNAPSHOT - 3.1.2-SNAPSHOT - 4.1.3-SNAPSHOT - 4.1.2-SNAPSHOT - 4.1.4-SNAPSHOT - 4.1.3-SNAPSHOT - 4.1.5-SNAPSHOT - 3.1.3-SNAPSHOT - 4.1.3-SNAPSHOT - 4.1.3-SNAPSHOT - 4.1.3-SNAPSHOT - 3.1.2-SNAPSHOT - 4.1.3-SNAPSHOT - 4.1.2-SNAPSHOT + 4.1.3-SNAPSHOT + 4.1.4-SNAPSHOT + 4.1.5-SNAPSHOT + 3.1.3-SNAPSHOT + 4.1.4-SNAPSHOT + 4.1.3-SNAPSHOT + 4.1.5-SNAPSHOT + 4.1.4-SNAPSHOT + 4.1.6-SNAPSHOT + 3.1.4-SNAPSHOT + 4.1.4-SNAPSHOT + 4.1.4-SNAPSHOT + 4.1.4-SNAPSHOT + 3.1.3-SNAPSHOT + 4.1.4-SNAPSHOT + 4.1.3-SNAPSHOT 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 index 8ae093c5..8b48bd76 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2023.0.3-SNAPSHOT + 2023.0.4-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -21,7 +21,7 @@ ${basedir}/../.. - 2023.0.3-SNAPSHOT + 2023.0.4-SNAPSHOT From 6180ef291f6ec01d97a3e3ad0f71648e08d9821e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 12 Jul 2024 03:32:12 +0000 Subject: [PATCH 03/22] Bumping versions --- .../ROOT/pages/_spring-cloud-links.adoc | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/modules/ROOT/pages/_spring-cloud-links.adoc b/docs/modules/ROOT/pages/_spring-cloud-links.adoc index a6fccc89..3c3ce404 100644 --- a/docs/modules/ROOT/pages/_spring-cloud-links.adoc +++ b/docs/modules/ROOT/pages/_spring-cloud-links.adoc @@ -1,17 +1,17 @@ - https://docs.spring.io/spring-cloud-build/reference/4.1-SNAPSHOT/[spring-cloud-build] :: Reference Documentation, version 4.1.3-SNAPSHOT - https://docs.spring.io/spring-cloud-bus/reference/4.1-SNAPSHOT/[spring-cloud-bus] :: Reference Documentation, version 4.1.2-SNAPSHOT - https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.1-SNAPSHOT/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.1.2-SNAPSHOT - https://docs.spring.io/spring-cloud-commons/reference/4.1-SNAPSHOT/[spring-cloud-commons] :: Reference Documentation, version 4.1.4-SNAPSHOT - https://docs.spring.io/spring-cloud-config/reference/4.1-SNAPSHOT/[spring-cloud-config] :: Reference Documentation, version 4.1.3-SNAPSHOT - https://docs.spring.io/spring-cloud-consul/reference/4.1-SNAPSHOT/[spring-cloud-consul] :: Reference Documentation, version 4.1.2-SNAPSHOT - https://docs.spring.io/spring-cloud-contract/reference/4.1-SNAPSHOT/[spring-cloud-contract] :: Reference Documentation, version 4.1.4-SNAPSHOT - https://docs.spring.io/spring-cloud-function/reference/4.1-SNAPSHOT/[spring-cloud-function] :: Reference Documentation, version 4.1.3-SNAPSHOT - https://docs.spring.io/spring-cloud-gateway/reference/4.1-SNAPSHOT/[spring-cloud-gateway] :: Reference Documentation, version 4.1.5-SNAPSHOT - https://docs.spring.io/spring-cloud-kubernetes/reference/3.1-SNAPSHOT/[spring-cloud-kubernetes] :: Reference Documentation, version 3.1.3-SNAPSHOT - https://docs.spring.io/spring-cloud-netflix/reference/4.1-SNAPSHOT/[spring-cloud-netflix] :: Reference Documentation, version 4.1.3-SNAPSHOT - https://docs.spring.io/spring-cloud-openfeign/reference/4.1-SNAPSHOT/[spring-cloud-openfeign] :: Reference Documentation, version 4.1.3-SNAPSHOT - https://docs.spring.io/spring-cloud-stream/reference/4.1-SNAPSHOT/[spring-cloud-stream] :: Reference Documentation, version 4.1.3-SNAPSHOT - https://docs.spring.io/spring-cloud-task/reference/3.1-SNAPSHOT/[spring-cloud-task] :: Reference Documentation, version 3.1.2-SNAPSHOT - https://docs.spring.io/spring-cloud-vault/reference/4.1-SNAPSHOT/[spring-cloud-vault] :: Reference Documentation, version 4.1.3-SNAPSHOT - https://docs.spring.io/spring-cloud-zookeeper/reference/4.1-SNAPSHOT/[spring-cloud-zookeeper] :: Reference Documentation, version 4.1.2-SNAPSHOT + https://docs.spring.io/spring-cloud-build/reference/4.1-SNAPSHOT/[spring-cloud-build] :: Reference Documentation, version 4.1.4-SNAPSHOT + https://docs.spring.io/spring-cloud-bus/reference/4.1-SNAPSHOT/[spring-cloud-bus] :: Reference Documentation, version 4.1.3-SNAPSHOT + https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.1-SNAPSHOT/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.1.3-SNAPSHOT + https://docs.spring.io/spring-cloud-commons/reference/4.1-SNAPSHOT/[spring-cloud-commons] :: Reference Documentation, version 4.1.5-SNAPSHOT + https://docs.spring.io/spring-cloud-config/reference/4.1-SNAPSHOT/[spring-cloud-config] :: Reference Documentation, version 4.1.4-SNAPSHOT + https://docs.spring.io/spring-cloud-consul/reference/4.1-SNAPSHOT/[spring-cloud-consul] :: Reference Documentation, version 4.1.3-SNAPSHOT + https://docs.spring.io/spring-cloud-contract/reference/4.1-SNAPSHOT/[spring-cloud-contract] :: Reference Documentation, version 4.1.5-SNAPSHOT + https://docs.spring.io/spring-cloud-function/reference/4.1-SNAPSHOT/[spring-cloud-function] :: Reference Documentation, version 4.1.4-SNAPSHOT + https://docs.spring.io/spring-cloud-gateway/reference/4.1-SNAPSHOT/[spring-cloud-gateway] :: Reference Documentation, version 4.1.6-SNAPSHOT + https://docs.spring.io/spring-cloud-kubernetes/reference/3.1-SNAPSHOT/[spring-cloud-kubernetes] :: Reference Documentation, version 3.1.4-SNAPSHOT + https://docs.spring.io/spring-cloud-netflix/reference/4.1-SNAPSHOT/[spring-cloud-netflix] :: Reference Documentation, version 4.1.4-SNAPSHOT + https://docs.spring.io/spring-cloud-openfeign/reference/4.1-SNAPSHOT/[spring-cloud-openfeign] :: Reference Documentation, version 4.1.4-SNAPSHOT + https://docs.spring.io/spring-cloud-stream/reference/4.1-SNAPSHOT/[spring-cloud-stream] :: Reference Documentation, version 4.1.4-SNAPSHOT + https://docs.spring.io/spring-cloud-task/reference/3.1-SNAPSHOT/[spring-cloud-task] :: Reference Documentation, version 3.1.3-SNAPSHOT + https://docs.spring.io/spring-cloud-vault/reference/4.1-SNAPSHOT/[spring-cloud-vault] :: Reference Documentation, version 4.1.4-SNAPSHOT + https://docs.spring.io/spring-cloud-zookeeper/reference/4.1-SNAPSHOT/[spring-cloud-zookeeper] :: Reference Documentation, version 4.1.3-SNAPSHOT From 84b37bf42d42212b1edd6842ade94e7115688ed0 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 23 Jul 2024 03:32:34 +0000 Subject: [PATCH 04/22] Bumping versions --- .../ConfigurationPropertiesAggregator.java | 32 ++++++++++--------- .../internal/GenerateReleaseTrainDocs.java | 8 +++-- .../cloud/internal/TemplateGenerator.java | 8 +++-- .../GenerateReleaseTrainDocsTests.java | 13 ++++---- 4 files changed, 35 insertions(+), 26 deletions(-) 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 8a2ff145..d51db77b 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java +++ b/docs/src/main/java/org/springframework/cloud/internal/ConfigurationPropertiesAggregator.java @@ -34,21 +34,23 @@ List mergedConfigurationProperties(Path unpackedDocs) { try { return Files.walk(unpackedDocs).filter(path -> path.endsWith("_configprops.adoc")).flatMap(path -> { try { - return Files.readAllLines(path).stream() - .filter(s -> !StringUtils.isEmpty(s) && !wordsToIgnore.contains(s)).map(s -> { - // |foo|bar|baz -> foo|bar|baz -> split -> - // foo,bar,baz - String[] strings = s.substring(1).split("\\|"); - if (strings.length == 3) { - return new ConfigurationProperty(strings[0].trim(), - strings[1].trim().replace("`", ""), strings[2].trim()); - } - else if (strings.length == 2) { - return new ConfigurationProperty(strings[0].trim(), - strings[1].trim().replace("`", ""), ""); - } - return new ConfigurationProperty(strings[0].trim(), "", ""); - }); + return Files.readAllLines(path) + .stream() + .filter(s -> !StringUtils.isEmpty(s) && !wordsToIgnore.contains(s)) + .map(s -> { + // |foo|bar|baz -> foo|bar|baz -> split -> + // foo,bar,baz + String[] strings = s.substring(1).split("\\|"); + if (strings.length == 3) { + return new ConfigurationProperty(strings[0].trim(), strings[1].trim().replace("`", ""), + strings[2].trim()); + } + else if (strings.length == 2) { + return new ConfigurationProperty(strings[0].trim(), strings[1].trim().replace("`", ""), + ""); + } + return new ConfigurationProperty(strings[0].trim(), "", ""); + }); } catch (IOException e) { throw new IllegalStateException(e); 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 bfb7d470..612f2b31 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/GenerateReleaseTrainDocs.java +++ b/docs/src/main/java/org/springframework/cloud/internal/GenerateReleaseTrainDocs.java @@ -48,9 +48,11 @@ void generate(File bomPath, File starterParentPath, File generatedTrainDocs) { List mavenPropertiesToDocsProjects(File file) { Model model = PomReader.readPom(file); Properties properties = model.getProperties(); - return properties.entrySet().stream().filter(e -> e.getKey().toString().endsWith(".version")) - .map(e -> new Project(e.getKey().toString().replace(".version", ""), e.getValue().toString())) - .collect(Collectors.toCollection(LinkedList::new)); + return properties.entrySet() + .stream() + .filter(e -> e.getKey().toString().endsWith(".version")) + .map(e -> new Project(e.getKey().toString().replace(".version", ""), e.getValue().toString())) + .collect(Collectors.toCollection(LinkedList::new)); } Project springBootVersion(File file) { 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 05135684..27f3668d 100644 --- a/docs/src/main/java/org/springframework/cloud/internal/TemplateGenerator.java +++ b/docs/src/main/java/org/springframework/cloud/internal/TemplateGenerator.java @@ -55,8 +55,12 @@ File generate(List projects) { Template template = template(templateFile.getName().replace(".hbs", "")); Map map = new HashMap<>(); map.put("projects", projects); - map.put("springBootVersion", projects.stream().filter(project -> project.name.equals("spring-boot")) - .findFirst().orElse(new Project("spring-boot", "")).getVersion()); + map.put("springBootVersion", + projects.stream() + .filter(project -> project.name.equals("spring-boot")) + .findFirst() + .orElse(new Project("spring-boot", "")) + .getVersion()); map.put("springCloudProjects", templateProjects); String applied = template.apply(map); Files.write(outputFile.toPath(), applied.getBytes()); 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 555e5d03..ce230ee7 100644 --- a/docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java +++ b/docs/src/test/java/org/springframework/cloud/internal/GenerateReleaseTrainDocsTests.java @@ -34,12 +34,13 @@ void should_return_a_list_of_docs_modules_to_download() throws URISyntaxExceptio List projects = new GenerateReleaseTrainDocs().mavenPropertiesToDocsProjects(testPom); - BDDAssertions.then(projects).extracting("name").containsOnly("spring-cloud-foo-bus", "spring-cloud-foo-build", - "spring-cloud-foo-commons", "spring-cloud-foo-circuitbreaker", "spring-cloud-foo-config", - "spring-cloud-foo-consul", "spring-cloud-foo-contract", "spring-cloud-foo-function", - "spring-cloud-foo-gateway", "spring-cloud-foo-kubernetes", "spring-cloud-foo-netflix", - "spring-cloud-foo-openfeign", "spring-cloud-foo-task", "spring-cloud-foo-vault", - "spring-cloud-foo-zookeeper"); + BDDAssertions.then(projects) + .extracting("name") + .containsOnly("spring-cloud-foo-bus", "spring-cloud-foo-build", "spring-cloud-foo-commons", + "spring-cloud-foo-circuitbreaker", "spring-cloud-foo-config", "spring-cloud-foo-consul", + "spring-cloud-foo-contract", "spring-cloud-foo-function", "spring-cloud-foo-gateway", + "spring-cloud-foo-kubernetes", "spring-cloud-foo-netflix", "spring-cloud-foo-openfeign", + "spring-cloud-foo-task", "spring-cloud-foo-vault", "spring-cloud-foo-zookeeper"); BDDAssertions.then(projects).contains(new Project("spring-cloud-foo-bus", "2.2.3.RELEASE")); } From 613784f16d3d5b304aacf9f41e523295675d8400 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 26 Jul 2024 19:18:24 +0000 Subject: [PATCH 05/22] Bumping versions --- docs/modules/ROOT/pages/index.adoc | 2 +- spring-cloud-starter-parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index f47226c6..b019aac2 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -1,6 +1,6 @@ = Spring Cloud Train Reference Documentation -:spring-boot-version: 3.2.7 +:spring-boot-version: 3.2.8 Spring Cloud provides tools for developers to quickly build some of the common patterns in distributed systems (e.g. configuration diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 8b48bd76..c0971ef9 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.7 + 3.2.8 org.springframework.cloud From 5a4fffeafa1c8fec05a482bc5f297d45861a7e77 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 5 Aug 2024 10:34:31 -0400 Subject: [PATCH 06/22] Updates project versions for 2024.0 --- docs/pom.xml | 2 +- docs/src/test/resources/test/pom.xml | 4 ++-- pom.xml | 4 ++-- spring-cloud-dependencies/pom.xml | 36 ++++++++++++++-------------- spring-cloud-starter-parent/pom.xml | 6 ++--- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 832d50ac..cbb06d52 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2023.0.4-SNAPSHOT + 2024.0.0-SNAPSHOT jar Spring Cloud Starter Docs diff --git a/docs/src/test/resources/test/pom.xml b/docs/src/test/resources/test/pom.xml index 01b4eec9..b8f7f7c6 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.1.4-SNAPSHOT + 4.2.0-SNAPSHOT spring-cloud-dependencies - 2023.0.4-SNAPSHOT + 2024.0.0-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom diff --git a/pom.xml b/pom.xml index 2fb00091..3686df57 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2023.0.4-SNAPSHOT + 2024.0.0-SNAPSHOT org.springframework.cloud spring-cloud-build - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index 416959ad..fe7e8189 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,33 +5,33 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.1.4-SNAPSHOT + 4.2.0-SNAPSHOT spring-cloud-dependencies - 2023.0.4-SNAPSHOT + 2024.0.0-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies https://spring.io/projects/spring-cloud pom ${basedir}/../.. - 4.1.3-SNAPSHOT - 4.1.4-SNAPSHOT - 4.1.5-SNAPSHOT - 3.1.3-SNAPSHOT - 4.1.4-SNAPSHOT - 4.1.3-SNAPSHOT - 4.1.5-SNAPSHOT - 4.1.4-SNAPSHOT - 4.1.6-SNAPSHOT - 3.1.4-SNAPSHOT - 4.1.4-SNAPSHOT - 4.1.4-SNAPSHOT - 4.1.4-SNAPSHOT - 3.1.3-SNAPSHOT - 4.1.4-SNAPSHOT - 4.1.3-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 3.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 3.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 3.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT 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 index c0971ef9..b201ac39 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,12 +5,12 @@ org.springframework.boot spring-boot-starter-parent - 3.2.8 + 3.4.0-M1 org.springframework.cloud spring-cloud-starter-parent - 2023.0.4-SNAPSHOT + 2024.0.0-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -21,7 +21,7 @@ ${basedir}/../.. - 2023.0.4-SNAPSHOT + 2024.0.0-SNAPSHOT From d1f9d8356a1d346882c736b322419ae6980128e7 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 9 Aug 2024 05:21:58 +0000 Subject: [PATCH 07/22] Bumping versions --- .../ROOT/pages/_spring-cloud-links.adoc | 32 +++++++++---------- docs/modules/ROOT/pages/index.adoc | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/modules/ROOT/pages/_spring-cloud-links.adoc b/docs/modules/ROOT/pages/_spring-cloud-links.adoc index 3c3ce404..61477d02 100644 --- a/docs/modules/ROOT/pages/_spring-cloud-links.adoc +++ b/docs/modules/ROOT/pages/_spring-cloud-links.adoc @@ -1,17 +1,17 @@ - https://docs.spring.io/spring-cloud-build/reference/4.1-SNAPSHOT/[spring-cloud-build] :: Reference Documentation, version 4.1.4-SNAPSHOT - https://docs.spring.io/spring-cloud-bus/reference/4.1-SNAPSHOT/[spring-cloud-bus] :: Reference Documentation, version 4.1.3-SNAPSHOT - https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.1-SNAPSHOT/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.1.3-SNAPSHOT - https://docs.spring.io/spring-cloud-commons/reference/4.1-SNAPSHOT/[spring-cloud-commons] :: Reference Documentation, version 4.1.5-SNAPSHOT - https://docs.spring.io/spring-cloud-config/reference/4.1-SNAPSHOT/[spring-cloud-config] :: Reference Documentation, version 4.1.4-SNAPSHOT - https://docs.spring.io/spring-cloud-consul/reference/4.1-SNAPSHOT/[spring-cloud-consul] :: Reference Documentation, version 4.1.3-SNAPSHOT - https://docs.spring.io/spring-cloud-contract/reference/4.1-SNAPSHOT/[spring-cloud-contract] :: Reference Documentation, version 4.1.5-SNAPSHOT - https://docs.spring.io/spring-cloud-function/reference/4.1-SNAPSHOT/[spring-cloud-function] :: Reference Documentation, version 4.1.4-SNAPSHOT - https://docs.spring.io/spring-cloud-gateway/reference/4.1-SNAPSHOT/[spring-cloud-gateway] :: Reference Documentation, version 4.1.6-SNAPSHOT - https://docs.spring.io/spring-cloud-kubernetes/reference/3.1-SNAPSHOT/[spring-cloud-kubernetes] :: Reference Documentation, version 3.1.4-SNAPSHOT - https://docs.spring.io/spring-cloud-netflix/reference/4.1-SNAPSHOT/[spring-cloud-netflix] :: Reference Documentation, version 4.1.4-SNAPSHOT - https://docs.spring.io/spring-cloud-openfeign/reference/4.1-SNAPSHOT/[spring-cloud-openfeign] :: Reference Documentation, version 4.1.4-SNAPSHOT - https://docs.spring.io/spring-cloud-stream/reference/4.1-SNAPSHOT/[spring-cloud-stream] :: Reference Documentation, version 4.1.4-SNAPSHOT - https://docs.spring.io/spring-cloud-task/reference/3.1-SNAPSHOT/[spring-cloud-task] :: Reference Documentation, version 3.1.3-SNAPSHOT - https://docs.spring.io/spring-cloud-vault/reference/4.1-SNAPSHOT/[spring-cloud-vault] :: Reference Documentation, version 4.1.4-SNAPSHOT - https://docs.spring.io/spring-cloud-zookeeper/reference/4.1-SNAPSHOT/[spring-cloud-zookeeper] :: Reference Documentation, version 4.1.3-SNAPSHOT + https://docs.spring.io/spring-cloud-build/reference/4.2-SNAPSHOT/[spring-cloud-build] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-bus/reference/4.2-SNAPSHOT/[spring-cloud-bus] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2-SNAPSHOT/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-commons/reference/4.2-SNAPSHOT/[spring-cloud-commons] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-config/reference/4.2-SNAPSHOT/[spring-cloud-config] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-consul/reference/4.2-SNAPSHOT/[spring-cloud-consul] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-contract/reference/4.2-SNAPSHOT/[spring-cloud-contract] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-function/reference/4.2-SNAPSHOT/[spring-cloud-function] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-gateway/reference/4.2-SNAPSHOT/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-kubernetes/reference/3.2-SNAPSHOT/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-netflix/reference/4.2-SNAPSHOT/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-openfeign/reference/4.2-SNAPSHOT/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-stream/reference/4.2-SNAPSHOT/[spring-cloud-stream] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-task/reference/3.2-SNAPSHOT/[spring-cloud-task] :: Reference Documentation, version 3.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-vault/reference/4.2-SNAPSHOT/[spring-cloud-vault] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-zookeeper/reference/4.2-SNAPSHOT/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0-SNAPSHOT diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index b019aac2..f55978fc 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -1,6 +1,6 @@ = Spring Cloud Train Reference Documentation -:spring-boot-version: 3.2.8 +:spring-boot-version: 3.4.0-M1 Spring Cloud provides tools for developers to quickly build some of the common patterns in distributed systems (e.g. configuration From 3834b44e5fa4d6f8526a16bbb8655bf4ed1babfb Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 19 Aug 2024 23:07:04 +0000 Subject: [PATCH 08/22] Update SNAPSHOT to 2024.0.0-M1 --- .../ROOT/pages/_spring-cloud-links.adoc | 32 ++++++++--------- docs/pom.xml | 2 +- docs/src/test/resources/test/pom.xml | 4 +-- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 36 +++++++++---------- spring-cloud-starter-parent/pom.xml | 4 +-- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/modules/ROOT/pages/_spring-cloud-links.adoc b/docs/modules/ROOT/pages/_spring-cloud-links.adoc index 61477d02..09db878a 100644 --- a/docs/modules/ROOT/pages/_spring-cloud-links.adoc +++ b/docs/modules/ROOT/pages/_spring-cloud-links.adoc @@ -1,17 +1,17 @@ - https://docs.spring.io/spring-cloud-build/reference/4.2-SNAPSHOT/[spring-cloud-build] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-bus/reference/4.2-SNAPSHOT/[spring-cloud-bus] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2-SNAPSHOT/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-commons/reference/4.2-SNAPSHOT/[spring-cloud-commons] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-config/reference/4.2-SNAPSHOT/[spring-cloud-config] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-consul/reference/4.2-SNAPSHOT/[spring-cloud-consul] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-contract/reference/4.2-SNAPSHOT/[spring-cloud-contract] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-function/reference/4.2-SNAPSHOT/[spring-cloud-function] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-gateway/reference/4.2-SNAPSHOT/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-kubernetes/reference/3.2-SNAPSHOT/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-netflix/reference/4.2-SNAPSHOT/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-openfeign/reference/4.2-SNAPSHOT/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-stream/reference/4.2-SNAPSHOT/[spring-cloud-stream] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-task/reference/3.2-SNAPSHOT/[spring-cloud-task] :: Reference Documentation, version 3.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-vault/reference/4.2-SNAPSHOT/[spring-cloud-vault] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-zookeeper/reference/4.2-SNAPSHOT/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-build/reference/4.2/[spring-cloud-build] :: Reference Documentation, version 4.2.0-M1 + https://docs.spring.io/spring-cloud-bus/reference/4.2/[spring-cloud-bus] :: Reference Documentation, version 4.2.0-M1 + https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0-M1 + https://docs.spring.io/spring-cloud-commons/reference/4.2/[spring-cloud-commons] :: Reference Documentation, version 4.2.0-M1 + https://docs.spring.io/spring-cloud-config/reference/4.2/[spring-cloud-config] :: Reference Documentation, version 4.2.0-M1 + https://docs.spring.io/spring-cloud-consul/reference/4.2/[spring-cloud-consul] :: Reference Documentation, version 4.2.0-M1 + https://docs.spring.io/spring-cloud-contract/reference/4.2/[spring-cloud-contract] :: Reference Documentation, version 4.2.0-M1 + https://docs.spring.io/spring-cloud-function/reference/4.2/[spring-cloud-function] :: Reference Documentation, version 4.2.0-M1 + https://docs.spring.io/spring-cloud-gateway/reference/4.2/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0-M1 + https://docs.spring.io/spring-cloud-kubernetes/reference/3.2/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0-M1 + https://docs.spring.io/spring-cloud-netflix/reference/4.2/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0-M1 + https://docs.spring.io/spring-cloud-openfeign/reference/4.2/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0-M1 + https://docs.spring.io/spring-cloud-stream/reference/4.2/[spring-cloud-stream] :: Reference Documentation, version 4.2.0-M1 + https://docs.spring.io/spring-cloud-task/reference/3.2/[spring-cloud-task] :: Reference Documentation, version 3.2.0-M1 + https://docs.spring.io/spring-cloud-vault/reference/4.2/[spring-cloud-vault] :: Reference Documentation, version 4.2.0-M1 + https://docs.spring.io/spring-cloud-zookeeper/reference/4.2/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0-M1 diff --git a/docs/pom.xml b/docs/pom.xml index cbb06d52..e082da79 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2024.0.0-SNAPSHOT + 2024.0.0-M1 jar Spring Cloud Starter Docs diff --git a/docs/src/test/resources/test/pom.xml b/docs/src/test/resources/test/pom.xml index b8f7f7c6..d9468a42 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.0-SNAPSHOT + 4.2.0-M1 spring-cloud-dependencies - 2024.0.0-SNAPSHOT + 2024.0.0-M1 spring-cloud-dependencies Spring Cloud Dependencies pom diff --git a/pom.xml b/pom.xml index 3686df57..bcad9eb2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2024.0.0-SNAPSHOT + 2024.0.0-M1 org.springframework.cloud spring-cloud-build - 4.2.0-SNAPSHOT + 4.2.0-M1 diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index fe7e8189..a11e6d0e 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,33 +5,33 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.2.0-SNAPSHOT + 4.2.0-M1 spring-cloud-dependencies - 2024.0.0-SNAPSHOT + 2024.0.0-M1 spring-cloud-dependencies Spring Cloud Dependencies https://spring.io/projects/spring-cloud pom ${basedir}/../.. - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 3.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 3.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 3.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT + 4.2.0-M1 + 4.2.0-M1 + 4.2.0-M1 + 3.2.0-M1 + 4.2.0-M1 + 4.2.0-M1 + 4.2.0-M1 + 4.2.0-M1 + 4.2.0-M1 + 3.2.0-M1 + 4.2.0-M1 + 4.2.0-M1 + 4.2.0-M1 + 3.2.0-M1 + 4.2.0-M1 + 4.2.0-M1 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 index b201ac39..8ed58ec9 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2024.0.0-SNAPSHOT + 2024.0.0-M1 spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -21,7 +21,7 @@ ${basedir}/../.. - 2024.0.0-SNAPSHOT + 2024.0.0-M1 From 0a8cf2f5305472cd5c6a1d6b7f69bad8c38ef297 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Mon, 19 Aug 2024 23:07:22 +0000 Subject: [PATCH 09/22] Going back to snapshots --- .../ROOT/pages/_spring-cloud-links.adoc | 32 ++++++++--------- docs/pom.xml | 2 +- docs/src/test/resources/test/pom.xml | 4 +-- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 36 +++++++++---------- spring-cloud-starter-parent/pom.xml | 4 +-- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/modules/ROOT/pages/_spring-cloud-links.adoc b/docs/modules/ROOT/pages/_spring-cloud-links.adoc index 09db878a..61477d02 100644 --- a/docs/modules/ROOT/pages/_spring-cloud-links.adoc +++ b/docs/modules/ROOT/pages/_spring-cloud-links.adoc @@ -1,17 +1,17 @@ - https://docs.spring.io/spring-cloud-build/reference/4.2/[spring-cloud-build] :: Reference Documentation, version 4.2.0-M1 - https://docs.spring.io/spring-cloud-bus/reference/4.2/[spring-cloud-bus] :: Reference Documentation, version 4.2.0-M1 - https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0-M1 - https://docs.spring.io/spring-cloud-commons/reference/4.2/[spring-cloud-commons] :: Reference Documentation, version 4.2.0-M1 - https://docs.spring.io/spring-cloud-config/reference/4.2/[spring-cloud-config] :: Reference Documentation, version 4.2.0-M1 - https://docs.spring.io/spring-cloud-consul/reference/4.2/[spring-cloud-consul] :: Reference Documentation, version 4.2.0-M1 - https://docs.spring.io/spring-cloud-contract/reference/4.2/[spring-cloud-contract] :: Reference Documentation, version 4.2.0-M1 - https://docs.spring.io/spring-cloud-function/reference/4.2/[spring-cloud-function] :: Reference Documentation, version 4.2.0-M1 - https://docs.spring.io/spring-cloud-gateway/reference/4.2/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0-M1 - https://docs.spring.io/spring-cloud-kubernetes/reference/3.2/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0-M1 - https://docs.spring.io/spring-cloud-netflix/reference/4.2/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0-M1 - https://docs.spring.io/spring-cloud-openfeign/reference/4.2/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0-M1 - https://docs.spring.io/spring-cloud-stream/reference/4.2/[spring-cloud-stream] :: Reference Documentation, version 4.2.0-M1 - https://docs.spring.io/spring-cloud-task/reference/3.2/[spring-cloud-task] :: Reference Documentation, version 3.2.0-M1 - https://docs.spring.io/spring-cloud-vault/reference/4.2/[spring-cloud-vault] :: Reference Documentation, version 4.2.0-M1 - https://docs.spring.io/spring-cloud-zookeeper/reference/4.2/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0-M1 + https://docs.spring.io/spring-cloud-build/reference/4.2-SNAPSHOT/[spring-cloud-build] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-bus/reference/4.2-SNAPSHOT/[spring-cloud-bus] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2-SNAPSHOT/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-commons/reference/4.2-SNAPSHOT/[spring-cloud-commons] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-config/reference/4.2-SNAPSHOT/[spring-cloud-config] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-consul/reference/4.2-SNAPSHOT/[spring-cloud-consul] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-contract/reference/4.2-SNAPSHOT/[spring-cloud-contract] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-function/reference/4.2-SNAPSHOT/[spring-cloud-function] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-gateway/reference/4.2-SNAPSHOT/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-kubernetes/reference/3.2-SNAPSHOT/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-netflix/reference/4.2-SNAPSHOT/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-openfeign/reference/4.2-SNAPSHOT/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-stream/reference/4.2-SNAPSHOT/[spring-cloud-stream] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-task/reference/3.2-SNAPSHOT/[spring-cloud-task] :: Reference Documentation, version 3.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-vault/reference/4.2-SNAPSHOT/[spring-cloud-vault] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-zookeeper/reference/4.2-SNAPSHOT/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0-SNAPSHOT diff --git a/docs/pom.xml b/docs/pom.xml index e082da79..cbb06d52 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2024.0.0-M1 + 2024.0.0-SNAPSHOT jar Spring Cloud Starter Docs diff --git a/docs/src/test/resources/test/pom.xml b/docs/src/test/resources/test/pom.xml index d9468a42..b8f7f7c6 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.0-M1 + 4.2.0-SNAPSHOT spring-cloud-dependencies - 2024.0.0-M1 + 2024.0.0-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom diff --git a/pom.xml b/pom.xml index bcad9eb2..3686df57 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2024.0.0-M1 + 2024.0.0-SNAPSHOT org.springframework.cloud spring-cloud-build - 4.2.0-M1 + 4.2.0-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index a11e6d0e..fe7e8189 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,33 +5,33 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.2.0-M1 + 4.2.0-SNAPSHOT spring-cloud-dependencies - 2024.0.0-M1 + 2024.0.0-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies https://spring.io/projects/spring-cloud pom ${basedir}/../.. - 4.2.0-M1 - 4.2.0-M1 - 4.2.0-M1 - 3.2.0-M1 - 4.2.0-M1 - 4.2.0-M1 - 4.2.0-M1 - 4.2.0-M1 - 4.2.0-M1 - 3.2.0-M1 - 4.2.0-M1 - 4.2.0-M1 - 4.2.0-M1 - 3.2.0-M1 - 4.2.0-M1 - 4.2.0-M1 + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 3.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 3.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 3.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT 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 index 8ed58ec9..b201ac39 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2024.0.0-M1 + 2024.0.0-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -21,7 +21,7 @@ ${basedir}/../.. - 2024.0.0-M1 + 2024.0.0-SNAPSHOT From 570c08fcb89847c7fff0c8e7221156d5a9c3672c Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 23 Aug 2024 18:24:05 +0000 Subject: [PATCH 10/22] Bumping versions --- docs/modules/ROOT/pages/index.adoc | 2 +- spring-cloud-starter-parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index f55978fc..7d8db754 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -1,6 +1,6 @@ = Spring Cloud Train Reference Documentation -:spring-boot-version: 3.4.0-M1 +:spring-boot-version: 3.4.0-M2 Spring Cloud provides tools for developers to quickly build some of the common patterns in distributed systems (e.g. configuration diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index b201ac39..8ee36558 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-M1 + 3.4.0-M2 org.springframework.cloud From bca9e457540dad72d487d6e986f609712912a7b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 17:14:40 +0000 Subject: [PATCH 11/22] Bump commons-io:commons-io from 2.11.0 to 2.14.0 in /docs Bumps commons-io:commons-io from 2.11.0 to 2.14.0. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index cbb06d52..c188c163 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -17,7 +17,7 @@ 3.8.5 4.3.0 2.5.3 - 2.11.0 + 2.14.0 From c3cd6357893c3c961304be7dcd00b7d6119aa96d Mon Sep 17 00:00:00 2001 From: spencergibb Date: Mon, 7 Oct 2024 13:42:15 -0400 Subject: [PATCH 12/22] Updates boot version to 3.4.0-M3 --- docs/modules/ROOT/pages/index.adoc | 2 +- spring-cloud-starter-parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 7d8db754..3089c091 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -1,6 +1,6 @@ = Spring Cloud Train Reference Documentation -:spring-boot-version: 3.4.0-M2 +:spring-boot-version: 3.4.0-M3 Spring Cloud provides tools for developers to quickly build some of the common patterns in distributed systems (e.g. configuration diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index 8ee36558..e15a6be0 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-M2 + 3.4.0-M3 org.springframework.cloud From 6d6e91ea8d60eea4367ec0aa0c29c7f95c05f256 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 8 Oct 2024 17:23:27 +0000 Subject: [PATCH 13/22] Update SNAPSHOT to 2024.0.0-M2 --- .../ROOT/pages/_spring-cloud-links.adoc | 32 ++++++++--------- docs/pom.xml | 2 +- docs/src/test/resources/test/pom.xml | 4 +-- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 36 +++++++++---------- spring-cloud-starter-parent/pom.xml | 4 +-- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/modules/ROOT/pages/_spring-cloud-links.adoc b/docs/modules/ROOT/pages/_spring-cloud-links.adoc index 61477d02..799f0837 100644 --- a/docs/modules/ROOT/pages/_spring-cloud-links.adoc +++ b/docs/modules/ROOT/pages/_spring-cloud-links.adoc @@ -1,17 +1,17 @@ - https://docs.spring.io/spring-cloud-build/reference/4.2-SNAPSHOT/[spring-cloud-build] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-bus/reference/4.2-SNAPSHOT/[spring-cloud-bus] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2-SNAPSHOT/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-commons/reference/4.2-SNAPSHOT/[spring-cloud-commons] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-config/reference/4.2-SNAPSHOT/[spring-cloud-config] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-consul/reference/4.2-SNAPSHOT/[spring-cloud-consul] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-contract/reference/4.2-SNAPSHOT/[spring-cloud-contract] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-function/reference/4.2-SNAPSHOT/[spring-cloud-function] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-gateway/reference/4.2-SNAPSHOT/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-kubernetes/reference/3.2-SNAPSHOT/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-netflix/reference/4.2-SNAPSHOT/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-openfeign/reference/4.2-SNAPSHOT/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-stream/reference/4.2-SNAPSHOT/[spring-cloud-stream] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-task/reference/3.2-SNAPSHOT/[spring-cloud-task] :: Reference Documentation, version 3.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-vault/reference/4.2-SNAPSHOT/[spring-cloud-vault] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-zookeeper/reference/4.2-SNAPSHOT/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-build/reference/4.2/[spring-cloud-build] :: Reference Documentation, version 4.2.0-M2 + https://docs.spring.io/spring-cloud-bus/reference/4.2/[spring-cloud-bus] :: Reference Documentation, version 4.2.0-M2 + https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0-M2 + https://docs.spring.io/spring-cloud-commons/reference/4.2/[spring-cloud-commons] :: Reference Documentation, version 4.2.0-M2 + https://docs.spring.io/spring-cloud-config/reference/4.2/[spring-cloud-config] :: Reference Documentation, version 4.2.0-M2 + https://docs.spring.io/spring-cloud-consul/reference/4.2/[spring-cloud-consul] :: Reference Documentation, version 4.2.0-M2 + https://docs.spring.io/spring-cloud-contract/reference/4.2/[spring-cloud-contract] :: Reference Documentation, version 4.2.0-M2 + https://docs.spring.io/spring-cloud-function/reference/4.2/[spring-cloud-function] :: Reference Documentation, version 4.2.0-M2 + https://docs.spring.io/spring-cloud-gateway/reference/4.2/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0-M2 + https://docs.spring.io/spring-cloud-kubernetes/reference/3.2/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0-M2 + https://docs.spring.io/spring-cloud-netflix/reference/4.2/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0-M2 + https://docs.spring.io/spring-cloud-openfeign/reference/4.2/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0-M2 + https://docs.spring.io/spring-cloud-stream/reference/4.2/[spring-cloud-stream] :: Reference Documentation, version 4.2.0-M2 + https://docs.spring.io/spring-cloud-task/reference/3.2/[spring-cloud-task] :: Reference Documentation, version 3.2.0-M2 + https://docs.spring.io/spring-cloud-vault/reference/4.2/[spring-cloud-vault] :: Reference Documentation, version 4.2.0-M2 + https://docs.spring.io/spring-cloud-zookeeper/reference/4.2/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0-M2 diff --git a/docs/pom.xml b/docs/pom.xml index c188c163..a4cf8c6b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2024.0.0-SNAPSHOT + 2024.0.0-M2 jar Spring Cloud Starter Docs diff --git a/docs/src/test/resources/test/pom.xml b/docs/src/test/resources/test/pom.xml index b8f7f7c6..39d42a69 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.0-SNAPSHOT + 4.2.0-M2 spring-cloud-dependencies - 2024.0.0-SNAPSHOT + 2024.0.0-M2 spring-cloud-dependencies Spring Cloud Dependencies pom diff --git a/pom.xml b/pom.xml index 3686df57..bf02eb98 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2024.0.0-SNAPSHOT + 2024.0.0-M2 org.springframework.cloud spring-cloud-build - 4.2.0-SNAPSHOT + 4.2.0-M2 diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index fe7e8189..a0a054ad 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,33 +5,33 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.2.0-SNAPSHOT + 4.2.0-M2 spring-cloud-dependencies - 2024.0.0-SNAPSHOT + 2024.0.0-M2 spring-cloud-dependencies Spring Cloud Dependencies https://spring.io/projects/spring-cloud pom ${basedir}/../.. - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 3.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 3.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 3.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT + 4.2.0-M2 + 4.2.0-M2 + 4.2.0-M2 + 3.2.0-M2 + 4.2.0-M2 + 4.2.0-M2 + 4.2.0-M2 + 4.2.0-M2 + 4.2.0-M2 + 3.2.0-M2 + 4.2.0-M2 + 4.2.0-M2 + 4.2.0-M2 + 3.2.0-M2 + 4.2.0-M2 + 4.2.0-M2 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 index e15a6be0..82c0555d 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2024.0.0-SNAPSHOT + 2024.0.0-M2 spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -21,7 +21,7 @@ ${basedir}/../.. - 2024.0.0-SNAPSHOT + 2024.0.0-M2 From d073f9599490a7ff1df046f1a4f9ecae5e72c3bc Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 8 Oct 2024 17:23:45 +0000 Subject: [PATCH 14/22] Going back to snapshots --- .../ROOT/pages/_spring-cloud-links.adoc | 32 ++++++++--------- docs/pom.xml | 2 +- docs/src/test/resources/test/pom.xml | 4 +-- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 36 +++++++++---------- spring-cloud-starter-parent/pom.xml | 4 +-- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/modules/ROOT/pages/_spring-cloud-links.adoc b/docs/modules/ROOT/pages/_spring-cloud-links.adoc index 799f0837..61477d02 100644 --- a/docs/modules/ROOT/pages/_spring-cloud-links.adoc +++ b/docs/modules/ROOT/pages/_spring-cloud-links.adoc @@ -1,17 +1,17 @@ - https://docs.spring.io/spring-cloud-build/reference/4.2/[spring-cloud-build] :: Reference Documentation, version 4.2.0-M2 - https://docs.spring.io/spring-cloud-bus/reference/4.2/[spring-cloud-bus] :: Reference Documentation, version 4.2.0-M2 - https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0-M2 - https://docs.spring.io/spring-cloud-commons/reference/4.2/[spring-cloud-commons] :: Reference Documentation, version 4.2.0-M2 - https://docs.spring.io/spring-cloud-config/reference/4.2/[spring-cloud-config] :: Reference Documentation, version 4.2.0-M2 - https://docs.spring.io/spring-cloud-consul/reference/4.2/[spring-cloud-consul] :: Reference Documentation, version 4.2.0-M2 - https://docs.spring.io/spring-cloud-contract/reference/4.2/[spring-cloud-contract] :: Reference Documentation, version 4.2.0-M2 - https://docs.spring.io/spring-cloud-function/reference/4.2/[spring-cloud-function] :: Reference Documentation, version 4.2.0-M2 - https://docs.spring.io/spring-cloud-gateway/reference/4.2/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0-M2 - https://docs.spring.io/spring-cloud-kubernetes/reference/3.2/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0-M2 - https://docs.spring.io/spring-cloud-netflix/reference/4.2/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0-M2 - https://docs.spring.io/spring-cloud-openfeign/reference/4.2/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0-M2 - https://docs.spring.io/spring-cloud-stream/reference/4.2/[spring-cloud-stream] :: Reference Documentation, version 4.2.0-M2 - https://docs.spring.io/spring-cloud-task/reference/3.2/[spring-cloud-task] :: Reference Documentation, version 3.2.0-M2 - https://docs.spring.io/spring-cloud-vault/reference/4.2/[spring-cloud-vault] :: Reference Documentation, version 4.2.0-M2 - https://docs.spring.io/spring-cloud-zookeeper/reference/4.2/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0-M2 + https://docs.spring.io/spring-cloud-build/reference/4.2-SNAPSHOT/[spring-cloud-build] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-bus/reference/4.2-SNAPSHOT/[spring-cloud-bus] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2-SNAPSHOT/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-commons/reference/4.2-SNAPSHOT/[spring-cloud-commons] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-config/reference/4.2-SNAPSHOT/[spring-cloud-config] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-consul/reference/4.2-SNAPSHOT/[spring-cloud-consul] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-contract/reference/4.2-SNAPSHOT/[spring-cloud-contract] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-function/reference/4.2-SNAPSHOT/[spring-cloud-function] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-gateway/reference/4.2-SNAPSHOT/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-kubernetes/reference/3.2-SNAPSHOT/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-netflix/reference/4.2-SNAPSHOT/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-openfeign/reference/4.2-SNAPSHOT/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-stream/reference/4.2-SNAPSHOT/[spring-cloud-stream] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-task/reference/3.2-SNAPSHOT/[spring-cloud-task] :: Reference Documentation, version 3.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-vault/reference/4.2-SNAPSHOT/[spring-cloud-vault] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-zookeeper/reference/4.2-SNAPSHOT/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0-SNAPSHOT diff --git a/docs/pom.xml b/docs/pom.xml index a4cf8c6b..c188c163 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2024.0.0-M2 + 2024.0.0-SNAPSHOT jar Spring Cloud Starter Docs diff --git a/docs/src/test/resources/test/pom.xml b/docs/src/test/resources/test/pom.xml index 39d42a69..b8f7f7c6 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.0-M2 + 4.2.0-SNAPSHOT spring-cloud-dependencies - 2024.0.0-M2 + 2024.0.0-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom diff --git a/pom.xml b/pom.xml index bf02eb98..3686df57 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2024.0.0-M2 + 2024.0.0-SNAPSHOT org.springframework.cloud spring-cloud-build - 4.2.0-M2 + 4.2.0-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index a0a054ad..fe7e8189 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,33 +5,33 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.2.0-M2 + 4.2.0-SNAPSHOT spring-cloud-dependencies - 2024.0.0-M2 + 2024.0.0-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies https://spring.io/projects/spring-cloud pom ${basedir}/../.. - 4.2.0-M2 - 4.2.0-M2 - 4.2.0-M2 - 3.2.0-M2 - 4.2.0-M2 - 4.2.0-M2 - 4.2.0-M2 - 4.2.0-M2 - 4.2.0-M2 - 3.2.0-M2 - 4.2.0-M2 - 4.2.0-M2 - 4.2.0-M2 - 3.2.0-M2 - 4.2.0-M2 - 4.2.0-M2 + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 3.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 3.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 3.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT 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 index 82c0555d..e15a6be0 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2024.0.0-M2 + 2024.0.0-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -21,7 +21,7 @@ ${basedir}/../.. - 2024.0.0-M2 + 2024.0.0-SNAPSHOT From 2f30b6142699f34da7de047eb8501879557b3854 Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 11 Oct 2024 12:02:38 -0400 Subject: [PATCH 15/22] Updates boot version to 3.4.0-SNAPSHOT --- docs/modules/ROOT/pages/index.adoc | 2 +- spring-cloud-starter-parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 3089c091..26079a2e 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -1,6 +1,6 @@ = Spring Cloud Train Reference Documentation -:spring-boot-version: 3.4.0-M3 +:spring-boot-version: 3.4.0-SNAPSHOT Spring Cloud provides tools for developers to quickly build some of the common patterns in distributed systems (e.g. configuration diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index e15a6be0..bd797a77 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-M3 + 3.4.0-SNAPSHOT org.springframework.cloud From 8c8a88973f0c5166c388d12ef068c77aa2362727 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Fri, 8 Nov 2024 16:59:32 +0000 Subject: [PATCH 16/22] Update SNAPSHOT to 2024.0.0-RC1 --- .../ROOT/pages/_spring-cloud-links.adoc | 32 ++++++++--------- docs/modules/ROOT/pages/index.adoc | 2 +- docs/pom.xml | 2 +- docs/src/test/resources/test/pom.xml | 4 +-- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 36 +++++++++---------- spring-cloud-starter-parent/pom.xml | 6 ++-- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/docs/modules/ROOT/pages/_spring-cloud-links.adoc b/docs/modules/ROOT/pages/_spring-cloud-links.adoc index 61477d02..622f5d0b 100644 --- a/docs/modules/ROOT/pages/_spring-cloud-links.adoc +++ b/docs/modules/ROOT/pages/_spring-cloud-links.adoc @@ -1,17 +1,17 @@ - https://docs.spring.io/spring-cloud-build/reference/4.2-SNAPSHOT/[spring-cloud-build] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-bus/reference/4.2-SNAPSHOT/[spring-cloud-bus] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2-SNAPSHOT/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-commons/reference/4.2-SNAPSHOT/[spring-cloud-commons] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-config/reference/4.2-SNAPSHOT/[spring-cloud-config] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-consul/reference/4.2-SNAPSHOT/[spring-cloud-consul] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-contract/reference/4.2-SNAPSHOT/[spring-cloud-contract] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-function/reference/4.2-SNAPSHOT/[spring-cloud-function] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-gateway/reference/4.2-SNAPSHOT/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-kubernetes/reference/3.2-SNAPSHOT/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-netflix/reference/4.2-SNAPSHOT/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-openfeign/reference/4.2-SNAPSHOT/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-stream/reference/4.2-SNAPSHOT/[spring-cloud-stream] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-task/reference/3.2-SNAPSHOT/[spring-cloud-task] :: Reference Documentation, version 3.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-vault/reference/4.2-SNAPSHOT/[spring-cloud-vault] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-zookeeper/reference/4.2-SNAPSHOT/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-build/reference/4.2/[spring-cloud-build] :: Reference Documentation, version 4.2.0-RC1 + https://docs.spring.io/spring-cloud-bus/reference/4.2/[spring-cloud-bus] :: Reference Documentation, version 4.2.0-RC1 + https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0-RC1 + https://docs.spring.io/spring-cloud-commons/reference/4.2/[spring-cloud-commons] :: Reference Documentation, version 4.2.0-RC1 + https://docs.spring.io/spring-cloud-config/reference/4.2/[spring-cloud-config] :: Reference Documentation, version 4.2.0-RC1 + https://docs.spring.io/spring-cloud-consul/reference/4.2/[spring-cloud-consul] :: Reference Documentation, version 4.2.0-RC1 + https://docs.spring.io/spring-cloud-contract/reference/4.2/[spring-cloud-contract] :: Reference Documentation, version 4.2.0-RC1 + https://docs.spring.io/spring-cloud-function/reference/4.2/[spring-cloud-function] :: Reference Documentation, version 4.2.0-RC1 + https://docs.spring.io/spring-cloud-gateway/reference/4.2/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0-RC1 + https://docs.spring.io/spring-cloud-kubernetes/reference/3.2/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0-RC1 + https://docs.spring.io/spring-cloud-netflix/reference/4.2/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0-RC1 + https://docs.spring.io/spring-cloud-openfeign/reference/4.2/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0-RC1 + https://docs.spring.io/spring-cloud-stream/reference/4.2/[spring-cloud-stream] :: Reference Documentation, version 4.2.0-RC1 + https://docs.spring.io/spring-cloud-task/reference/3.2/[spring-cloud-task] :: Reference Documentation, version 3.2.0-RC1 + https://docs.spring.io/spring-cloud-vault/reference/4.2/[spring-cloud-vault] :: Reference Documentation, version 4.2.0-RC1 + https://docs.spring.io/spring-cloud-zookeeper/reference/4.2/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0-RC1 diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 26079a2e..2da3739b 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -1,6 +1,6 @@ = Spring Cloud Train Reference Documentation -:spring-boot-version: 3.4.0-SNAPSHOT +:spring-boot-version: 3.4.0-RC1 Spring Cloud provides tools for developers to quickly build some of the common patterns in distributed systems (e.g. configuration diff --git a/docs/pom.xml b/docs/pom.xml index c188c163..3d5bd35c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2024.0.0-SNAPSHOT + 2024.0.0-RC1 jar Spring Cloud Starter Docs diff --git a/docs/src/test/resources/test/pom.xml b/docs/src/test/resources/test/pom.xml index b8f7f7c6..5f7df823 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.0-SNAPSHOT + 4.2.0-RC1 spring-cloud-dependencies - 2024.0.0-SNAPSHOT + 2024.0.0-RC1 spring-cloud-dependencies Spring Cloud Dependencies pom diff --git a/pom.xml b/pom.xml index 3686df57..e6ff36fd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2024.0.0-SNAPSHOT + 2024.0.0-RC1 org.springframework.cloud spring-cloud-build - 4.2.0-SNAPSHOT + 4.2.0-RC1 diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index fe7e8189..de5818c1 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,33 +5,33 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.2.0-SNAPSHOT + 4.2.0-RC1 spring-cloud-dependencies - 2024.0.0-SNAPSHOT + 2024.0.0-RC1 spring-cloud-dependencies Spring Cloud Dependencies https://spring.io/projects/spring-cloud pom ${basedir}/../.. - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 3.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 3.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 3.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT + 4.2.0-RC1 + 4.2.0-RC1 + 4.2.0-RC1 + 3.2.0-RC1 + 4.2.0-RC1 + 4.2.0-RC1 + 4.2.0-RC1 + 4.2.0-RC1 + 4.2.0-RC1 + 3.2.0-RC1 + 4.2.0-RC1 + 4.2.0-RC1 + 4.2.0-RC1 + 3.2.0-RC1 + 4.2.0-RC1 + 4.2.0-RC1 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 index bd797a77..2c6ca1a5 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,12 +5,12 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.4.0-RC1 org.springframework.cloud spring-cloud-starter-parent - 2024.0.0-SNAPSHOT + 2024.0.0-RC1 spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -21,7 +21,7 @@ ${basedir}/../.. - 2024.0.0-SNAPSHOT + 2024.0.0-RC1 From aaafee71f71e4c188b1e01fc7ff0a16e06200807 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Fri, 8 Nov 2024 16:59:50 +0000 Subject: [PATCH 17/22] Going back to snapshots --- .../ROOT/pages/_spring-cloud-links.adoc | 32 ++++++++--------- docs/modules/ROOT/pages/index.adoc | 2 +- docs/pom.xml | 2 +- docs/src/test/resources/test/pom.xml | 4 +-- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 36 +++++++++---------- spring-cloud-starter-parent/pom.xml | 6 ++-- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/docs/modules/ROOT/pages/_spring-cloud-links.adoc b/docs/modules/ROOT/pages/_spring-cloud-links.adoc index 622f5d0b..61477d02 100644 --- a/docs/modules/ROOT/pages/_spring-cloud-links.adoc +++ b/docs/modules/ROOT/pages/_spring-cloud-links.adoc @@ -1,17 +1,17 @@ - https://docs.spring.io/spring-cloud-build/reference/4.2/[spring-cloud-build] :: Reference Documentation, version 4.2.0-RC1 - https://docs.spring.io/spring-cloud-bus/reference/4.2/[spring-cloud-bus] :: Reference Documentation, version 4.2.0-RC1 - https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0-RC1 - https://docs.spring.io/spring-cloud-commons/reference/4.2/[spring-cloud-commons] :: Reference Documentation, version 4.2.0-RC1 - https://docs.spring.io/spring-cloud-config/reference/4.2/[spring-cloud-config] :: Reference Documentation, version 4.2.0-RC1 - https://docs.spring.io/spring-cloud-consul/reference/4.2/[spring-cloud-consul] :: Reference Documentation, version 4.2.0-RC1 - https://docs.spring.io/spring-cloud-contract/reference/4.2/[spring-cloud-contract] :: Reference Documentation, version 4.2.0-RC1 - https://docs.spring.io/spring-cloud-function/reference/4.2/[spring-cloud-function] :: Reference Documentation, version 4.2.0-RC1 - https://docs.spring.io/spring-cloud-gateway/reference/4.2/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0-RC1 - https://docs.spring.io/spring-cloud-kubernetes/reference/3.2/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0-RC1 - https://docs.spring.io/spring-cloud-netflix/reference/4.2/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0-RC1 - https://docs.spring.io/spring-cloud-openfeign/reference/4.2/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0-RC1 - https://docs.spring.io/spring-cloud-stream/reference/4.2/[spring-cloud-stream] :: Reference Documentation, version 4.2.0-RC1 - https://docs.spring.io/spring-cloud-task/reference/3.2/[spring-cloud-task] :: Reference Documentation, version 3.2.0-RC1 - https://docs.spring.io/spring-cloud-vault/reference/4.2/[spring-cloud-vault] :: Reference Documentation, version 4.2.0-RC1 - https://docs.spring.io/spring-cloud-zookeeper/reference/4.2/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0-RC1 + https://docs.spring.io/spring-cloud-build/reference/4.2-SNAPSHOT/[spring-cloud-build] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-bus/reference/4.2-SNAPSHOT/[spring-cloud-bus] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2-SNAPSHOT/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-commons/reference/4.2-SNAPSHOT/[spring-cloud-commons] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-config/reference/4.2-SNAPSHOT/[spring-cloud-config] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-consul/reference/4.2-SNAPSHOT/[spring-cloud-consul] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-contract/reference/4.2-SNAPSHOT/[spring-cloud-contract] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-function/reference/4.2-SNAPSHOT/[spring-cloud-function] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-gateway/reference/4.2-SNAPSHOT/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-kubernetes/reference/3.2-SNAPSHOT/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-netflix/reference/4.2-SNAPSHOT/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-openfeign/reference/4.2-SNAPSHOT/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-stream/reference/4.2-SNAPSHOT/[spring-cloud-stream] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-task/reference/3.2-SNAPSHOT/[spring-cloud-task] :: Reference Documentation, version 3.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-vault/reference/4.2-SNAPSHOT/[spring-cloud-vault] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-zookeeper/reference/4.2-SNAPSHOT/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0-SNAPSHOT diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 2da3739b..26079a2e 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -1,6 +1,6 @@ = Spring Cloud Train Reference Documentation -:spring-boot-version: 3.4.0-RC1 +:spring-boot-version: 3.4.0-SNAPSHOT Spring Cloud provides tools for developers to quickly build some of the common patterns in distributed systems (e.g. configuration diff --git a/docs/pom.xml b/docs/pom.xml index 3d5bd35c..c188c163 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2024.0.0-RC1 + 2024.0.0-SNAPSHOT jar Spring Cloud Starter Docs diff --git a/docs/src/test/resources/test/pom.xml b/docs/src/test/resources/test/pom.xml index 5f7df823..b8f7f7c6 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.0-RC1 + 4.2.0-SNAPSHOT spring-cloud-dependencies - 2024.0.0-RC1 + 2024.0.0-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies pom diff --git a/pom.xml b/pom.xml index e6ff36fd..3686df57 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2024.0.0-RC1 + 2024.0.0-SNAPSHOT org.springframework.cloud spring-cloud-build - 4.2.0-RC1 + 4.2.0-SNAPSHOT diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index de5818c1..fe7e8189 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,33 +5,33 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.2.0-RC1 + 4.2.0-SNAPSHOT spring-cloud-dependencies - 2024.0.0-RC1 + 2024.0.0-SNAPSHOT spring-cloud-dependencies Spring Cloud Dependencies https://spring.io/projects/spring-cloud pom ${basedir}/../.. - 4.2.0-RC1 - 4.2.0-RC1 - 4.2.0-RC1 - 3.2.0-RC1 - 4.2.0-RC1 - 4.2.0-RC1 - 4.2.0-RC1 - 4.2.0-RC1 - 4.2.0-RC1 - 3.2.0-RC1 - 4.2.0-RC1 - 4.2.0-RC1 - 4.2.0-RC1 - 3.2.0-RC1 - 4.2.0-RC1 - 4.2.0-RC1 + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 3.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 3.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 3.2.0-SNAPSHOT + 4.2.0-SNAPSHOT + 4.2.0-SNAPSHOT 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 index 2c6ca1a5..bd797a77 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,12 +5,12 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-RC1 + 3.4.0-SNAPSHOT org.springframework.cloud spring-cloud-starter-parent - 2024.0.0-RC1 + 2024.0.0-SNAPSHOT spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -21,7 +21,7 @@ ${basedir}/../.. - 2024.0.0-RC1 + 2024.0.0-SNAPSHOT From 7b2744aca92263d2ea5503a3f083a15cc820c79a Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Mon, 11 Nov 2024 10:18:46 -0500 Subject: [PATCH 18/22] Fix Readme.adoc contributing section Currently the section shows unresolvable link. Signed-off-by: Glenn Renfro --- README.adoc | 241 ++++++++++++++++++++++++++++- docs/src/main/asciidoc/README.adoc | 2 +- 2 files changed, 241 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 0ab3a0c5..9c113169 100644 --- a/README.adoc +++ b/README.adoc @@ -31,7 +31,246 @@ IMPORTANT: If you're releasing milestones don't forget to add `-Pmilestone` and == Contributing -Unresolved directive in - include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[] +:spring-cloud-build-branch: main + +Spring Cloud is released under the non-restrictive Apache 2.0 license, +and follows a very standard Github development process, using Github +tracker for issues and merging pull requests into main. If you want +to contribute even something trivial please do not hesitate, but +follow the guidelines below. + +[[sign-the-contributor-license-agreement]] +== Sign the Contributor License Agreement + +Before we accept a non-trivial patch or pull request we will need you to sign the +https://cla.pivotal.io/sign/spring[Contributor License Agreement]. +Signing the contributor's agreement does not grant anyone commit rights to the main +repository, but it does mean that we can accept your contributions, and you will get an +author credit if we do. Active contributors might be asked to join the core team, and +given the ability to merge pull requests. + +[[code-of-conduct]] +== Code of Conduct +This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/src/main/asciidoc/code-of-conduct.adoc[code of +conduct]. By participating, you are expected to uphold this code. Please report +unacceptable behavior to spring-code-of-conduct@pivotal.io. + +[[code-conventions-and-housekeeping]] +== Code Conventions and Housekeeping +None of these is essential for a pull request, but they will all help. They can also be +added after the original pull request but before a merge. + +* Use the Spring Framework code format conventions. If you use Eclipse + you can import formatter settings using the + `eclipse-code-formatter.xml` file from the + https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring + Cloud Build] project. If using IntelliJ, you can use the + https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter + Plugin] to import the same file. +* Make sure all new `.java` files to have a simple Javadoc class comment with at least an + `@author` tag identifying you, and preferably at least a paragraph on what the class is + for. +* Add the ASF license header comment to all new `.java` files (copy from existing files + in the project) +* Add yourself as an `@author` to the .java files that you modify substantially (more + than cosmetic changes). +* Add some Javadocs and, if you change the namespace, some XSD doc elements. +* A few unit tests would help a lot as well -- someone has to do it. +* If no-one else is using your branch, please rebase it against the current main (or + other target branch in the main project). +* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], + if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit + message (where XXXX is the issue number). + +[[checkstyle]] +== Checkstyle + +Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are: + +.spring-cloud-build-tools/ +---- +└── src +    ├── checkstyle +    │   └── checkstyle-suppressions.xml <3> +    └── main +    └── resources +    ├── checkstyle-header.txt <2> +    └── checkstyle.xml <1> +---- +<1> Default Checkstyle rules +<2> File header setup +<3> Default suppression rules + +[[checkstyle-configuration]] +=== Checkstyle configuration + +Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins. + +.pom.xml +---- + +true <1> + true + <2> + true + <3> + + + + + <4> + io.spring.javaformat + spring-javaformat-maven-plugin + + <5> + org.apache.maven.plugins + maven-checkstyle-plugin + + + + + + <5> + org.apache.maven.plugins + maven-checkstyle-plugin + + + + +---- +<1> Fails the build upon Checkstyle errors +<2> Fails the build upon Checkstyle violations +<3> Checkstyle analyzes also the test sources +<4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules +<5> Add checkstyle plugin to your build and reporting phases + +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 +---- + + + + + + +---- + +It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script: + +```bash +$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/.editorconfig -o .editorconfig +$ touch .springformat +``` + +[[ide-setup]] +== IDE setup + +[[intellij-idea]] +=== Intellij IDEA + +In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin. +The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/main/spring-cloud-build-tools[Spring Cloud Build] project. + +.spring-cloud-build-tools/ +---- +└── src +    ├── checkstyle +    │   └── checkstyle-suppressions.xml <3> +    └── main +    └── resources +    ├── checkstyle-header.txt <2> +    ├── checkstyle.xml <1> +    └── intellij +       ├── Intellij_Project_Defaults.xml <4> +       └── Intellij_Spring_Boot_Java_Conventions.xml <5> +---- +<1> Default Checkstyle rules +<2> File header setup +<3> Default suppression rules +<4> Project defaults for Intellij that apply most of Checkstyle rules +<5> Project style conventions for Intellij that apply most of Checkstyle rules + +.Code style + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/modules/ROOT/assets/images/intellij-code-style.png[Code style] + +Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file. + +.Inspection profiles + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/modules/ROOT/assets/images/intellij-inspections.png[Code style] + +Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file. + +.Checkstyle + +To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions + +image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/modules/ROOT/assets/images/intellij-checkstyle.png[Checkstyle] + +Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables: + +- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL. +- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL. +- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`. + +IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources. + +[[duplicate-finder]] +== Duplicate Finder + +Spring Cloud Build brings along the `basepom:duplicate-finder-maven-plugin`, that enables flagging duplicate and conflicting classes and resources on the java classpath. + +[[duplicate-finder-configuration]] +=== Duplicate Finder configuration + +Duplicate finder is *enabled by default* and will run in the `verify` phase of your Maven build, but it will only take effect in your project if you add the `duplicate-finder-maven-plugin` to the `build` section of the projecst's `pom.xml`. + +.pom.xml +[source,xml] +---- + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + +---- + +For other properties, we have set defaults as listed in the https://github.com/basepom/duplicate-finder-maven-plugin/wiki[plugin documentation]. + +You can easily override them but setting the value of the selected property prefixed with `duplicate-finder-maven-plugin`. For example, set `duplicate-finder-maven-plugin.skip` to `true` in order to skip duplicates check in your build. + +If you need to add `ignoredClassPatterns` or `ignoredResourcePatterns` to your setup, make sure to add them in the plugin configuration section of your project: + +[source,xml] +---- + + + + org.basepom.maven + duplicate-finder-maven-plugin + + + org.joda.time.base.BaseDateTime + .*module-info + + + changelog.txt + + + + + + + +---- + == Building and Deploying diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index d273d6e9..e3359aeb 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -2,7 +2,7 @@ include::intro.adoc[] == Contributing -include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[] +include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/refs/heads/main/docs/modules/ROOT/partials/contributing.adoc[] == Building and Deploying From ac80bf2096a6a29ff13185dabbd6bee7198ccd6e Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 19 Nov 2024 15:46:20 +0100 Subject: [PATCH 19/22] Update CONTRIBUTING.md --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index eb9a16ae..7292195b 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -17,7 +17,7 @@ given the ability to merge pull requests. ## Code of Conduct This project adheres to the Contributor Covenant [code of -conduct](https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc). By participating, you are expected to uphold this code. Please report +conduct](https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/modules/ROOT/partials/code-of-conduct.adoc). By participating, you are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io. ## Code Conventions and Housekeeping From e3aecb4d99a9885cabce48176e5cf65b7ea5a4b8 Mon Sep 17 00:00:00 2001 From: spring-builds Date: Wed, 20 Nov 2024 05:22:22 +0000 Subject: [PATCH 20/22] Bumping versions --- README.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.adoc b/README.adoc index 9c113169..e0b6427e 100644 --- a/README.adoc +++ b/README.adoc @@ -51,9 +51,9 @@ given the ability to merge pull requests. [[code-of-conduct]] == Code of Conduct -This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/src/main/asciidoc/code-of-conduct.adoc[code of +This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/modules/ROOT/partials/code-of-conduct.adoc[code of conduct]. By participating, you are expected to uphold this code. Please report -unacceptable behavior to spring-code-of-conduct@pivotal.io. +unacceptable behavior to code-of-conduct@spring.io. [[code-conventions-and-housekeeping]] == Code Conventions and Housekeeping From dad6c7aacae118f85344ce3e51238ab167e342ee Mon Sep 17 00:00:00 2001 From: spring-builds Date: Fri, 22 Nov 2024 15:17:07 +0000 Subject: [PATCH 21/22] Bumping versions --- docs/modules/ROOT/pages/index.adoc | 2 +- spring-cloud-starter-parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 26079a2e..b154aea9 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -1,6 +1,6 @@ = Spring Cloud Train Reference Documentation -:spring-boot-version: 3.4.0-SNAPSHOT +:spring-boot-version: 3.4.0 Spring Cloud provides tools for developers to quickly build some of the common patterns in distributed systems (e.g. configuration diff --git a/spring-cloud-starter-parent/pom.xml b/spring-cloud-starter-parent/pom.xml index bd797a77..ed00290d 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.0-SNAPSHOT + 3.4.0 org.springframework.cloud From b8c0cc7433dad01e622395a0f36fbd58ad3171ff Mon Sep 17 00:00:00 2001 From: spring-builds Date: Tue, 3 Dec 2024 06:43:27 +0000 Subject: [PATCH 22/22] Update SNAPSHOT to 2024.0.0 --- .../ROOT/pages/_spring-cloud-links.adoc | 32 ++++++++--------- docs/pom.xml | 2 +- docs/src/test/resources/test/pom.xml | 4 +-- pom.xml | 4 +-- spring-cloud-dependencies/pom.xml | 36 +++++++++---------- spring-cloud-starter-parent/pom.xml | 4 +-- 6 files changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/modules/ROOT/pages/_spring-cloud-links.adoc b/docs/modules/ROOT/pages/_spring-cloud-links.adoc index 61477d02..656c86cb 100644 --- a/docs/modules/ROOT/pages/_spring-cloud-links.adoc +++ b/docs/modules/ROOT/pages/_spring-cloud-links.adoc @@ -1,17 +1,17 @@ - https://docs.spring.io/spring-cloud-build/reference/4.2-SNAPSHOT/[spring-cloud-build] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-bus/reference/4.2-SNAPSHOT/[spring-cloud-bus] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2-SNAPSHOT/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-commons/reference/4.2-SNAPSHOT/[spring-cloud-commons] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-config/reference/4.2-SNAPSHOT/[spring-cloud-config] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-consul/reference/4.2-SNAPSHOT/[spring-cloud-consul] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-contract/reference/4.2-SNAPSHOT/[spring-cloud-contract] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-function/reference/4.2-SNAPSHOT/[spring-cloud-function] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-gateway/reference/4.2-SNAPSHOT/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-kubernetes/reference/3.2-SNAPSHOT/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-netflix/reference/4.2-SNAPSHOT/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-openfeign/reference/4.2-SNAPSHOT/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-stream/reference/4.2-SNAPSHOT/[spring-cloud-stream] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-task/reference/3.2-SNAPSHOT/[spring-cloud-task] :: Reference Documentation, version 3.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-vault/reference/4.2-SNAPSHOT/[spring-cloud-vault] :: Reference Documentation, version 4.2.0-SNAPSHOT - https://docs.spring.io/spring-cloud-zookeeper/reference/4.2-SNAPSHOT/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0-SNAPSHOT + https://docs.spring.io/spring-cloud-build/reference/4.2/[spring-cloud-build] :: Reference Documentation, version 4.2.0 + https://docs.spring.io/spring-cloud-bus/reference/4.2/[spring-cloud-bus] :: Reference Documentation, version 4.2.0 + https://docs.spring.io/spring-cloud-circuitbreaker/reference/3.2/[spring-cloud-circuitbreaker] :: Reference Documentation, version 3.2.0 + https://docs.spring.io/spring-cloud-commons/reference/4.2/[spring-cloud-commons] :: Reference Documentation, version 4.2.0 + https://docs.spring.io/spring-cloud-config/reference/4.2/[spring-cloud-config] :: Reference Documentation, version 4.2.0 + https://docs.spring.io/spring-cloud-consul/reference/4.2/[spring-cloud-consul] :: Reference Documentation, version 4.2.0 + https://docs.spring.io/spring-cloud-contract/reference/4.2/[spring-cloud-contract] :: Reference Documentation, version 4.2.0 + https://docs.spring.io/spring-cloud-function/reference/4.2/[spring-cloud-function] :: Reference Documentation, version 4.2.0 + https://docs.spring.io/spring-cloud-gateway/reference/4.2/[spring-cloud-gateway] :: Reference Documentation, version 4.2.0 + https://docs.spring.io/spring-cloud-kubernetes/reference/3.2/[spring-cloud-kubernetes] :: Reference Documentation, version 3.2.0 + https://docs.spring.io/spring-cloud-netflix/reference/4.2/[spring-cloud-netflix] :: Reference Documentation, version 4.2.0 + https://docs.spring.io/spring-cloud-openfeign/reference/4.2/[spring-cloud-openfeign] :: Reference Documentation, version 4.2.0 + https://docs.spring.io/spring-cloud-stream/reference/4.2/[spring-cloud-stream] :: Reference Documentation, version 4.2.0 + https://docs.spring.io/spring-cloud-task/reference/3.2/[spring-cloud-task] :: Reference Documentation, version 3.2.0 + https://docs.spring.io/spring-cloud-vault/reference/4.2/[spring-cloud-vault] :: Reference Documentation, version 4.2.0 + https://docs.spring.io/spring-cloud-zookeeper/reference/4.2/[spring-cloud-zookeeper] :: Reference Documentation, version 4.2.0 diff --git a/docs/pom.xml b/docs/pom.xml index c188c163..82fc248f 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-starter-build - 2024.0.0-SNAPSHOT + 2024.0.0 jar Spring Cloud Starter Docs diff --git a/docs/src/test/resources/test/pom.xml b/docs/src/test/resources/test/pom.xml index b8f7f7c6..f8a30d3b 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.0-SNAPSHOT + 4.2.0 spring-cloud-dependencies - 2024.0.0-SNAPSHOT + 2024.0.0 spring-cloud-dependencies Spring Cloud Dependencies pom diff --git a/pom.xml b/pom.xml index 3686df57..442e1830 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ pom Spring Cloud Starter Build Spring Cloud Starter Build - 2024.0.0-SNAPSHOT + 2024.0.0 org.springframework.cloud spring-cloud-build - 4.2.0-SNAPSHOT + 4.2.0 diff --git a/spring-cloud-dependencies/pom.xml b/spring-cloud-dependencies/pom.xml index fe7e8189..beca8bce 100644 --- a/spring-cloud-dependencies/pom.xml +++ b/spring-cloud-dependencies/pom.xml @@ -5,33 +5,33 @@ org.springframework.cloud spring-cloud-dependencies-parent - 4.2.0-SNAPSHOT + 4.2.0 spring-cloud-dependencies - 2024.0.0-SNAPSHOT + 2024.0.0 spring-cloud-dependencies Spring Cloud Dependencies https://spring.io/projects/spring-cloud pom ${basedir}/../.. - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 3.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 3.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 3.2.0-SNAPSHOT - 4.2.0-SNAPSHOT - 4.2.0-SNAPSHOT + 4.2.0 + 4.2.0 + 4.2.0 + 3.2.0 + 4.2.0 + 4.2.0 + 4.2.0 + 4.2.0 + 4.2.0 + 3.2.0 + 4.2.0 + 4.2.0 + 4.2.0 + 3.2.0 + 4.2.0 + 4.2.0 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 index ed00290d..877ba7e1 100644 --- a/spring-cloud-starter-parent/pom.xml +++ b/spring-cloud-starter-parent/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-starter-parent - 2024.0.0-SNAPSHOT + 2024.0.0 spring-cloud-starter-parent Spring Cloud Starter Parent pom @@ -21,7 +21,7 @@ ${basedir}/../.. - 2024.0.0-SNAPSHOT + 2024.0.0