Improve task relocatability in Protobuf plugin

buildSrc/build.gradle

@@ -46,6 +46,7 @@ dependencies {
 	implementation(platform("tools.jackson:jackson-bom:${jacksonVersion}"))
 	implementation(platform("org.springframework:spring-framework-bom:${springFrameworkVersion}"))
 	implementation("com.github.node-gradle:gradle-node-plugin:7.1.0")
+	implementation("com.google.protobuf:protobuf-gradle-plugin:${protobufGradlePluginVersion}")
 	implementation("com.gradle:develocity-gradle-plugin:4.2.2")
 	implementation("com.tngtech.archunit:archunit:1.4.1")
 	implementation("commons-codec:commons-codec:${commonsCodecVersion}")

buildSrc/src/main/java/org/springframework/boot/build/ConventionsPlugin.java

@@ -53,6 +53,7 @@ public void apply(Project project) {
 		new WarConventions().apply(project);
 		new EclipseConventions(systemRequirements).apply(project);
 		new TestFixturesConventions().apply(project);
+		new ProtobufConventions().apply(project);
 		RepositoryTransformersExtension.apply(project);
 	}
 

buildSrc/src/main/java/org/springframework/boot/build/ProtobufConventions.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2012-present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build;
+
+import com.google.protobuf.gradle.ProtobufExtension;
+import com.google.protobuf.gradle.ProtobufPlugin;
+import org.gradle.api.Project;
+
+/**
+ * Conventions that are applied in the presence of the {@link ProtobufPlugin} plugin.
+ *
+ * @author Eric Haag
+ */
+class ProtobufConventions {
+
+	void apply(Project project) {
+		project.getPlugins().withId("com.google.protobuf", (plugin) -> {
+			ProtobufExtension protobuf = project.getExtensions().getByType(ProtobufExtension.class);
+			removeUnusedMachineSpecificConfiguration(protobuf);
+		});
+	}
+
+	// See: https://github.com/google/protobuf-gradle-plugin/issues/785
+	private void removeUnusedMachineSpecificConfiguration(ProtobufExtension protobuf) {
+		protobuf.getJavaExecutablePath().convention("");
+	}
+
+}

smoke-test/spring-boot-smoke-test-grpc-client-test/build.gradle

@@ -16,7 +16,7 @@
 
 plugins {
 	id "java"
-	id "com.google.protobuf" version "${protobufGradlePluginVersion}"
+	id "com.google.protobuf"
 	id "org.springframework.boot.docker-test"
 }
 

smoke-test/spring-boot-smoke-test-grpc-client/build.gradle

@@ -16,7 +16,7 @@
 
 plugins {
 	id "java"
-	id "com.google.protobuf" version "${protobufGradlePluginVersion}"
+	id "com.google.protobuf"
 	id "org.springframework.boot.docker-test"
 }
 

smoke-test/spring-boot-smoke-test-grpc-server-netty-shaded/build.gradle

@@ -16,7 +16,7 @@
 
 plugins {
 	id "java"
-	id "com.google.protobuf" version "${protobufGradlePluginVersion}"
+	id "com.google.protobuf"
 	id "org.springframework.boot.docker-test"
 }
 

smoke-test/spring-boot-smoke-test-grpc-server-oauth/build.gradle

@@ -16,7 +16,7 @@
 
 plugins {
 	id "java"
-	id "com.google.protobuf" version "${protobufGradlePluginVersion}"
+	id "com.google.protobuf"
 	id "org.springframework.boot.docker-test"
 }
 

smoke-test/spring-boot-smoke-test-grpc-server-secure/build.gradle

@@ -16,7 +16,7 @@
 
 plugins {
 	id "java"
-	id "com.google.protobuf" version "${protobufGradlePluginVersion}"
+	id "com.google.protobuf"
 	id "org.springframework.boot.docker-test"
 }
 

smoke-test/spring-boot-smoke-test-grpc-server-servlet/build.gradle

@@ -16,7 +16,7 @@
 
 plugins {
 	id "java"
-	id "com.google.protobuf" version "${protobufGradlePluginVersion}"
+	id "com.google.protobuf"
 	id "org.springframework.boot.docker-test"
 }
 

smoke-test/spring-boot-smoke-test-grpc-server-test/build.gradle

@@ -16,7 +16,7 @@
 
 plugins {
 	id "java"
-	id "com.google.protobuf" version "${protobufGradlePluginVersion}"
+	id "com.google.protobuf"
 	id "org.springframework.boot.docker-test"
 }
 

smoke-test/spring-boot-smoke-test-grpc-server/build.gradle

@@ -16,7 +16,7 @@
 
 plugins {
 	id "java"
-	id "com.google.protobuf" version "${protobufGradlePluginVersion}"
+	id "com.google.protobuf"
 	id "org.springframework.boot.docker-test"
 }