From 0e1e5c621870fca94c271e6e8b4b0bb1668234de Mon Sep 17 00:00:00 2001
From: Jark Wu <jark@apache.org>
Date: Thu, 2 Dec 2021 14:29:43 +0800
Subject: [PATCH] [build] Remove override definition of maven-surefire-plugin
 in connectors pom (#673)

---
 flink-connector-mongodb-cdc/pom.xml  | 16 ----------------
 flink-connector-mysql-cdc/pom.xml    | 16 ----------------
 flink-connector-oracle-cdc/pom.xml   | 15 ---------------
 flink-connector-postgres-cdc/pom.xml | 16 ----------------
 pom.xml                              |  4 +++-
 5 files changed, 3 insertions(+), 64 deletions(-)

diff --git a/flink-connector-mongodb-cdc/pom.xml b/flink-connector-mongodb-cdc/pom.xml
index d64e5c164..da280132e 100644
--- a/flink-connector-mongodb-cdc/pom.xml
+++ b/flink-connector-mongodb-cdc/pom.xml
@@ -155,20 +155,4 @@ under the License.
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <!-- Enforce single fork execution due to heavy mini cluster use in the tests -->
-                    <forkCount>1</forkCount>
-                    <argLine>-Xms256m -Xmx2048m -Dlog4j.configurationFile=${log4j.configuration}
-                        -Dmvn.forkNumber=${surefire.forkNumber} -XX:-UseGCOverheadLimit
-                    </argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
\ No newline at end of file
diff --git a/flink-connector-mysql-cdc/pom.xml b/flink-connector-mysql-cdc/pom.xml
index dabc4e884..6d71503d5 100644
--- a/flink-connector-mysql-cdc/pom.xml
+++ b/flink-connector-mysql-cdc/pom.xml
@@ -189,20 +189,4 @@ under the License.
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <!-- Enforce single fork execution due to heavy mini cluster use in the tests -->
-                    <forkCount>1</forkCount>
-                    <argLine>-Xms256m -Xmx2048m -Dlog4j.configurationFile=${log4j.configuration}
-                        -Dmvn.forkNumber=${surefire.forkNumber} -XX:-UseGCOverheadLimit
-                    </argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
\ No newline at end of file
diff --git a/flink-connector-oracle-cdc/pom.xml b/flink-connector-oracle-cdc/pom.xml
index ee09e2d09..bbd2eda1b 100644
--- a/flink-connector-oracle-cdc/pom.xml
+++ b/flink-connector-oracle-cdc/pom.xml
@@ -154,19 +154,4 @@ under the License.
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <!-- Enforce single fork execution due to heavy mini cluster use in the tests -->
-                    <forkCount>1</forkCount>
-                    <!-- Prevent ORA-01882: timezone region not found errors due to the Oracle DB does not understanding some time zone which used in Ubuntu OS -->
-                     <argLine>-Xms256m -Xmx2048m -Dlog4j.configurationFile=${log4j.configuration} -Dmvn.forkNumber=${surefire.forkNumber} -XX:-UseGCOverheadLimit -Doracle.jdbc.timezoneAsRegion=false</argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/flink-connector-postgres-cdc/pom.xml b/flink-connector-postgres-cdc/pom.xml
index dbdebd51c..301003aed 100644
--- a/flink-connector-postgres-cdc/pom.xml
+++ b/flink-connector-postgres-cdc/pom.xml
@@ -159,20 +159,4 @@ under the License.
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <!-- Enforce single fork execution due to heavy mini cluster use in the tests -->
-                    <forkCount>1</forkCount>
-                    <argLine>-Xms256m -Xmx2048m -Dlog4j.configurationFile=${log4j.configuration}
-                        -Dmvn.forkNumber=${surefire.forkNumber} -XX:-UseGCOverheadLimit
-                    </argLine>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2af2c8d49..e061e9e68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -317,8 +317,10 @@ under the License.
                         <forkNumber>0${surefire.forkNumber}</forkNumber>
                         <log4j.configuration>${log4j.configuration}</log4j.configuration>
                     </systemPropertyVariables>
+                    <!-- Prevent ORA-01882: timezone region not found errors due to the Oracle DB
+                         does not understanding some time zone which used in Ubuntu OS -->
                     <argLine>-Xms256m -Xmx2048m -Dmvn.forkNumber=${surefire.forkNumber}
-                        -XX:+UseG1GC
+                        -XX:+UseG1GC -Doracle.jdbc.timezoneAsRegion=false
                     </argLine>
                 </configuration>
             </plugin>