diff --git a/pom.xml b/pom.xml
index 3006dd7b61b..b3cab5a6ced 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,18 +59,21 @@
1.8
3.0.0
3.1.0
- 2.7
+ 0.8.3
3.8.1
3.1.1
2.22.2
- 3.0.5
+ 3.1.12
+ 3.1.12.2
3.2.0
3.12.0
3.0.0
+ 5.3.0
2.5.3
3.1.0
3.8.2
2.22.2
+ 4.4.1
1.2.17
@@ -86,6 +89,7 @@
3.1
2.6
3.9
+ 1.2
3.6
1.6
1.10
@@ -124,25 +128,26 @@
3.2.6
2.6.11
0.0.27
+ 1.34.2
2.4.17
1.7.2
28.2-jre
4.5.11
4.4.13
2.17
- 2.9.10
+ 2.10.3
1.9.3
0.17
3.26.0-GA
- 3.1.1
+ 3.1.1
1.3.2
2.3.0
- 2.3.2
+ 2.3.2-1
1.19.4
9.4.26.v20200117
9.4.26.v20200117
4.0.0
- 2.8.1
+ 2.10.5
2.2.1
0.1.55
20090211
@@ -172,7 +177,6 @@
apache.cloudstack.site
- ${site.deploy.url}
@@ -278,6 +282,12 @@
aws-java-sdk-s3
${cs.aws.sdk.version}
+
+ com.fasterxml.jackson.core
+ jackson-core
+ ${cs.jackson.version}
+ bundle
+
com.globo.globodns
globodns-client
@@ -293,6 +303,11 @@
guava
${cs.guava.version}
+
+ com.google.http-client
+ google-http-client
+ ${cs.google-http-client}
+
com.googlecode.java-ipv6
java-ipv6
@@ -369,6 +384,11 @@
commons-lang
${cs.lang.version}
+
+ commons-logging
+ commons-logging
+ ${cs.commons-logging.version}
+
commons-net
commons-net
@@ -384,6 +404,11 @@
commons-validator
${cs.commons-validator.version}
+
+ javax.annotation
+ javax.annotation-api
+ ${cs.javax.annotation.version}
+
javax.mail
mail
@@ -394,6 +419,11 @@
javax.servlet-api
${cs.servlet.version}
+
+ joda-time
+ joda-time
+ ${cs.joda-time.version}
+
jstl
jstl
@@ -471,6 +501,11 @@
kafka-clients
${cs.kafka-clients.version}
+
+ org.apache.maven.doxia
+ doxia-site-renderer
+ 1.9.1
+
org.apache.servicemix.bundles
org.apache.servicemix.bundles.snmp4j
@@ -632,6 +667,16 @@
wsdl4j
1.6.3
+
+ xerces
+ xercesimpl
+ 2.12.0
+
+
+ xml-apis
+ xml-apis
+ 2.0.2
+
@@ -719,11 +764,12 @@
- org.codehaus.mojo
- findbugs-maven-plugin
+ com.github.spotbugs
+ spotbugs-maven-plugin
+ ${cs.spotbugs-maven-plugin.version}
- cloudstack-findbugs
+ cloudstack-spotbugs
none
check
@@ -731,6 +777,46 @@
+
+ org.jacoco
+ jacoco-maven-plugin
+ ${cs.jacoco-plugin.version}
+
+
+ org.openclover
+ clover-maven-plugin
+ ${cs.clover-maven-plugin.version}
+
+ threaded
+ 100
+ 0%
+ true
+ true
+ true
+
+
+
+ main
+ verify
+
+ instrument
+ aggregate
+ check
+ log
+
+
+
+ site
+ pre-site
+
+ instrument
+ aggregate
+
+ save-history
+
+
+
+
@@ -999,6 +1085,22 @@
+
+ org.owasp
+ dependency-check-maven
+ ${cs.owasp.dependency-checker-plugin.version}
+
+ true
+ true
+
+
+
+
+ check
+
+
+
+
org.apache.maven.plugins
maven-compiler-plugin
@@ -1053,19 +1155,9 @@
${cs.dependency-plugin.version}
- org.codehaus.mojo
- cobertura-maven-plugin
-
-
- html
- xml
-
-
-
-
- org.codehaus.mojo
- findbugs-maven-plugin
- ${cs.findbugs-plugin.version}
+ com.github.spotbugs
+ spotbugs-maven-plugin
+ ${cs.spotbugs-maven-plugin.version}
org.apache.cloudstack
@@ -1079,11 +1171,10 @@
true
false
2048
- findbugsExcludeFilter.xml
- cloudstack-findbugs
+ cloudstack-spotbugs
check
@@ -1123,7 +1214,7 @@
${cs.surefire-plugin.version}
false
- -Djava.security.egd=file:/dev/./urandom -noverify
+ @{argLine} -Djava.security.egd=file:/dev/./urandom -noverify
@@ -1131,40 +1222,57 @@
maven-failsafe-plugin
${cs.failsafe-plugin.version}
+
+ org.jacoco
+ jacoco-maven-plugin
+ ${cs.jacoco-plugin.version}
+
+
+ prepare-coverage-agent
+
+ prepare-agent
+
+
+
+ produce-coverage-reports
+ test
+
+ report
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-site-plugin
+ ${cs.site-plugin.version}
+
- org.codehaus.mojo
- findbugs-maven-plugin
- ${cs.findbugs-plugin.version}
+ org.owasp
+ dependency-check-maven
+ ${cs.owasp.dependency-checker-plugin.version}
+
+
+
+ aggregate
+
+
+
+
+
+ com.github.spotbugs
+ spotbugs-maven-plugin
+ ${cs.spotbugs-maven-plugin.version}
Low
Default
- ${basedir}/findbugsExcludeFilter.xml
-
- org.apache.maven.plugins
- maven-javadoc-plugin
- ${cs.javadoc.version}
-
- 128m
- 1g
-
-
-
- org.apache.maven.plugins
- maven-project-info-reports-plugin
- ${cs.project-info-plugin.version}
-
-
- org.codehaus.mojo
- cobertura-maven-plugin
- ${cs.cobertura-plugin.version}
-
org.apache.maven.plugins
maven-site-plugin
@@ -1175,6 +1283,19 @@
maven-resources-plugin
${cs.resources-plugin.version}
+
+ org.jacoco
+ jacoco-maven-plugin
+ ${cs.jacoco-plugin.version}
+
+
+
+
+ report
+
+
+
+
@@ -1248,21 +1369,26 @@
enablefindbugs
-
-
-
-
- org.codehaus.mojo
- findbugs-maven-plugin
+ com.github.spotbugs
+ spotbugs-maven-plugin
- cloudstack-findbugs
+ cloudstack-spotbugs
process-classes
true
+
+ org.openclover
+ clover-maven-plugin
+ ${cs.clover-maven-plugin.version}
+
+ true
+ true
+
+
diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index c07c01667ef..a63f62c9aa1 100644
--- a/tools/checkstyle/pom.xml
+++ b/tools/checkstyle/pom.xml
@@ -28,4 +28,19 @@
UTF-8
UTF-8
+
+
+
+
+ org.apache.maven.plugins
+ maven-site-plugin
+ 3.8.2
+
+
+ org.openclover
+ clover-maven-plugin
+ 4.4.1
+
+
+