Switch gRPC plugins for Maven builds

Signed-off-by: Dave Syer <[email protected]>

Author: dsyer

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

@@ -31,7 +31,7 @@ class GrpcMavenBuildCustomizer implements BuildCustomizer<MavenBuild> {
 
 	private static final String OS_PLUGIN_VERSION = "1.7.1";
 
-	private static final String PROTOBUF_PLUGIN_VERSION = "0.6.1";
+	private static final String PROTOBUF_PLUGIN_VERSION = "3.1.2";
 
 	private final String protobufJavaVersion;
 
@@ -68,20 +68,21 @@ private void addOsPlugin(MavenPluginContainer plugins) {
 	}
 
 	private void addProtobufPlugin(MavenPluginContainer plugins, VersionProperty protobufJava, VersionProperty grpc) {
-		plugins.add("org.xolstice.maven.plugins", "protobuf-maven-plugin", (plugin) -> {
+		plugins.add("io.github.ascopes", "protobuf-maven-plugin", (plugin) -> {
 			plugin.version(PROTOBUF_PLUGIN_VERSION);
 			plugin.configuration((configuration) -> {
-				configuration.add("protocArtifact", "com.google.protobuf:protoc:${%s}:exe:${os.detected.classifier}"
-					.formatted(protobufJava.toStandardFormat()));
-				configuration.add("pluginId", "grpc-java");
-				configuration.add("pluginArtifact", "io.grpc:protoc-gen-grpc-java:${%s}:exe:${os.detected.classifier}"
-					.formatted(grpc.toStandardFormat()));
-			});
-			plugin.execution("compile", (execution) -> {
-				execution.goal("compile").goal("compile-custom");
-				execution.configuration(
-						(configuration) -> configuration.add("pluginParameter", "jakarta_omit,@generated=omit"));
+				configuration.add("protocVersion", "${%s}".formatted(protobufJava.toStandardFormat()));
+				configuration.add("binaryMavenPlugins", (builder) -> {
+					builder.add("binaryMavenPlugin", (binary) -> {
+						binary.add("groupId", "io.grpc");
+						binary.add("artifactId", "protoc-gen-grpc-java");
+						binary.add("version", "${%s}".formatted(grpc.toStandardFormat()));
+						binary.add("classifier", "${os.detected.classifier}");
+						binary.add("options", "jakarta_omit,@generated=omit");
+					});
+				});
 			});
+			plugin.execution("generate", (execution) -> execution.goal("generate"));
 		});
 	}
 

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

@@ -141,31 +141,33 @@ void shouldAddProtobufPluginForMaven() {
 		ProjectRequest request = createProjectRequest(SPRING_GRPC);
 		assertThat(mavenPom(request)).hasProperty("grpc.version", "1.72.0")
 			.hasProperty("protobuf-java.version", "4.30.2")
-			.containsIgnoringWhitespaces(
-					"""
-							<plugin>
-								<groupId>org.xolstice.maven.plugins</groupId>
-								<artifactId>protobuf-maven-plugin</artifactId>
-								<version>0.6.1</version>
-								<configuration>
-									<protocArtifact>com.google.protobuf:protoc:${protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
-									<pluginId>grpc-java</pluginId>
-									<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
-								</configuration>
-								<executions>
-									<execution>
-										<id>compile</id>
-										<goals>
-											<goal>compile</goal>
-											<goal>compile-custom</goal>
-										</goals>
-										<configuration>
-											<pluginParameter>jakarta_omit,@generated=omit</pluginParameter>
-										</configuration>
-									</execution>
-								</executions>
-							</plugin>
-							""");
+			.containsIgnoringWhitespaces("""
+					<plugin>
+						<groupId>io.github.ascopes</groupId>
+						<artifactId>protobuf-maven-plugin</artifactId>
+						<version>3.1.2</version>
+						<configuration>
+							<protocVersion>${protobuf-java.version}</protocVersion>
+							<binaryMavenPlugins>
+								<binaryMavenPlugin>
+									<groupId>io.grpc</groupId>
+									<artifactId>protoc-gen-grpc-java</artifactId>
+									<version>${grpc.version}</version>
+									<classifier>${os.detected.classifier}</classifier>
+									<options>jakarta_omit,@generated=omit</options>
+								</binaryMavenPlugin>
+							</binaryMavenPlugins>
+						</configuration>
+						<executions>
+							<execution>
+								<id>generate</id>
+								<goals>
+									<goal>generate</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+						""");
 	}
 
 	@Test