Skip to content

Commit 1ccceab

Browse files
sri1873sri1873
authored
Merge branch 'spring-io:main' into main
2 parents 70c4870 + 2dffedc commit 1ccceab

File tree

8 files changed

+24
-30
lines changed

8 files changed

+24
-30
lines changed

‎start-site/src/main/java/io/spring/start/site/extension/dependency/h2/H2ProjectGenerationConfiguration.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package io.spring.start.site.extension.dependency.h2;
1818

1919
import io.spring.initializr.generator.buildsystem.Build;
20-
import io.spring.initializr.generator.buildsystem.Dependency;
2120
import io.spring.initializr.generator.buildsystem.DependencyScope;
2221
import io.spring.initializr.generator.condition.ConditionalOnPlatformVersion;
2322
import io.spring.initializr.generator.condition.ConditionalOnRequestedDependency;
@@ -36,12 +35,10 @@
3635
class H2ProjectGenerationConfiguration {
3736

3837
@Bean
39-
@ConditionalOnPlatformVersion("[3.4.0,4.0.0)")
40-
BuildCustomizer<Build> switchH2ScopeToRuntimeBuildCustomizer() {
41-
return (build) -> {
42-
Dependency h2 = build.dependencies().get("h2");
43-
build.dependencies().add("h2", Dependency.from(h2).scope(DependencyScope.RUNTIME));
44-
};
38+
@ConditionalOnPlatformVersion("4.0.0")
39+
BuildCustomizer<Build> addH2ConsoleModuleBuildCustomizer() {
40+
return (build) -> build.dependencies()
41+
.add("spring-boot-h2console", "org.springframework.boot", "spring-boot-h2console", DependencyScope.COMPILE);
4542
}
4643

4744
}

‎start-site/src/main/java/io/spring/start/site/extension/dependency/observability/ObservabilityActuatorBuildCustomizer.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ public void customize(Build build) {
5555
}
5656
if (isBoot4OrLater() && hasPushBasedMetrics(build) && !hasActuator(build)) {
5757
build.dependencies()
58-
.add("spring-boot-micrometer-metrics", "org.springframework.boot", "spring-boot-micrometer-metrics",
59-
DependencyScope.COMPILE);
58+
.add("spring-boot-starter-micrometer-metrics", "org.springframework.boot",
59+
"spring-boot-starter-micrometer-metrics", DependencyScope.COMPILE);
6060
build.dependencies()
61-
.add("spring-boot-micrometer-metrics-test", "org.springframework.boot",
62-
"spring-boot-micrometer-metrics-test", DependencyScope.TEST_COMPILE);
61+
.add("spring-boot-starter-micrometer-metrics-test", "org.springframework.boot",
62+
"spring-boot-starter-micrometer-metrics-test", DependencyScope.TEST_COMPILE);
6363
}
6464
}
6565

