From 59db482ec567831ac88c32c9e1b446e26ddafff9 Mon Sep 17 00:00:00 2001
From: "Mateusz \"Serafin\" Gajewski" <mateusz.gajewski@gmail.com>
Date: Tue, 19 Sep 2023 10:41:33 +0200
Subject: [PATCH] Collapse repeated surefire plugin entries

---
 lib/trino-parquet/pom.xml    | 17 ++++++-----------
 plugin/trino-kinesis/pom.xml | 28 ++++++++++++----------------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/lib/trino-parquet/pom.xml b/lib/trino-parquet/pom.xml
index b5ebf74f3a81..8c006a0d08ab 100644
--- a/lib/trino-parquet/pom.xml
+++ b/lib/trino-parquet/pom.xml
@@ -199,6 +199,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <!--Disabled to reduce logging in CI https://github.com/trinodb/trino/issues/17452 -->
+                        <ProgressLoggingListener.enabled>false</ProgressLoggingListener.enabled>
+                    </systemPropertyVariables>
+                </configuration>
                 <dependencies>
                     <!-- allow both JUnit and TestNG -->
                     <dependency>
@@ -218,17 +224,6 @@
                     </dependency>
                 </dependencies>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemPropertyVariables>
-                        <!--Disabled to reduce logging in CI https://github.com/trinodb/trino/issues/17452 -->
-                        <ProgressLoggingListener.enabled>false</ProgressLoggingListener.enabled>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/plugin/trino-kinesis/pom.xml b/plugin/trino-kinesis/pom.xml
index f8e517fc421a..37bf75625bf7 100644
--- a/plugin/trino-kinesis/pom.xml
+++ b/plugin/trino-kinesis/pom.xml
@@ -191,6 +191,18 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <!--Run this after uncommenting properties below-->
+                        <exclude>**/TestMinimalFunctionality.java</exclude>
+                        <exclude>**/TestS3TableConfigClient.java</exclude>
+                    </excludes>
+                    <systemPropertyVariables>
+                        <kinesis.awsAccessKey>ACCESS-KEY</kinesis.awsAccessKey>
+                        <kinesis.awsSecretKey>SECRET-KEY</kinesis.awsSecretKey>
+                        <kinesis.test-table-description-location>s3://S3-LOC</kinesis.test-table-description-location>
+                    </systemPropertyVariables>
+                </configuration>
                 <dependencies>
                     <!-- allow both JUnit and TestNG -->
                     <dependency>
@@ -210,22 +222,6 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <!--Run this after uncommenting properties below-->
-                        <exclude>**/TestMinimalFunctionality.java</exclude>
-                        <exclude>**/TestS3TableConfigClient.java</exclude>
-                    </excludes>
-                    <systemPropertyVariables>
-                        <kinesis.awsAccessKey>ACCESS-KEY</kinesis.awsAccessKey>
-                        <kinesis.awsSecretKey>SECRET-KEY</kinesis.awsSecretKey>
-                        <kinesis.test-table-description-location>s3://S3-LOC</kinesis.test-table-description-location>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.basepom.maven</groupId>
                 <artifactId>duplicate-finder-maven-plugin</artifactId>