From 20950e0e1d5f5f417f8a4e07ab16169e94990e37 Mon Sep 17 00:00:00 2001
From: Wei Zhou <weizhou@apache.org>
Date: Mon, 12 Sep 2022 17:57:55 +0200
Subject: [PATCH] jacoco: fix no coverage result in server and some other
 modules (#6730)

According to https://www.eclemma.org/jacoco/trunk/doc/prepare-agent-mojo.html
we need to add "@{argLine}" to argLine if it exists in pom.xml
---
 plugins/api/discovery/pom.xml                     | 2 +-
 plugins/api/rate-limit/pom.xml                    | 2 +-
 plugins/api/solidfire-intg-test/pom.xml           | 2 +-
 plugins/api/vmware-sioc/pom.xml                   | 2 +-
 plugins/metrics/pom.xml                           | 2 +-
 plugins/network-elements/juniper-contrail/pom.xml | 2 +-
 server/pom.xml                                    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/api/discovery/pom.xml b/plugins/api/discovery/pom.xml
index 41d6e43ec68..afb1f442262 100644
--- a/plugins/api/discovery/pom.xml
+++ b/plugins/api/discovery/pom.xml
@@ -46,7 +46,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>-Xmx1024m</argLine>
+                    <argLine>@{argLine} -Xmx1024m</argLine>
                     <excludes>
                         <exclude>org/apache/cloudstack/discovery/integration/*</exclude>
                     </excludes>
diff --git a/plugins/api/rate-limit/pom.xml b/plugins/api/rate-limit/pom.xml
index 9a6bb6ad3e2..24104d406b7 100644
--- a/plugins/api/rate-limit/pom.xml
+++ b/plugins/api/rate-limit/pom.xml
@@ -34,7 +34,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <forkMode>always</forkMode>
-                    <argLine>-Xmx2048m -XX:MaxPermSize=1024m</argLine>
+                    <argLine>@{argLine} -Xmx2048m -XX:MaxPermSize=1024m</argLine>
                     <excludes>
                         <exclude>org/apache/cloudstack/ratelimit/integration/*</exclude>
                     </excludes>
diff --git a/plugins/api/solidfire-intg-test/pom.xml b/plugins/api/solidfire-intg-test/pom.xml
index 7d10dbdbc7a..93e6384a0cc 100644
--- a/plugins/api/solidfire-intg-test/pom.xml
+++ b/plugins/api/solidfire-intg-test/pom.xml
@@ -40,7 +40,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>-Xmx1024m</argLine>
+                    <argLine>@{argLine} -Xmx1024m</argLine>
                     <excludes>
                         <exclude>org/apache/cloudstack/solidfire/integration/*</exclude>
                     </excludes>
diff --git a/plugins/api/vmware-sioc/pom.xml b/plugins/api/vmware-sioc/pom.xml
index d12c65ab212..ccb19babc51 100644
--- a/plugins/api/vmware-sioc/pom.xml
+++ b/plugins/api/vmware-sioc/pom.xml
@@ -46,7 +46,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>-Xmx1024m</argLine>
+                    <argLine>@{argLine} -Xmx1024m</argLine>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/plugins/metrics/pom.xml b/plugins/metrics/pom.xml
index aa6dcc7084c..2c4b828de22 100644
--- a/plugins/metrics/pom.xml
+++ b/plugins/metrics/pom.xml
@@ -45,7 +45,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>-Xmx1024m</argLine>
+                    <argLine>@{argLine} -Xmx1024m</argLine>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml
index 5e192c03a11..b28ea2a9e71 100644
--- a/plugins/network-elements/juniper-contrail/pom.xml
+++ b/plugins/network-elements/juniper-contrail/pom.xml
@@ -136,7 +136,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <forkMode>always</forkMode>
-                    <argLine>-Xmx1024m</argLine>
+                    <argLine>@{argLine} -Xmx1024m</argLine>
                     <excludes>
                         <exclude>**/NetworkProviderTest.java</exclude>
                         <exclude>**/PublicNetworkTest.java</exclude>
diff --git a/server/pom.xml b/server/pom.xml
index 4e0d3bee363..5281ab6f794 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -206,7 +206,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>-Xmx2048m -XX:MaxPermSize=512m -Djava.security.egd=file:/dev/./urandom</argLine>
+                    <argLine>@{argLine} -Xmx2048m -XX:MaxPermSize=512m -Djava.security.egd=file:/dev/./urandom</argLine>
                     <excludes>
                         <exclude>%regex[.*[0-9]*To[0-9]*.*Test.*]</exclude>
                         <exclude>com/cloud/upgrade/AdvanceZone223To224UpgradeTest</exclude>