‎start-site/src/main/java/io/spring/start/site/extension/dependency/springgrpc/GrpcMavenBuildCustomizer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ private void addProtobufPlugin(MavenPluginContainer plugins, VersionProperty pro
5858
plugins.add("io.github.ascopes", "protobuf-maven-plugin", (plugin) -> {
5959
plugin.version(PROTOBUF_PLUGIN_VERSION);
6060
plugin.configuration((configuration) -> {
61-
configuration.add("protocVersion", "${%s}".formatted(protobufJava.toStandardFormat()));
61+
configuration.add("protoc", "${%s}".formatted(protobufJava.toStandardFormat()));
6262
configuration.add("binaryMavenPlugins", (builder) -> {
6363
builder.add("binaryMavenPlugin", (binary) -> {
6464
binary.add("groupId", "io.grpc");

‎start-site/src/main/java/io/spring/start/site/extension/dependency/springintegration/SpringIntegrationModuleRegistry.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static Iterable<ImplicitDependency> create(Version platformVersion) {
7575
.customizeHelpDocument(addReferenceLink("STOMP Module", "stomp")
7676
.andThen(addReferenceLink("WebSocket Module", "web-sockets"))));
7777
builders.add(onDependencies("web-services").customizeBuild(addDependency("ws"))
78-
.customizeHelpDocument(addReferenceLink("Webservices Module", "ws")));
78+
.customizeHelpDocument(addReferenceLink("Web Services Module", "ws")));
7979
return builders.stream().map(Builder::build).toList();
8080
}
8181

‎start-site/src/main/resources/application.yml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ initializr:
9292
- compatibilityRange: "[3.4.0,3.5.0-M1)"
9393
version: 1.0.3
9494
- compatibilityRange: "[3.5.0,4.0.0-M1)"
95-
version: 1.1.0
95+
version: 1.1.1
9696
spring-cloud:
9797
groupId: org.springframework.cloud
9898
artifactId: spring-cloud-dependencies
@@ -404,7 +404,7 @@ initializr:
404404
description: Building a Hypermedia-Driven RESTful Web Service
405405
- rel: reference
406406
href: https://docs.spring.io/spring-boot/{bootVersion}/reference/web/spring-hateoas.html
407-
- name: Spring Webservices
407+
- name: Spring Web Services
408408
id: web-services
409409
description: Facilitates contract-first SOAP development using Spring WS. Allows for the creation of flexible web services using one of the many ways to manipulate XML payloads.
410410
group-id: org.springframework.boot
@@ -716,12 +716,9 @@ initializr:
716716
- name: H2 Database
717717
id: h2
718718
description: Provides a fast in-memory database that supports JDBC API and R2DBC access, with a small (2mb) footprint. Supports embedded and server modes as well as a browser based console application.
719-
mappings:
720-
- compatibility-range: "[3.4.0,4.0.0)"
721-
groupId: com.h2database
722-
artifactId: h2
723-
groupId: org.springframework.boot
724-
artifactId: spring-boot-h2console
719+
groupId: com.h2database
720+
artifactId: h2
721+
scope: runtime
725722
starter: false
726723
- name: HyperSQL Database
727724
id: hsql

‎start-site/src/test/java/io/spring/start/site/extension/dependency/h2/H2ProjectGenerationConfigurationTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ class H2ProjectGenerationConfigurationTests extends AbstractExtensionTests {
3535

3636
@ParameterizedTest
3737
@EnumSource(value = SupportedBootVersion.class, names = { "V3_4", "V3_5" })
38-
void shouldAddH2inRuntimeScopeForBootBelow4(SupportedBootVersion bootVersion) {
38+
void shouldNotAddH2ConsoleModule(SupportedBootVersion bootVersion) {
3939
ProjectRequest request = createProjectRequest(bootVersion, "h2");
40-
assertThat(mavenPom(request)).hasDependency("com.h2database", "h2", null, Dependency.SCOPE_RUNTIME);
40+
assertThat(mavenPom(request)).doesNotHaveDependency("org.springframework.boot", "spring-boot-h2console");
4141
}
4242

4343
@Test

‎start-site/src/test/java/io/spring/start/site/extension/dependency/observability/ObservabilityActuatorBuildCustomizerTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ void actuatorIsAddedWithTracingEntriesForBoot4(String dependency) {
5555
void actuatorIsAddedWithPullBasedMetricsEntriesForBoot4(String dependency) {
5656
assertThat(generateProject(SupportedBootVersion.V4_0, dependency)).mavenBuild()
5757
.hasDependency(getDependency("actuator"))
58-
.doesNotHaveDependency("org.springframework.boot", "spring-boot-micrometer-metrics")
59-
.doesNotHaveDependency("org.springframework.boot", "spring-boot-micrometer-metrics-test");
58+
.doesNotHaveDependency("org.springframework.boot", "spring-boot-starter-micrometer-metrics")
59+
.doesNotHaveDependency("org.springframework.boot", "spring-boot-starter-micrometer-metrics-test");
6060
}
6161

6262
@ParameterizedTest
@@ -65,16 +65,16 @@ void actuatorIsNotAddedWithPushBasedMetricsEntriesForBoot4(String dependency) {
6565
Dependency actuator = getDependency("actuator");
6666
assertThat(generateProject(SupportedBootVersion.V4_0, dependency)).mavenBuild()
6767
.doesNotHaveDependency(actuator.getGroupId(), actuator.getArtifactId())
68-
.hasDependency("org.springframework.boot", "spring-boot-micrometer-metrics")
69-
.hasDependency("org.springframework.boot", "spring-boot-micrometer-metrics-test", null, "test");
68+
.hasDependency("org.springframework.boot", "spring-boot-starter-micrometer-metrics")
69+
.hasDependency("org.springframework.boot", "spring-boot-starter-micrometer-metrics-test", null, "test");
7070
}
7171

7272
@Test
7373
void shouldNotAddMicrometerMetricsIfActuatorIsThere() {
7474
assertThat(generateProject(SupportedBootVersion.V4_0, "distributed-tracing", "datadog")).mavenBuild()
7575
.hasDependency(getDependency("actuator"))
76-
.doesNotHaveDependency("org.springframework.boot", "spring-boot-micrometer-metrics")
77-
.doesNotHaveDependency("org.springframework.boot", "spring-boot-micrometer-metrics-test");
76+
.doesNotHaveDependency("org.springframework.boot", "spring-boot-starter-micrometer-metrics")
77+
.doesNotHaveDependency("org.springframework.boot", "spring-boot-starter-micrometer-metrics-test");
7878
}
7979

8080
private ProjectStructure generateProject(SupportedBootVersion springBootVersion, String... dependencies) {

‎start-site/src/test/java/io/spring/start/site/extension/dependency/springgrpc/SpringGrpcProjectGenerationConfigurationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ void shouldAddProtobufPluginForMaven() {
126126
<artifactId>protobuf-maven-plugin</artifactId>
127127
<version>4.0.3</version>
128128
<configuration>
129-
<protocVersion>${protobuf-java.version}</protocVersion>
129+
<protoc>${protobuf-java.version}</protoc>
130130
<binaryMavenPlugins>
131131
<binaryMavenPlugin>
132132
<groupId>io.grpc</groupId>

0 commit comments

Comments
 (0)