From 66ad5eaceb289ecbc33792da444f651f05f1917a Mon Sep 17 00:00:00 2001
From: Andrey Litvitski <andrey1010102008@gmail.com>
Date: Wed, 21 May 2025 21:51:26 +0300
Subject: [PATCH] switch maven samples to `ascopes/protobuf-maven-plugin`
 protoc plugin (#179)

Signed-off-by: Andrey Litvitski <andrey1010102008@gmail.com>
---
 samples/grpc-client/pom.xml                   | 27 +++++-----
 .../src/main/{proto => protobuf}/hello.proto  |  0
 samples/grpc-oauth2/pom.xml                   | 27 +++++-----
 .../src/main/{proto => protobuf}/hello.proto  |  0
 samples/grpc-reactive/pom.xml                 | 43 +++++++--------
 .../src/main/{proto => protobuf}/hello.proto  |  0
 samples/grpc-secure/pom.xml                   | 27 +++++-----
 .../src/main/{proto => protobuf}/hello.proto  |  0
 samples/grpc-server-kotlin/pom.xml            | 52 +++++++------------
 .../src/main/{proto => protobuf}/hello.proto  |  0
 samples/grpc-server-netty-shaded/pom.xml      | 29 ++++++-----
 .../src/main/{proto => protobuf}/hello.proto  |  0
 samples/grpc-server/pom.xml                   | 27 +++++-----
 .../src/main/{proto => protobuf}/hello.proto  |  0
 samples/grpc-tomcat-secure/pom.xml            | 29 ++++++-----
 .../src/main/{proto => protobuf}/hello.proto  |  0
 samples/grpc-tomcat/pom.xml                   | 29 ++++++-----
 .../src/main/{proto => protobuf}/hello.proto  |  0
 samples/grpc-webflux/pom.xml                  | 27 +++++-----
 .../src/main/{proto => protobuf}/hello.proto  |  0
 20 files changed, 150 insertions(+), 167 deletions(-)
 rename samples/grpc-client/src/main/{proto => protobuf}/hello.proto (100%)
 rename samples/grpc-oauth2/src/main/{proto => protobuf}/hello.proto (100%)
 rename samples/grpc-reactive/src/main/{proto => protobuf}/hello.proto (100%)
 rename samples/grpc-secure/src/main/{proto => protobuf}/hello.proto (100%)
 rename samples/grpc-server-kotlin/src/main/{proto => protobuf}/hello.proto (100%)
 rename samples/grpc-server-netty-shaded/src/main/{proto => protobuf}/hello.proto (100%)
 rename samples/grpc-server/src/main/{proto => protobuf}/hello.proto (100%)
 rename samples/grpc-tomcat-secure/src/main/{proto => protobuf}/hello.proto (100%)
 rename samples/grpc-tomcat/src/main/{proto => protobuf}/hello.proto (100%)
 rename samples/grpc-webflux/src/main/{proto => protobuf}/hello.proto (100%)

diff --git a/samples/grpc-client/pom.xml b/samples/grpc-client/pom.xml
index 1e6b31e1..1b4b6cb3 100644
--- a/samples/grpc-client/pom.xml
+++ b/samples/grpc-client/pom.xml
@@ -110,26 +110,25 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.xolstice.maven.plugins</groupId>
+				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>0.6.1</version>
+				<version>3.1.2</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>
+					<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>
-						<configuration>
-							<pluginParameter>
-								jakarta_omit,@generated=omit
-							</pluginParameter>
-						</configuration>
 						<goals>
-							<goal>compile</goal>
-							<goal>compile-custom</goal>
+							<goal>generate</goal>
 						</goals>
 					</execution>
 				</executions>
diff --git a/samples/grpc-client/src/main/proto/hello.proto b/samples/grpc-client/src/main/protobuf/hello.proto
similarity index 100%
rename from samples/grpc-client/src/main/proto/hello.proto
rename to samples/grpc-client/src/main/protobuf/hello.proto
diff --git a/samples/grpc-oauth2/pom.xml b/samples/grpc-oauth2/pom.xml
index 6d4edd54..3886a76d 100644
--- a/samples/grpc-oauth2/pom.xml
+++ b/samples/grpc-oauth2/pom.xml
@@ -121,26 +121,25 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.xolstice.maven.plugins</groupId>
+				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>0.6.1</version>
+				<version>3.1.2</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>
+					<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>
-						<configuration>
-							<pluginParameter>
-								jakarta_omit,@generated=omit
-							</pluginParameter>
-						</configuration>
 						<goals>
-							<goal>compile</goal>
-							<goal>compile-custom</goal>
+							<goal>generate</goal>
 						</goals>
 					</execution>
 				</executions>
diff --git a/samples/grpc-oauth2/src/main/proto/hello.proto b/samples/grpc-oauth2/src/main/protobuf/hello.proto
similarity index 100%
rename from samples/grpc-oauth2/src/main/proto/hello.proto
rename to samples/grpc-oauth2/src/main/protobuf/hello.proto
diff --git a/samples/grpc-reactive/pom.xml b/samples/grpc-reactive/pom.xml
index 8ce10d5a..4d8df625 100644
--- a/samples/grpc-reactive/pom.xml
+++ b/samples/grpc-reactive/pom.xml
@@ -136,35 +136,32 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.xolstice.maven.plugins</groupId>
+				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>0.6.1</version>
+				<version>3.1.2</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>
+					<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>
+					<jvmMavenPlugins>
+						<jvmMavenPlugin>
+							<groupId>com.salesforce.servicelibs</groupId>
+							<artifactId>reactor-grpc</artifactId>
+							<version>1.2.4</version>
+						</jvmMavenPlugin>
+					</jvmMavenPlugins>
 				</configuration>
 				<executions>
 					<execution>
-						<configuration>
-							<pluginParameter>
-								jakarta_omit,@generated=omit
-							</pluginParameter>
-							<protocPlugins>
-								<protocPlugin>
-									<id>reactor-grpc</id>
-									<groupId>com.salesforce.servicelibs</groupId>
-									<artifactId>reactor-grpc</artifactId>
-									<version>1.2.4</version>
-									<mainClass>com.salesforce.reactorgrpc.ReactorGrpcGenerator</mainClass>
-								</protocPlugin>
-							</protocPlugins>
-						</configuration>
 						<goals>
-							<goal>compile</goal>
-							<goal>compile-custom</goal>
+							<goal>generate</goal>
 						</goals>
 					</execution>
 				</executions>
diff --git a/samples/grpc-reactive/src/main/proto/hello.proto b/samples/grpc-reactive/src/main/protobuf/hello.proto
similarity index 100%
rename from samples/grpc-reactive/src/main/proto/hello.proto
rename to samples/grpc-reactive/src/main/protobuf/hello.proto
diff --git a/samples/grpc-secure/pom.xml b/samples/grpc-secure/pom.xml
index 5342b340..f76707ef 100644
--- a/samples/grpc-secure/pom.xml
+++ b/samples/grpc-secure/pom.xml
@@ -114,26 +114,25 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.xolstice.maven.plugins</groupId>
+				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>0.6.1</version>
+				<version>3.1.2</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>
+					<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>
-						<configuration>
-							<pluginParameter>
-								jakarta_omit,@generated=omit
-							</pluginParameter>
-						</configuration>
 						<goals>
-							<goal>compile</goal>
-							<goal>compile-custom</goal>
+							<goal>generate</goal>
 						</goals>
 					</execution>
 				</executions>
diff --git a/samples/grpc-secure/src/main/proto/hello.proto b/samples/grpc-secure/src/main/protobuf/hello.proto
similarity index 100%
rename from samples/grpc-secure/src/main/proto/hello.proto
rename to samples/grpc-secure/src/main/protobuf/hello.proto
diff --git a/samples/grpc-server-kotlin/pom.xml b/samples/grpc-server-kotlin/pom.xml
index 456f94da..9523d18f 100644
--- a/samples/grpc-server-kotlin/pom.xml
+++ b/samples/grpc-server-kotlin/pom.xml
@@ -148,53 +148,41 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.xolstice.maven.plugins</groupId>
+                <groupId>io.github.ascopes</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.6.1</version>
+                <version>3.1.2</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>
-                    <protocPlugins>
-                        <protocPlugin>
-                            <id>grpc-kotlin</id>
+                    <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>
+                    <jvmMavenPlugins>
+                        <jvmMavenPlugin>
                             <groupId>io.grpc</groupId>
                             <artifactId>protoc-gen-grpc-kotlin</artifactId>
                             <version>${grpc.kotlin.version}</version>
                             <classifier>jdk8</classifier>
+                            <type>jar</type>
                             <mainClass>io.grpc.kotlin.generator.GeneratorRunner</mainClass>
-                        </protocPlugin>
-                    </protocPlugins>
+                            <options>jakarta_omit,@generated=omit</options>
+                        </jvmMavenPlugin>
+                    </jvmMavenPlugins>
                 </configuration>
                 <executions>
                     <execution>
-                        <configuration>
-                            <pluginParameter>
-                                jakarta_omit,@generated=omit
-                            </pluginParameter>
-                        </configuration>
                         <goals>
-                            <goal>compile</goal>
-                            <goal>compile-custom</goal>
+                            <goal>generate</goal>
                         </goals>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.1.2</version>
-                <configuration>
-                    <useModulePath>false</useModulePath>
-                    <includes>
-                        <include>**/*.class</include>
-                    </includes>
-                </configuration>
-            </plugin>
+
         </plugins>
     </build>
 
diff --git a/samples/grpc-server-kotlin/src/main/proto/hello.proto b/samples/grpc-server-kotlin/src/main/protobuf/hello.proto
similarity index 100%
rename from samples/grpc-server-kotlin/src/main/proto/hello.proto
rename to samples/grpc-server-kotlin/src/main/protobuf/hello.proto
diff --git a/samples/grpc-server-netty-shaded/pom.xml b/samples/grpc-server-netty-shaded/pom.xml
index 4ed9f7d5..ba1a86fc 100644
--- a/samples/grpc-server-netty-shaded/pom.xml
+++ b/samples/grpc-server-netty-shaded/pom.xml
@@ -111,27 +111,28 @@
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>org.xolstice.maven.plugins</groupId>
+				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>0.6.1</version>
+				<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>
 						<goals>
-							<goal>compile</goal>
-							<goal>compile-custom</goal>
+							<goal>generate</goal>
 						</goals>
 					</execution>
 				</executions>
-				<configuration>
-					<pluginParameter>
-						jakarta_omit,@generated=omit
-					</pluginParameter>
-					<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>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/samples/grpc-server-netty-shaded/src/main/proto/hello.proto b/samples/grpc-server-netty-shaded/src/main/protobuf/hello.proto
similarity index 100%
rename from samples/grpc-server-netty-shaded/src/main/proto/hello.proto
rename to samples/grpc-server-netty-shaded/src/main/protobuf/hello.proto
diff --git a/samples/grpc-server/pom.xml b/samples/grpc-server/pom.xml
index 1442fa50..1b902102 100644
--- a/samples/grpc-server/pom.xml
+++ b/samples/grpc-server/pom.xml
@@ -117,26 +117,25 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.xolstice.maven.plugins</groupId>
+				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>0.6.1</version>
+				<version>3.1.2</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>
+					<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>
-						<configuration>
-							<pluginParameter>
-								jakarta_omit,@generated=omit
-							</pluginParameter>
-						</configuration>
 						<goals>
-							<goal>compile</goal>
-							<goal>compile-custom</goal>
+							<goal>generate</goal>
 						</goals>
 					</execution>
 				</executions>
diff --git a/samples/grpc-server/src/main/proto/hello.proto b/samples/grpc-server/src/main/protobuf/hello.proto
similarity index 100%
rename from samples/grpc-server/src/main/proto/hello.proto
rename to samples/grpc-server/src/main/protobuf/hello.proto
diff --git a/samples/grpc-tomcat-secure/pom.xml b/samples/grpc-tomcat-secure/pom.xml
index e8801bbe..4b1ab9af 100644
--- a/samples/grpc-tomcat-secure/pom.xml
+++ b/samples/grpc-tomcat-secure/pom.xml
@@ -109,27 +109,28 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.xolstice.maven.plugins</groupId>
+				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>0.6.1</version>
+				<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>
 						<goals>
-							<goal>compile</goal>
-							<goal>compile-custom</goal>
+							<goal>generate</goal>
 						</goals>
 					</execution>
 				</executions>
-				<configuration>
-					<pluginParameter>
-						jakarta_omit,@generated=omit
-					</pluginParameter>
-					<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>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/samples/grpc-tomcat-secure/src/main/proto/hello.proto b/samples/grpc-tomcat-secure/src/main/protobuf/hello.proto
similarity index 100%
rename from samples/grpc-tomcat-secure/src/main/proto/hello.proto
rename to samples/grpc-tomcat-secure/src/main/protobuf/hello.proto
diff --git a/samples/grpc-tomcat/pom.xml b/samples/grpc-tomcat/pom.xml
index a984ef4f..6806f2eb 100644
--- a/samples/grpc-tomcat/pom.xml
+++ b/samples/grpc-tomcat/pom.xml
@@ -114,27 +114,28 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.xolstice.maven.plugins</groupId>
+				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>0.6.1</version>
+				<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>
 						<goals>
-							<goal>compile</goal>
-							<goal>compile-custom</goal>
+							<goal>generate</goal>
 						</goals>
 					</execution>
 				</executions>
-				<configuration>
-					<pluginParameter>
-						jakarta_omit,@generated=omit
-					</pluginParameter>
-					<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>
 			</plugin>
 		</plugins>
 	</build>
diff --git a/samples/grpc-tomcat/src/main/proto/hello.proto b/samples/grpc-tomcat/src/main/protobuf/hello.proto
similarity index 100%
rename from samples/grpc-tomcat/src/main/proto/hello.proto
rename to samples/grpc-tomcat/src/main/protobuf/hello.proto
diff --git a/samples/grpc-webflux/pom.xml b/samples/grpc-webflux/pom.xml
index 5576e3cb..84f60eb4 100644
--- a/samples/grpc-webflux/pom.xml
+++ b/samples/grpc-webflux/pom.xml
@@ -109,26 +109,25 @@
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.xolstice.maven.plugins</groupId>
+				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>0.6.1</version>
+				<version>3.1.2</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>
+					<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>
-						<configuration>
-							<pluginParameter>
-								jakarta_omit,@generated=omit
-							</pluginParameter>
-						</configuration>
 						<goals>
-							<goal>compile</goal>
-							<goal>compile-custom</goal>
+							<goal>generate</goal>
 						</goals>
 					</execution>
 				</executions>
diff --git a/samples/grpc-webflux/src/main/proto/hello.proto b/samples/grpc-webflux/src/main/protobuf/hello.proto
similarity index 100%
rename from samples/grpc-webflux/src/main/proto/hello.proto
rename to samples/grpc-webflux/src/main/protobuf/hello.proto