diff --git a/start-site/src/main/resources/application.yml b/start-site/src/main/resources/application.yml index 32bde08bc5..ee15aed365 100644 --- a/start-site/src/main/resources/application.yml +++ b/start-site/src/main/resources/application.yml @@ -99,8 +99,8 @@ initializr: versionProperty: spring-cloud.version order: 50 mappings: - - compatibilityRange: "[3.2.0,3.3.0-M1)" - version: 2023.0.1 + - compatibilityRange: "[3.2.0,3.4.0-M1)" + version: 2023.0.2 spring-cloud-azure: groupId: com.azure.spring artifactId: spring-cloud-azure-dependencies @@ -1043,7 +1043,7 @@ initializr: href: https://java.testcontainers.org/ - name: Contract Verifier bom: spring-cloud - compatibilityRange: "[3.2.0,3.3.0-M1)" + compatibilityRange: "[3.2.0,3.4.0-M1)" id: cloud-contract-verifier description: Moves TDD to the level of software architecture by enabling Consumer Driven Contract (CDC) development. groupId: org.springframework.cloud @@ -1054,7 +1054,7 @@ initializr: href: https://cloud.spring.io/spring-cloud-contract/reference/htmlsingle/ - name: Contract Stub Runner bom: spring-cloud - compatibilityRange: "[3.2.0,3.3.0-M1)" + compatibilityRange: "[3.2.0,3.4.0-M1)" id: cloud-contract-stub-runner description: Stub Runner for HTTP/Messaging based communication. Allows creating WireMock stubs from RestDocs tests. groupId: org.springframework.cloud @@ -1075,7 +1075,7 @@ initializr: href: https://docs.spring.io/spring-boot/docs/{bootVersion}/reference/htmlsingle/index.html#data.nosql.ldap.embedded - name: Spring Cloud bom: spring-cloud - compatibilityRange: "[3.2.0,3.3.0-M1)" + compatibilityRange: "[3.2.0,3.4.0-M1)" content: - name: Cloud Bootstrap id: cloud-starter @@ -1107,7 +1107,7 @@ initializr: href: https://docs.spring.io/spring-cloud-task/docs/current/reference/html/ - name: Spring Cloud Config bom: spring-cloud - compatibilityRange: "[3.2.0,3.3.0-M1)" + compatibilityRange: "[3.2.0,3.4.0-M1)" content: - name: Config Client id: cloud-config-client @@ -1158,7 +1158,7 @@ initializr: description: Spring Cloud Consul Quick Start - name: Spring Cloud Discovery bom: spring-cloud - compatibilityRange: "[3.2.0,3.3.0-M1)" + compatibilityRange: "[3.2.0,3.4.0-M1)" content: - name: Eureka Discovery Client id: cloud-eureka @@ -1200,7 +1200,7 @@ initializr: href: https://docs.spring.io/spring-cloud-consul/docs/current/reference/html/#spring-cloud-consul-discovery - name: Spring Cloud Routing bom: spring-cloud - compatibilityRange: "[3.2.0,3.3.0-M1)" + compatibilityRange: "[3.2.0,3.4.0-M1)" content: - name: Gateway id: cloud-gateway @@ -1247,7 +1247,7 @@ initializr: href: https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#spring-cloud-loadbalancer - name: Spring Cloud Circuit Breaker bom: spring-cloud - compatibilityRange: "[3.2.0,3.3.0-M1)" + compatibilityRange: "[3.2.0,3.4.0-M1)" content: - name: Resilience4J id: cloud-resilience4j @@ -1259,7 +1259,7 @@ initializr: href: https://docs.spring.io/spring-cloud-circuitbreaker/docs/current/reference/html/#configuring-resilience4j-circuit-breakers - name: Spring Cloud Messaging bom: spring-cloud - compatibilityRange: "[3.2.0,3.3.0-M1)" + compatibilityRange: "[3.2.0,3.4.0-M1)" content: - name: Cloud Bus id: cloud-bus diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudCircuitBreakerBuildCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudCircuitBreakerBuildCustomizerTests.java index 6cd93abfef..b9ffe3178c 100644 --- a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudCircuitBreakerBuildCustomizerTests.java +++ b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudCircuitBreakerBuildCustomizerTests.java @@ -30,7 +30,7 @@ */ class SpringCloudCircuitBreakerBuildCustomizerTests extends AbstractExtensionTests { - private static final String BOOT_VERSION = "3.2.6"; + private static final String SPRING_BOOT_VERSION = "3.3.0"; private static final Dependency REACTIVE_CLOUD_CIRCUIT_BREAKER = Dependency.withId("cloud-resilience4j-reactive", "org.springframework.cloud", "spring-cloud-starter-circuitbreaker-reactor-resilience4j"); @@ -38,7 +38,7 @@ class SpringCloudCircuitBreakerBuildCustomizerTests extends AbstractExtensionTes @Test void replacesCircuitBreakerWithReactiveCircuitBreakerWhenReactiveFacetPresent() { ProjectRequest request = createProjectRequest("webflux", "cloud-resilience4j"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(mavenPom(request)).hasDependency(getDependency("webflux")) .hasDependency(REACTIVE_CLOUD_CIRCUIT_BREAKER) .doesNotHaveDependency("org.springframework.cloud", "spring-cloud-starter-circuitbreaker-resilience4j") @@ -49,7 +49,7 @@ void replacesCircuitBreakerWithReactiveCircuitBreakerWhenReactiveFacetPresent() @Test void doesNotReplaceCircuitBreakerWithReactiveCircuitBreakerWhenReactiveFacetNotPresent() { ProjectRequest request = createProjectRequest("cloud-resilience4j"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(mavenPom(request)).hasDependency(getDependency("cloud-resilience4j")) .doesNotHaveDependency("org.springframework.cloud", "spring-cloud-starter-circuitbreaker-reactor-resilience4j") diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudContractConfigurationTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudContractConfigurationTests.java index 2eabac67de..de74a948eb 100644 --- a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudContractConfigurationTests.java +++ b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudContractConfigurationTests.java @@ -31,12 +31,12 @@ */ class SpringCloudContractConfigurationTests extends AbstractExtensionTests { - private static final String BOOT_VERSION = "3.2.6"; + private static final String SPRING_BOOT_VERSION = "3.3.0"; @Test void contractsDirectoryWithMavenIsCreatedWithSpringCloudContractVerifier() { ProjectRequest request = createProjectRequest("web", "cloud-contract-verifier"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); request.setType("maven-project"); ProjectStructure structure = generateProject(request); assertThat(structure.getProjectDirectory().resolve("src/test/resources/contracts")).exists().isDirectory(); @@ -45,7 +45,7 @@ void contractsDirectoryWithMavenIsCreatedWithSpringCloudContractVerifier() { @Test void contractsDirectoryWithMavenIsNotCreatedIfSpringCloudContractVerifierIsNotRequested() { ProjectRequest request = createProjectRequest("web"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); request.setType("maven-project"); ProjectStructure structure = generateProject(request); assertThat(structure.getProjectDirectory().resolve("src/test/resources/contracts")).doesNotExist(); @@ -54,7 +54,7 @@ void contractsDirectoryWithMavenIsNotCreatedIfSpringCloudContractVerifierIsNotRe @Test void contractsDirectoryWithGradleIsCreatedWithSpringCloudContractVerifier() { ProjectRequest request = createProjectRequest("web", "cloud-contract-verifier"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); request.setType("gradle-project"); ProjectStructure structure = generateProject(request); assertThat(structure.getProjectDirectory().resolve("src/contractTest/resources/contracts")).exists() @@ -64,7 +64,7 @@ void contractsDirectoryWithGradleIsCreatedWithSpringCloudContractVerifier() { @Test void contractsDirectoryWithGradleIsNotCreatedIfSpringCloudContractVerifierIsNotRequested() { ProjectRequest request = createProjectRequest("web"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); request.setType("gradle-project"); ProjectStructure structure = generateProject(request); assertThat(structure.getProjectDirectory().resolve("src/contractTest/resources/contracts")).doesNotExist(); diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudContractGradleBuildCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudContractGradleBuildCustomizerTests.java index 9043012bac..d3da6f831a 100644 --- a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudContractGradleBuildCustomizerTests.java +++ b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudContractGradleBuildCustomizerTests.java @@ -31,40 +31,40 @@ */ class SpringCloudContractGradleBuildCustomizerTests extends AbstractExtensionTests { - private static final String BOOT_VERSION = "3.2.6"; + private static final String SPRING_BOOT_VERSION = "3.3.0"; @Test void springCloudContractVerifierPluginAddedWhenSCCDependencyPresent() { ProjectRequest request = createProjectRequest("cloud-contract-verifier"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(gradleBuild(request)).contains("id 'org.springframework.cloud.contract' version '"); } @Test void springCloudContractVerifierPluginNotAddedWhenSCCDependencyAbsent() { ProjectRequest request = createProjectRequest(); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(gradleBuild(request)).doesNotContain("org.springframework.cloud.contract"); } @Test void springCloudContractVerifierPluginContractTestWithJUnit5ByDefault() { ProjectRequest request = createProjectRequest("cloud-contract-verifier"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(gradleBuild(request)).containsSubsequence("tasks.named('contractTest') {", "useJUnitPlatform()"); } @Test void springCloudContractVerifierPluginWithGroovyDslAndWithTestModeSetWhenWebFluxIsPresent() { ProjectRequest request = createProjectRequest("cloud-contract-verifier", "webflux"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(gradleBuild(request)).containsSubsequence("contracts {", "testMode = 'WebTestClient'"); } @Test void springCloudContractVerifierPluginWithKotlinDslAndTestModeSetWhenWebFluxIsPresent() { ProjectRequest request = createProjectRequest("cloud-contract-verifier", "webflux"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(gradleKotlinDslBuild(request)) .contains("import org.springframework.cloud.contract.verifier.config.TestMode") .containsSubsequence("contracts {", "testMode.set(TestMode.WEBTESTCLIENT)"); @@ -73,7 +73,7 @@ void springCloudContractVerifierPluginWithKotlinDslAndTestModeSetWhenWebFluxIsPr @Test void springWebTestClientDependencyAddedWhenWebFluxIsPresent() { ProjectRequest request = createProjectRequest("cloud-contract-verifier", "webflux"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(gradleBuild(request)).contains("testImplementation 'io.rest-assured:spring-web-test-client'"); } diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudContractMavenBuildCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudContractMavenBuildCustomizerTests.java index f1dedd1c1c..3b54637905 100644 --- a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudContractMavenBuildCustomizerTests.java +++ b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudContractMavenBuildCustomizerTests.java @@ -32,7 +32,7 @@ */ class SpringCloudContractMavenBuildCustomizerTests extends AbstractExtensionTests { - private static final String SPRING_BOOT_VERSION = "3.2.0"; + private static final String SPRING_BOOT_VERSION = "3.3.0"; @Test void springCloudContractVerifierPluginAddedWhenSCCDependencyPresent() { diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudFunctionBuildCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudFunctionBuildCustomizerTests.java index 9060b9e3da..cdb9c9a60a 100644 --- a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudFunctionBuildCustomizerTests.java +++ b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudFunctionBuildCustomizerTests.java @@ -32,7 +32,7 @@ */ class SpringCloudFunctionBuildCustomizerTests extends AbstractExtensionTests { - private static final String BOOT_VERSION = "3.2.6"; + private static final String SPRING_BOOT_VERSION = "3.3.0"; static final Dependency WEB_ADAPTER = Dependency.withId("cloud-function-web", "org.springframework.cloud", "spring-cloud-function-web"); @@ -40,7 +40,7 @@ class SpringCloudFunctionBuildCustomizerTests extends AbstractExtensionTests { @Test void functionOnly() { ProjectRequest request = createProjectRequest("cloud-function"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(mavenPom(request)).hasDependency(getDependency("cloud-function")) .hasDependency(Dependency.createSpringBootStarter("test", Dependency.SCOPE_TEST)) .hasDependency(Dependency.createSpringBootStarter("")) @@ -52,7 +52,7 @@ void functionOnly() { @Test void web() { ProjectRequest request = createProjectRequest("web", "cloud-function"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); BillOfMaterials bom = getBom("spring-cloud", request.getBootVersion()); assertThat(mavenPom(request)).hasDependency(getDependency("web")) .hasDependency(WEB_ADAPTER) @@ -65,7 +65,7 @@ void web() { @Test void webflux() { ProjectRequest request = createProjectRequest("webflux", "cloud-function"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); BillOfMaterials bom = getBom("spring-cloud", request.getBootVersion()); assertThat(mavenPom(request)).hasDependency(getDependency("webflux")) .hasDependency(WEB_ADAPTER) diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudFunctionHelpDocumentCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudFunctionHelpDocumentCustomizerTests.java index 305a26645e..54c63382e1 100644 --- a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudFunctionHelpDocumentCustomizerTests.java +++ b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudFunctionHelpDocumentCustomizerTests.java @@ -33,12 +33,12 @@ class SpringCloudFunctionHelpDocumentCustomizerTests extends AbstractExtensionTe private static final String AZURE_SECTION_TITLE = "## Running Spring Cloud Function applications on Microsoft Azure"; - private static final String BOOT_VERSION = "3.2.6"; + private static final String SPRING_BOOT_VERSION = "3.2.0"; @Test void functionBuildSetupInfoSectionAddedForMaven() { ProjectRequest request = createProjectRequest(); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); request.setType("maven-build"); request.setDependencies(Arrays.asList("cloud-function", "azure-support")); assertThat(generateProject(request)).textFile("HELP.md").contains(AZURE_SECTION_TITLE); @@ -47,7 +47,7 @@ void functionBuildSetupInfoSectionAddedForMaven() { @Test void functionBuildSetupInfoSectionAddedForGradle() { ProjectRequest request = createProjectRequest(); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); request.setType("gradle-build"); request.setDependencies(Arrays.asList("cloud-function", "azure-support")); assertThat(generateProject(request)).textFile("HELP.md").contains(AZURE_SECTION_TITLE); diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudStreamBuildCustomizerTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudStreamBuildCustomizerTests.java index dc8bb4ff68..715243845f 100755 --- a/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudStreamBuildCustomizerTests.java +++ b/start-site/src/test/java/io/spring/start/site/extension/dependency/springcloud/SpringCloudStreamBuildCustomizerTests.java @@ -32,7 +32,7 @@ */ class SpringCloudStreamBuildCustomizerTests extends AbstractExtensionTests { - private static final String BOOT_VERSION = "3.2.6"; + private static final String SPRING_BOOT_VERSION = "3.3.0"; private static final Dependency KAFKA_BINDER = Dependency.withId("cloud-stream-binder-kafka", "org.springframework.cloud", "spring-cloud-stream-binder-kafka"); @@ -52,7 +52,7 @@ class SpringCloudStreamBuildCustomizerTests extends AbstractExtensionTests { @Test void springCloudStreamWithRabbit() { ProjectRequest request = createProjectRequest("cloud-stream", "amqp"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(mavenPom(request)).hasDependency(getDependency("cloud-stream")) .hasDependency(getDependency("amqp")) .hasDependency(RABBIT_BINDER) @@ -64,7 +64,7 @@ void springCloudStreamWithRabbit() { @Test void springCloudStreamWithKafka() { ProjectRequest request = createProjectRequest("cloud-stream", "kafka"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(mavenPom(request)).hasDependency(getDependency("cloud-stream")) .hasDependency(getDependency("kafka")) .hasDependency(KAFKA_BINDER) @@ -76,7 +76,7 @@ void springCloudStreamWithKafka() { @Test void springCloudStreamWithKafkaStreams() { ProjectRequest request = createProjectRequest("cloud-stream", "kafka-streams"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(mavenPom(request)).hasDependency(getDependency("cloud-stream")) .hasDependency(getDependency("kafka-streams")) .hasDependency(KAFKA_STREAMS_BINDER) @@ -88,7 +88,7 @@ void springCloudStreamWithKafkaStreams() { @Test void springCloudStreamWithPulsar() { ProjectRequest request = createProjectRequest("cloud-stream", "pulsar"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(mavenPom(request)).hasDependency(getDependency("cloud-stream")) .hasDependency(getDependency("pulsar")) .hasDependency(PULSAR_BINDER) @@ -98,7 +98,7 @@ void springCloudStreamWithPulsar() { @Test void springCloudStreamWithAllBinders() { ProjectRequest request = createProjectRequest("cloud-stream", "amqp", "kafka", "kafka-streams"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(mavenPom(request)).hasDependency(getDependency("cloud-stream")) .hasDependency(getDependency("amqp")) .hasDependency(getDependency("kafka")) @@ -114,7 +114,7 @@ void springCloudStreamWithAllBinders() { @Test void springCloudBusWithRabbit() { ProjectRequest request = createProjectRequest("cloud-bus", "amqp"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(mavenPom(request)).hasDependency(getDependency("cloud-bus")) .hasDependency(getDependency("amqp")) .hasDependency(RABBIT_BINDER) @@ -125,7 +125,7 @@ void springCloudBusWithRabbit() { @Test void springCloudBusWithKafka() { ProjectRequest request = createProjectRequest("cloud-bus", "amqp"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(mavenPom(request)).hasDependency(getDependency("cloud-bus")) .hasDependency(getDependency("amqp")) .hasDependency(RABBIT_BINDER) @@ -136,7 +136,7 @@ void springCloudBusWithKafka() { @Test void springCloudBusWithAllBinders() { ProjectRequest request = createProjectRequest("cloud-bus", "amqp", "kafka", "kafka-streams"); - request.setBootVersion(BOOT_VERSION); + request.setBootVersion(SPRING_BOOT_VERSION); assertThat(mavenPom(request)).hasDependency(getDependency("cloud-bus")) .hasDependency(getDependency("amqp")) .hasDependency(getDependency("kafka"))