From 7f436b34f784d825969520c638c2b8035034744b Mon Sep 17 00:00:00 2001
From: Moritz Halbritter <moritz.halbritter@broadcom.com>
Date: Fri, 20 Dec 2024 08:48:48 +0100
Subject: [PATCH] Fix gRPC Maven configuration

Adding multiple pluginParameter tags doesn't work,
the options need to be separated by comma.

Closes gh-1686
---
 .../dependency/springgrpc/GrpcMavenBuildCustomizer.java     | 6 ++----
 .../SpringGrpcProjectGenerationConfigurationTests.java      | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/start-site/src/main/java/io/spring/start/site/extension/dependency/springgrpc/GrpcMavenBuildCustomizer.java b/start-site/src/main/java/io/spring/start/site/extension/dependency/springgrpc/GrpcMavenBuildCustomizer.java
index a7a021c727..3534cde4f9 100644
--- a/start-site/src/main/java/io/spring/start/site/extension/dependency/springgrpc/GrpcMavenBuildCustomizer.java
+++ b/start-site/src/main/java/io/spring/start/site/extension/dependency/springgrpc/GrpcMavenBuildCustomizer.java
@@ -79,10 +79,8 @@ private void addProtobufPlugin(MavenPluginContainer plugins, VersionProperty pro
 			});
 			plugin.execution("compile", (execution) -> {
 				execution.goal("compile").goal("compile-custom");
-				execution.configuration((configuration) -> {
-					configuration.add("pluginParameter", "jakarta_omit");
-					configuration.add("pluginParameter", "@generated=omit");
-				});
+				execution.configuration(
+						(configuration) -> configuration.add("pluginParameter", "jakarta_omit,@generated=omit"));
 			});
 		});
 	}
diff --git a/start-site/src/test/java/io/spring/start/site/extension/dependency/springgrpc/SpringGrpcProjectGenerationConfigurationTests.java b/start-site/src/test/java/io/spring/start/site/extension/dependency/springgrpc/SpringGrpcProjectGenerationConfigurationTests.java
index 2a51965895..2ba473321d 100644
--- a/start-site/src/test/java/io/spring/start/site/extension/dependency/springgrpc/SpringGrpcProjectGenerationConfigurationTests.java
+++ b/start-site/src/test/java/io/spring/start/site/extension/dependency/springgrpc/SpringGrpcProjectGenerationConfigurationTests.java
@@ -160,8 +160,7 @@ void shouldAddProtobufPluginForMaven() {
 											<goal>compile-custom</goal>
 										</goals>
 										<configuration>
-											<pluginParameter>jakarta_omit</pluginParameter>
-											<pluginParameter>@generated=omit</pluginParameter>
+											<pluginParameter>jakarta_omit,@generated=omit</pluginParameter>
 										</configuration>
 									</execution>
 								</executions>