This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 578d29e16650d519e80928c33e0956d6ed1fa1b9
Merge: 14c0d9e 5c29d5b
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Tue Sep 1 16:01:52 2020 +0530
Merge remote-tracking branch 'origin/4.13' into 4.14
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
pom.xml | 2 +-
.../main/java/com/cloud/server/StatsCollector.java | 30 +++++++++++++---------
2 files changed, 19 insertions(+), 13 deletions(-)
diff --cc pom.xml
index d6ec3d5,64a34f7..47e9a8d
--- a/pom.xml
+++ b/pom.xml
@@@ -103,59 -99,57 +103,59 @@@
<!-- do not forget to also upgrade hamcrest library with junit -->
<cs.dbunit.version>2.5.4</cs.dbunit.version>
<cs.hamcrest.version>1.3</cs.hamcrest.version>
- <cs.junit.version>4.12</cs.junit.version>
+ <cs.junit.version>4.13</cs.junit.version>
<cs.junit.dataprovider.version>1.13.1</cs.junit.dataprovider.version>
<cs.guava-testlib.version>18.0</cs.guava-testlib.version>
- <cs.mockito.version>1.10.19</cs.mockito.version>
- <cs.powermock.version>1.6.4</cs.powermock.version>
+ <cs.mockito.version>3.2.4</cs.mockito.version>
+ <cs.powermock.version>2.0.5</cs.powermock.version>
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
<cs.selenium-java-client-driver.version>1.0.1</cs.selenium-java-client-driver.version>
- <cs.testng.version>6.1.1</cs.testng.version>
+ <cs.testng.version>7.1.0</cs.testng.version>
<cs.wiremock.version>2.11.0</cs.wiremock.version>
- <cs.xercesImpl.version>2.11.0</cs.xercesImpl.version>
+ <cs.xercesImpl.version>2.12.0</cs.xercesImpl.version>
<!-- Dependencies versions -->
- <cs.amqp-client.version>5.1.1</cs.amqp-client.version>
+ <cs.amqp-client.version>5.8.0</cs.amqp-client.version>
<cs.apache-cloudstack-java-client.version>1.0.9</cs.apache-cloudstack-java-client.version>
- <cs.aspectjrt.version>1.7.1</cs.aspectjrt.version>
- <cs.aws.sdk.version>1.11.213</cs.aws.sdk.version>
+ <cs.aspectjrt.version>1.9.5</cs.aspectjrt.version>
+ <cs.aws.sdk.version>1.11.717</cs.aws.sdk.version>
<cs.axiom.version>1.2.8</cs.axiom.version>
<cs.axis.version>1.4</cs.axis.version>
- <cs.axis2.version>1.5.6</cs.axis2.version>
- <cs.batik.version>1.9.1</cs.batik.version>
- <cs.bcprov.version>1.59</cs.bcprov.version>
- <cs.cglib.version>3.2.5</cs.cglib.version>
- <cs.checkstyle-lib.version>8.7</cs.checkstyle-lib.version>
- <cs.cxf.version>3.2.0</cs.cxf.version>
+ <cs.batik.version>1.12</cs.batik.version>
+ <cs.bcprov.version>1.64</cs.bcprov.version>
+ <cs.cglib.version>3.3.0</cs.cglib.version>
+ <cs.checkstyle-lib.version>8.18</cs.checkstyle-lib.version>
+ <cs.cxf.version>3.2.6</cs.cxf.version>
<cs.ehcache.version>2.6.11</cs.ehcache.version>
- <cs.globodns-client.version>0.0.23</cs.globodns-client.version>
- <cs.groovy.version>2.4.12</cs.groovy.version>
+ <cs.globodns-client.version>0.0.27</cs.globodns-client.version>
+ <cs.google-http-client>1.34.2</cs.google-http-client>
+ <cs.groovy.version>2.4.17</cs.groovy.version>
<cs.gson.version>1.7.2</cs.gson.version>
- <cs.guava.version>23.6-jre</cs.guava.version>
- <cs.httpclient.version>4.5.4</cs.httpclient.version>
- <cs.httpcore.version>4.4.8</cs.httpcore.version>
+ <cs.guava.version>28.2-jre</cs.guava.version>
+ <cs.httpclient.version>4.5.11</cs.httpclient.version>
+ <cs.httpcore.version>4.4.13</cs.httpcore.version>
- <cs.influxdb-java.version>2.17</cs.influxdb-java.version>
+ <cs.influxdb-java.version>2.20</cs.influxdb-java.version>
- <cs.jackson.version>2.9.2</cs.jackson.version>
- <cs.jasypt.version>1.9.2</cs.jasypt.version>
- <cs.java-ipv6.version>0.16</cs.java-ipv6.version>
- <cs.javassist.version>3.22.0-GA</cs.javassist.version>
- <cs.javadoc.version>2.10.3</cs.javadoc.version>
+ <cs.jackson.version>2.10.3</cs.jackson.version>
+ <cs.jasypt.version>1.9.3</cs.jasypt.version>
+ <cs.java-ipv6.version>0.17</cs.java-ipv6.version>
+ <cs.javassist.version>3.26.0-GA</cs.javassist.version>
+
<cs.maven-javadoc-plugin.version>3.1.1</cs.maven-javadoc-plugin.version>
+ <cs.javax.annotation.version>1.3.2</cs.javax.annotation.version>
+ <cs.jaxb.version>2.3.0</cs.jaxb.version>
+ <cs.jaxws.version>2.3.2-1</cs.jaxws.version>
<cs.jersey-bundle.version>1.19.4</cs.jersey-bundle.version>
- <cs.jetty.version>9.4.8.v20171121</cs.jetty.version>
-
<cs.jetty-maven-plugin.version>9.2.22.v20170606</cs.jetty-maven-plugin.version>
+ <cs.jetty.version>9.4.27.v20200227</cs.jetty.version>
+
<cs.jetty-maven-plugin.version>9.4.27.v20200227</cs.jetty-maven-plugin.version>
<cs.jna.version>4.0.0</cs.jna.version>
- <cs.joda-time.version>2.8.1</cs.joda-time.version>
- <cs.jpa.version>2.2.0</cs.jpa.version>
- <cs.jsch.version>0.1.54</cs.jsch.version>
+ <cs.joda-time.version>2.10.5</cs.joda-time.version>
+ <cs.jpa.version>2.2.1</cs.jpa.version>
+ <cs.jsch.version>0.1.55</cs.jsch.version>
<cs.json.version>20090211</cs.json.version>
<cs.jstl.version>1.2</cs.jstl.version>
- <cs.jstl-api.version>1.2.1</cs.jstl-api.version>
- <cs.kafka-clients.version>0.11.0.1</cs.kafka-clients.version>
+ <cs.kafka-clients.version>0.11.0.3</cs.kafka-clients.version>
<cs.libvirt-java.version>0.5.1</cs.libvirt-java.version>
<cs.mail.version>1.5.0-b01</cs.mail.version>
- <cs.mysql.version>5.1.34</cs.mysql.version>
+ <cs.mysql.version>8.0.19</cs.mysql.version>
<cs.neethi.version>2.0.4</cs.neethi.version>
<cs.nitro.version>10.1</cs.nitro.version>
<cs.opensaml.version>2.6.4</cs.opensaml.version>
