From 0de5ba898353689ecc8bf9301714398d5505b26e Mon Sep 17 00:00:00 2001
From: Marcono1234 <Marcono1234@users.noreply.github.com>
Date: Sat, 2 Nov 2024 00:41:52 +0100
Subject: [PATCH] Improve Maven plugin configuration

- Explicitly specifies `org.apache.maven.plugins` group ID
- Removes redundant `maven-failsafe-plugin` version in `test-shrinker` module
  This is inherited from the parent POM
- Adds required Error Prone compiler arg, see https://github.com/google/error-prone/releases/tag/v2.34.0
---
 gson/pom.xml          | 1 +
 pom.xml               | 2 ++
 test-shrinker/pom.xml | 1 -
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/gson/pom.xml b/gson/pom.xml
index ba735d00e8..8ddddc088c 100644
--- a/gson/pom.xml
+++ b/gson/pom.xml
@@ -257,6 +257,7 @@
         </configuration>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
         <version>3.3.1</version>
         <executions>
diff --git a/pom.xml b/pom.xml
index a4d3df950d..ada307803d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -228,6 +228,7 @@
             <compilerArgs>
               <!-- Args related to Error Prone, see: https://errorprone.info/docs/installation#maven -->
               <arg>-XDcompilePolicy=simple</arg>
+              <arg>--should-stop=ifError=FLOW</arg>
               <arg>-Xplugin:ErrorProne
                 -XepExcludedPaths:.*/generated-test-sources/protobuf/.*
                 -Xep:NotJavadoc:OFF <!-- Triggered by local class. -->
@@ -403,6 +404,7 @@
           </configuration>
         </plugin>
         <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
           <version>3.1.0</version>
           <executions>
diff --git a/test-shrinker/pom.xml b/test-shrinker/pom.xml
index a0b678ace0..5decdd6048 100644
--- a/test-shrinker/pom.xml
+++ b/test-shrinker/pom.xml
@@ -198,7 +198,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
-        <version>3.5.1</version>
         <executions>
           <execution>
             <goals>