Revert to src/main/proto for samples

README.md

@@ -19,7 +19,7 @@ Generate the project and unzip the downloaded result.
 
 Open it in your IDE in the usual way. E.g. if you’re using IntelliJ IDEA: `idea pom.xml`; or for VSCode `code .`.
 
-Define a `.proto` service definition file `src/main/protobuf/hello.proto` with the following contents:
+Define a `.proto` service definition file `src/main/proto/hello.proto` with the following contents:
 
 ```proto
 syntax = "proto3";

samples/grpc-client/build.gradle

@@ -39,14 +39,6 @@ tasks.named('test') {
     useJUnitPlatform()
 }
 
-sourceSets {
-  main {
-    proto {
-      srcDir 'src/main/protobuf'
-    }
-  }
-}
-
 protobuf {
     protoc {
         artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"

samples/grpc-client/pom.xml

@@ -105,8 +105,11 @@
 			<plugin>
 				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>3.2.3</version>
+				<version>3.3.1</version>
 				<configuration>
+					<sourceDirectories>
+						<sourceDirectory>src/main/proto</sourceDirectory>
+					</sourceDirectories>
 					<protocVersion>${protobuf-java.version}</protocVersion>
 					<binaryMavenPlugins>
 						<binaryMavenPlugin>

samples/grpc-oauth2/build.gradle

@@ -49,14 +49,6 @@ test {
     outputs.upToDateWhen { false }
 }
 
-sourceSets {
-  main {
-    proto {
-      srcDir 'src/main/protobuf'
-    }
-  }
-}
-
 protobuf {
     protoc {
         artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"

samples/grpc-oauth2/pom.xml

@@ -116,8 +116,11 @@
 			<plugin>
 				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>3.2.3</version>
+				<version>3.3.1</version>
 				<configuration>
+					<sourceDirectories>
+						<sourceDirectory>src/main/proto</sourceDirectory>
+					</sourceDirectories>
 					<protocVersion>${protobuf-java.version}</protocVersion>
 					<binaryMavenPlugins>
 						<binaryMavenPlugin>

samples/grpc-reactive/build.gradle

@@ -47,14 +47,6 @@ test {
     outputs.upToDateWhen { false }
 }
 
-sourceSets {
-  main {
-    proto {
-      srcDir 'src/main/protobuf'
-    }
-  }
-}
-
 protobuf {
     protoc {
         artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"

samples/grpc-reactive/pom.xml

@@ -131,8 +131,11 @@
 			<plugin>
 				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>3.2.3</version>
+				<version>3.3.1</version>
 				<configuration>
+					<sourceDirectories>
+						<sourceDirectory>src/main/proto</sourceDirectory>
+					</sourceDirectories>
 					<protocVersion>${protobuf-java.version}</protocVersion>
 					<binaryMavenPlugins>
 						<binaryMavenPlugin>

samples/grpc-secure/build.gradle

@@ -42,14 +42,6 @@ test {
     outputs.upToDateWhen { false }
 }
 
-sourceSets {
-  main {
-    proto {
-      srcDir 'src/main/protobuf'
-    }
-  }
-}
-
 protobuf {
     protoc {
         artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"

samples/grpc-secure/pom.xml

@@ -109,8 +109,11 @@
 			<plugin>
 				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>3.2.3</version>
+				<version>3.3.1</version>
 				<configuration>
+					<sourceDirectories>
+						<sourceDirectory>src/main/proto</sourceDirectory>
+					</sourceDirectories>
 					<protocVersion>${protobuf-java.version}</protocVersion>
 					<binaryMavenPlugins>
 						<binaryMavenPlugin>

samples/grpc-server-kotlin/build.gradle

@@ -53,14 +53,6 @@ test {
     outputs.upToDateWhen { false }
 }
 
-sourceSets {
-  main {
-    proto {
-      srcDir 'src/main/protobuf'
-    }
-  }
-}
-
 protobuf {
     protoc {
         artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"

samples/grpc-server-kotlin/pom.xml

@@ -143,8 +143,11 @@
 			<plugin>
 				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>3.2.3</version>
+				<version>3.3.1</version>
 				<configuration>
+					<sourceDirectories>
+						<sourceDirectory>src/main/proto</sourceDirectory>
+					</sourceDirectories>
 					<protocVersion>${protobuf-java.version}</protocVersion>
 					<binaryMavenPlugins>
 						<binaryMavenPlugin>

samples/grpc-server-netty-shaded/build.gradle

@@ -47,14 +47,6 @@ test {
     outputs.upToDateWhen { false }
 }
 
-sourceSets {
-  main {
-    proto {
-      srcDir 'src/main/protobuf'
-    }
-  }
-}
-
 protobuf {
     protoc {
         artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"

samples/grpc-server-netty-shaded/pom.xml

@@ -106,8 +106,11 @@
 			<plugin>
 				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>3.2.3</version>
+				<version>3.3.1</version>
 				<configuration>
+					<sourceDirectories>
+						<sourceDirectory>src/main/proto</sourceDirectory>
+					</sourceDirectories>
 					<protocVersion>${protobuf-java.version}</protocVersion>
 					<binaryMavenPlugins>
 						<binaryMavenPlugin>

samples/grpc-server/build.gradle

@@ -43,14 +43,6 @@ test {
     outputs.upToDateWhen { false }
 }
 
-sourceSets {
-  main {
-    proto {
-      srcDir 'src/main/protobuf'
-    }
-  }
-}
-
 protobuf {
     protoc {
         artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"

samples/grpc-server/pom.xml

@@ -112,9 +112,12 @@
 			<plugin>
 				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>3.2.3</version>
+				<version>3.3.1</version>
 				<configuration>
 					<protocVersion>${protobuf-java.version}</protocVersion>
+					<sourceDirectories>
+						<sourceDirectory>src/main/proto</sourceDirectory>
+					</sourceDirectories>
 					<binaryMavenPlugins>
 						<binaryMavenPlugin>
 							<groupId>io.grpc</groupId>

samples/grpc-tomcat-secure/build.gradle

@@ -43,14 +43,6 @@ test {
     outputs.upToDateWhen { false }
 }
 
-sourceSets {
-  main {
-    proto {
-      srcDir 'src/main/protobuf'
-    }
-  }
-}
-
 protobuf {
     protoc {
         artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"

samples/grpc-tomcat-secure/pom.xml

@@ -104,8 +104,11 @@
 			<plugin>
 				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>3.2.3</version>
+				<version>3.3.1</version>
 				<configuration>
+					<sourceDirectories>
+						<sourceDirectory>src/main/proto</sourceDirectory>
+					</sourceDirectories>
 					<protocVersion>${protobuf-java.version}</protocVersion>
 					<binaryMavenPlugins>
 						<binaryMavenPlugin>

samples/grpc-tomcat/build.gradle

@@ -43,14 +43,6 @@ test {
     outputs.upToDateWhen { false }
 }
 
-sourceSets {
-  main {
-    proto {
-      srcDir 'src/main/protobuf'
-    }
-  }
-}
-
 protobuf {
     protoc {
         artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"

samples/grpc-tomcat/pom.xml

@@ -109,8 +109,11 @@
 			<plugin>
 				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>3.2.3</version>
+				<version>3.3.1</version>
 				<configuration>
+					<sourceDirectories>
+						<sourceDirectory>src/main/proto</sourceDirectory>
+					</sourceDirectories>
 					<protocVersion>${protobuf-java.version}</protocVersion>
 					<binaryMavenPlugins>
 						<binaryMavenPlugin>

samples/grpc-webflux/build.gradle

@@ -42,14 +42,6 @@ test {
     outputs.upToDateWhen { false }
 }
 
-sourceSets {
-  main {
-    proto {
-      srcDir 'src/main/protobuf'
-    }
-  }
-}
-
 protobuf {
     protoc {
         artifact = "com.google.protobuf:protoc:${dependencyManagement.importedProperties['protobuf-java.version']}"

samples/grpc-webflux/pom.xml

@@ -104,8 +104,11 @@
 			<plugin>
 				<groupId>io.github.ascopes</groupId>
 				<artifactId>protobuf-maven-plugin</artifactId>
-				<version>3.2.3</version>
+				<version>3.3.1</version>
 				<configuration>
+					<sourceDirectories>
+						<sourceDirectory>src/main/proto</sourceDirectory>
+					</sourceDirectories>
 					<protocVersion>${protobuf-java.version}</protocVersion>
 					<binaryMavenPlugins>
 						<binaryMavenPlugin>

spring-grpc-docs/src/main/antora/modules/ROOT/pages/getting-started.adoc

@@ -11,7 +11,7 @@ Generate the project and unzip the downloaded result.
 
 Open it in your IDE in the usual way. E.g. if you're using IntelliJ IDEA: `idea pom.xml`; or for VSCode `code .`.
 
-Define a `.proto` service definition file `src/main/protobuf/hello.proto` with the following contents:
+Define a `.proto` service definition file `src/main/proto/hello.proto` with the following contents:
 
 [source,proto]
 ----