Skip to content

Commit 9ec721f

Browse files
committed
Merge pull request #2002 from dsyer
* pr/2002: Update Spring gRPC to 1.0.0 Update to gRPC 1.0.0-RC1 Closes gh-2002
2 parents ac67dcc + 5fd825d commit 9ec721f

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*/
2929
abstract class AbstractGrpcGradleBuildCustomizer implements BuildCustomizer<GradleBuild> {
3030

31-
private static final String GRPC_PLUGIN_VERSION = "0.9.4";
31+
private static final String GRPC_PLUGIN_VERSION = "0.9.5";
3232

3333
private final char quote;
3434

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
@@ -29,7 +29,7 @@
2929
*/
3030
class GrpcMavenBuildCustomizer implements BuildCustomizer<MavenBuild> {
3131

32-
private static final String PROTOBUF_PLUGIN_VERSION = "3.8.0";
32+
private static final String PROTOBUF_PLUGIN_VERSION = "4.0.3";
3333

3434
private final String protobufJavaVersion;
3535

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ initializr:
141141
artifactId: spring-grpc-dependencies
142142
versionProperty: spring-grpc.version
143143
mappings:
144-
- compatibilityRange: "[3.4.0,4.0.0-M1)"
145-
version: 0.12.0
144+
- compatibilityRange: "[4.0.0,4.1.0-M1)"
145+
version: 1.0.0
146146
spring-modulith:
147147
groupId: org.springframework.modulith
148148
artifactId: spring-modulith-bom
@@ -1113,7 +1113,7 @@ initializr:
11131113
id: spring-grpc
11141114
groupId: org.springframework.grpc
11151115
artifactId: spring-grpc-spring-boot-starter
1116-
compatibilityRange: "[3.4.0,4.0.0-M1)"
1116+
compatibilityRange: "[4.0.0,4.1.0-M1)"
11171117
description: Support for gRPC, a high performance, open source universal RPC framework.
11181118
bom: spring-grpc
11191119
links:

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*/
3232
class SpringGrpcProjectGenerationConfigurationTests extends AbstractExtensionTests {
3333

34-
private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.V3_5;
34+
private static final SupportedBootVersion BOOT_VERSION = SupportedBootVersion.V4_0;
3535

3636
private static final String SPRING_GRPC = "spring-grpc";
3737

@@ -65,7 +65,7 @@ void shouldAddAdditionalDependenciesForGradle() {
6565
void shouldAddGrpcPluginAndConfigurationForGradleGroovy() {
6666
ProjectRequest request = createProjectRequest(BOOT_VERSION, SPRING_GRPC);
6767
request.setType("gradle-project");
68-
assertThat(gradleBuild(request)).hasPlugin("com.google.protobuf", "0.9.4").containsIgnoringWhitespaces("""
68+
assertThat(gradleBuild(request)).hasPlugin("com.google.protobuf", "0.9.5").containsIgnoringWhitespaces("""
6969
protobuf {
7070
protoc {
7171
artifact = 'com.google.protobuf:protoc'
@@ -90,7 +90,7 @@ void shouldAddGrpcPluginAndConfigurationForGradleGroovy() {
9090
void shouldAddGrpcPluginAndConfigurationForGradleKotlin() {
9191
ProjectRequest request = createProjectRequest(BOOT_VERSION, SPRING_GRPC);
9292
request.setType("gradle-project-kotlin");
93-
assertThat(gradleKotlinDslBuild(request)).hasPlugin("com.google.protobuf", "0.9.4")
93+
assertThat(gradleKotlinDslBuild(request)).hasPlugin("com.google.protobuf", "0.9.5")
9494
.contains("import com.google.protobuf.gradle.id")
9595
.containsIgnoringWhitespaces("""
9696
protobuf {
@@ -118,13 +118,13 @@ void shouldAddGrpcPluginAndConfigurationForGradleKotlin() {
118118
@Test
119119
void shouldAddProtobufPluginForMaven() {
120120
ProjectRequest request = createProjectRequest(BOOT_VERSION, SPRING_GRPC);
121-
assertThat(mavenPom(request)).hasProperty("grpc.version", "1.76.0")
122-
.hasProperty("protobuf-java.version", "4.32.1")
121+
assertThat(mavenPom(request)).hasProperty("grpc.version", "1.77.0")
122+
.hasProperty("protobuf-java.version", "4.33.1")
123123
.containsIgnoringWhitespaces("""
124124
<plugin>
125125
<groupId>io.github.ascopes</groupId>
126126
<artifactId>protobuf-maven-plugin</artifactId>
127-
<version>3.8.0</version>
127+
<version>4.0.3</version>
128128
<configuration>
129129
<protocVersion>${protobuf-java.version}</protocVersion>
130130
<binaryMavenPlugins>

0 commit comments

Comments
 (0)