You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2022/09/12 15:58:03 UTC
[cloudstack] branch 4.17 updated: jacoco: fix no coverage result in server and some other modules (#6730)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.17
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.17 by this push:
new 20950e0e1d jacoco: fix no coverage result in server and some other modules (#6730)
20950e0e1d is described below
commit 20950e0e1d5f5f417f8a4e07ab16169e94990e37
Author: Wei Zhou <we...@apache.org>
AuthorDate: Mon Sep 12 17:57:55 2022 +0200
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 41d6e43ec6..afb1f44226 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 9a6bb6ad3e..24104d406b 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 7d10dbdbc7..93e6384a0c 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 d12c65ab21..ccb19babc5 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 aa6dcc7084..2c4b828de2 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 5e192c03a1..b28ea2a9e7 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 4e0d3bee36..5281ab6f79 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>