You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/04/28 22:01:23 UTC
[1/9] git commit: updated refs/heads/master to 1f53adb
Repository: cloudstack
Updated Branches:
refs/heads/master ad61d49d8 -> 1f53adbac
CLOUDSTACK-9194: Making the console popup window resizable in IE to make sure the focus is not lost.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e985db90
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e985db90
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e985db90
Branch: refs/heads/master
Commit: e985db90573accb2abb391c75223d111cb17a664
Parents: 7e12ebf
Author: Anshul Gangwar <an...@citrix.com>
Authored: Fri May 8 15:59:54 2015 +0530
Committer: Anshul Gangwar <an...@citrix.com>
Committed: Tue Dec 22 11:23:46 2015 +0530
----------------------------------------------------------------------
ui/scripts/ui/widgets/detailView.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e985db90/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index ddd7265..2ce72a2 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -301,7 +301,7 @@
}),
// Window options
- 'menubar=0,resizable=0,' + 'width=' + externalLinkAction.width + ',' + 'height=' + externalLinkAction.height
+ 'menubar=0,resizable=1,' + 'width=' + externalLinkAction.width + ',' + 'height=' + externalLinkAction.height
);
} else {
notification.desc = messages.notification(messageArgs);
[8/9] git commit: updated refs/heads/master to 1f53adb
Posted by sw...@apache.org.
Merge pull request #1522 from myENA/logjobid_master
Log asynchronous responses in the api logCurrently API responses for synchronous calls are logged, but asynchronous call responses are not. This pull request makes a minor modification that logs the response including the JobId of all asynchronous requests.
As an example, here is what a stopVirtualMachine request looked like in the logs:
2016-04-27 10:43:11,084 INFO [a.c.c.a.ApiServer] (catalina-exec-3:ctx-37d9f693 ctx-d2368de3) (logid:3a0fad97) (userId=2 accountId=2 sessionId=AF8B1F726ACB5C3A637B8B300AA218A7) 10.103.0.207 -- GET command=stopVirtualMachine&id=f63b6fcc-e0b0-480f-8f7a-cba329634ba1&forced=false&response=json&_=1461771791036 200
After this modification, here is what the logs look like:
2016-04-27 13:37:11,338 INFO [a.c.c.a.ApiServer] (catalina-exec-6:ctx-915b5c84 ctx-a03152fa) (logid:66249df0) (userId=2 accountId=2 sessionId=9EF127EED5CA6E74797DFE487D980FAF) 10.103.0.207 -- GET command=stopVirtualMachine&id=f63b6fcc-e0b0-480f-8f7a-cba329634ba1&forced=false&response=json&_=1461782231194 200 {"stopvirtualmachineresponse":{"jobid":"5b9f4a9b-eabe-4fa4-849d-3d004bb65634"}}
* pr/1522:
Log responses from asynchronous api commands
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/91ce3b9f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/91ce3b9f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/91ce3b9f
Branch: refs/heads/master
Commit: 91ce3b9ffb9b9c6e62c1a0c75573235adc6f250c
Parents: 4db5e48 7778e24
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Apr 28 15:59:57 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Apr 28 15:59:57 2016 -0400
----------------------------------------------------------------------
server/src/com/cloud/api/ApiServer.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[7/9] git commit: updated refs/heads/master to 1f53adb
Posted by sw...@apache.org.
Merge pull request #1510 from shapeblue/4.9-mvn-version-safeupgradeonly
4.9 mvn version safeupgradeonlyUpgrades maven dependencies versions that can be safely upgraded without breaking console-proxy/crypto usage.
Bisected changes from: https://github.com/apache/cloudstack/pull/1397
cc @swill @DaanHoogland
* pr/1510:
maven: fix dependency version support by JDK7
further maven dependency updates from Daan
framework/quota: fix checkstyle issue
maven: Upgrade dependency versions
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4db5e48f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4db5e48f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4db5e48f
Branch: refs/heads/master
Commit: 4db5e48f8044fc9dff2c457322d49d70640b925e
Parents: ad61d49 8af677a
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Apr 28 15:59:17 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Apr 28 15:59:17 2016 -0400
----------------------------------------------------------------------
client/pom.xml | 6 +-
engine/api/pom.xml | 2 +-
engine/service/pom.xml | 15 +--
.../cloudstack/quota/QuotaStatementImpl.java | 8 +-
.../cloudstack/quota/QuotaStatementTest.java | 22 ++--
framework/rest/pom.xml | 14 +-
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/hypervisors/hyperv/pom.xml | 5 -
plugins/network-elements/globodns/pom.xml | 2 +-
.../network-elements/juniper-contrail/pom.xml | 2 +-
plugins/network-elements/netscaler/pom.xml | 4 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
plugins/user-authenticators/ldap/pom.xml | 6 +-
plugins/user-authenticators/saml2/pom.xml | 11 +-
pom.xml | 132 ++++++++++++-------
server/pom.xml | 5 +-
services/console-proxy-rdp/rdpconsole/pom.xml | 3 +-
services/secondary-storage/server/pom.xml | 2 +-
tools/checkstyle/pom.xml | 7 +-
tools/whisker/LICENSE | 2 +-
tools/whisker/descriptor-for-packaging.xml | 4 +-
usage/pom.xml | 6 +-
utils/pom.xml | 4 +-
24 files changed, 146 insertions(+), 122 deletions(-)
----------------------------------------------------------------------
[4/9] git commit: updated refs/heads/master to 1f53adb
Posted by sw...@apache.org.
further maven dependency updates from Daan
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/10166899
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/10166899
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/10166899
Branch: refs/heads/master
Commit: 101668994dd27e3ca67c09a8118dbcea255805fd
Parents: 770aa01
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri Apr 22 16:25:27 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Apr 22 16:36:37 2016 +0530
----------------------------------------------------------------------
client/pom.xml | 5 +-
engine/service/pom.xml | 15 +---
framework/rest/pom.xml | 14 ++--
plugins/hypervisors/hyperv/pom.xml | 5 --
plugins/network-elements/netscaler/pom.xml | 4 +-
plugins/user-authenticators/ldap/pom.xml | 4 +-
plugins/user-authenticators/saml2/pom.xml | 5 --
pom.xml | 86 ++++++++++++++++++----
server/pom.xml | 5 +-
services/console-proxy-rdp/rdpconsole/pom.xml | 1 +
tools/whisker/LICENSE | 2 +-
tools/whisker/descriptor-for-packaging.xml | 4 +-
utils/pom.xml | 2 +-
13 files changed, 95 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10166899/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 5cafd83..1f3665d 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -429,9 +429,8 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.26</version>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
<dependencies>
<!-- specify the dependent jdbc driver here -->
<dependency>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10166899/engine/service/pom.xml
----------------------------------------------------------------------
diff --git a/engine/service/pom.xml b/engine/service/pom.xml
index b816f29..7f07323 100644
--- a/engine/service/pom.xml
+++ b/engine/service/pom.xml
@@ -61,17 +61,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle-jaxrs</artifactId>
- <version>2.7.18</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
@@ -84,9 +73,9 @@
<finalName>engine</finalName>
<plugins>
<plugin>
- <groupId>org.mortbay.jetty</groupId>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>8.1.7.v20120910</version>
+ <version>${cs.jetty.version}</version>
<configuration>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webApp>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10166899/framework/rest/pom.xml
----------------------------------------------------------------------
diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml
index 54cc4b6..03aad76 100644
--- a/framework/rest/pom.xml
+++ b/framework/rest/pom.xml
@@ -33,32 +33,32 @@
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>2.7.1</version>
+ <version>${cs.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.7.1</version>
+ <version>${cs.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.7.1</version>
+ <version>${cs.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.7.1</version>
+ <version>${cs.jackson.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.7.1</version>
+ <version>${cs.jackson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle-jaxrs</artifactId>
- <version>2.7.18</version>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cs.cxf.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10166899/plugins/hypervisors/hyperv/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml
index d88fd14..165eaf6 100644
--- a/plugins/hypervisors/hyperv/pom.xml
+++ b/plugins/hypervisors/hyperv/pom.xml
@@ -42,11 +42,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.26</version>
- </dependency>
- <dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-utils</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10166899/plugins/network-elements/netscaler/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml
index 2475c41..d7b54e9 100644
--- a/plugins/network-elements/netscaler/pom.xml
+++ b/plugins/network-elements/netscaler/pom.xml
@@ -30,12 +30,12 @@
<dependency>
<groupId>com.citrix.netscaler.nitro</groupId>
<artifactId>nitro</artifactId>
- <version>10.1</version>
+ <version>${cs.nitro.version}</version>
</dependency>
<dependency>
<groupId>com.citrix.netscaler.nitro</groupId>
<artifactId>sdx_nitro</artifactId>
- <version>10.1</version>
+ <version>${cs.nitro.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10166899/plugins/user-authenticators/ldap/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index 32970a7..7b3b8f7 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -97,12 +97,14 @@
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
<version>1.0-groovy-2.4</version>
+ <scope>test</scope>
</dependency>
<!-- Optional dependencies for using Spock -->
<dependency> <!-- enables mocking of classes (in addition to interfaces) -->
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- </dependency>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10166899/plugins/user-authenticators/saml2/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml
index bff0814..a541902 100644
--- a/plugins/user-authenticators/saml2/pom.xml
+++ b/plugins/user-authenticators/saml2/pom.xml
@@ -28,11 +28,6 @@
</parent>
<dependencies>
<dependency>
- <groupId>org.springframework.security.extensions</groupId>
- <artifactId>spring-security-saml2-core</artifactId>
- <version>1.0.1.RELEASE</version>
- </dependency>
- <dependency>
<groupId>org.opensaml</groupId>
<artifactId>opensaml</artifactId>
<version>${cs.opensaml.version}</version>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10166899/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3f546e9..3b78e99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
<!-- do not forget to also upgrade hamcrest library with junit -->
<cs.junit.version>4.12</cs.junit.version>
<cs.hamcrest.version>1.3</cs.hamcrest.version>
- <cs.bcprov.version>1.46</cs.bcprov.version>
+ <cs.bcprov.version>1.54</cs.bcprov.version>
<cs.jsch.version>0.1.53</cs.jsch.version>
<cs.jpa.version>2.1.1</cs.jpa.version>
<cs.jasypt.version>1.9.2</cs.jasypt.version>
@@ -86,17 +86,19 @@
<cs.axiom.version>1.2.8</cs.axiom.version>
<cs.neethi.version>2.0.4</cs.neethi.version>
<cs.servlet.version>2.5</cs.servlet.version>
- <cs.jstl.version>1.2</cs.jstl.version>
+ <cs.jstl.version>1.2.1</cs.jstl.version>
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
<cs.vmware.api.version>5.5</cs.vmware.api.version>
<org.springframework.version>3.2.16.RELEASE</org.springframework.version>
<cs.mockito.version>1.10.19</cs.mockito.version>
<cs.powermock.version>1.6.4</cs.powermock.version>
<cs.aws.sdk.version>1.10.50</cs.aws.sdk.version>
- <cs.jackson.version>2.6.3</cs.jackson.version>
+ <cs.jackson.version>2.7.1</cs.jackson.version>
<cs.lang.version>2.6</cs.lang.version>
<cs.commons-lang3.version>3.4</cs.commons-lang3.version>
<cs.commons-io.version>2.4</cs.commons-io.version>
+ <cs.commons-fileupload.version>1.3.1</cs.commons-fileupload.version>
+ <cs.commons-collections.version>3.2.2</cs.commons-collections.version>
<cs.commons-validator.version>1.5.0</cs.commons-validator.version>
<cs.reflections.version>0.9.10</cs.reflections.version>
<cs.java-ipv6.version>0.16</cs.java-ipv6.version>
@@ -110,9 +112,18 @@
<cs.mycila.license.version>2.11</cs.mycila.license.version>
<cs.findbugs.version>3.0.3</cs.findbugs.version>
<cs.javadoc.version>2.10.3</cs.javadoc.version>
- <cs.opensaml.version>2.6.1</cs.opensaml.version>
+ <cs.opensaml.version>2.6.4</cs.opensaml.version>
<cs.xml-apis.version>1.4.01</cs.xml-apis.version>
<cs.joda-time.version>2.8.1</cs.joda-time.version>
+ <cs.batik.version>1.8</cs.batik.version>
+ <cs.servicemix.version>2.3.4_1</cs.servicemix.version>
+ <cs.jetty.version>9.3.7.v20160115</cs.jetty.version>
+ <cs.cxf.version>3.1.4</cs.cxf.version>
+ <cs.spring-security-saml2-core.version>1.0.1.RELEASE</cs.spring-security-saml2-core.version>
+ <cs.spring-security-core.version>4.0.3.RELEASE</cs.spring-security-core.version>
+ <cs.groovy.version>2.4.3</cs.groovy.version>
+ <cs.apache-jsp.version>9.3.7.v20160115</cs.apache-jsp.version>
+ <cs.nitro.version>10.1</cs.nitro.version>
</properties>
<distributionManagement>
@@ -205,6 +216,51 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>apache-jsp</artifactId>
+ <version>${cs.apache-jsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>${cs.groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>${cs.spring-security-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security.extensions</groupId>
+ <artifactId>spring-security-saml2-core</artifactId>
+ <version>${cs.spring-security-saml2-core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${cs.bcprov.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-css</artifactId>
+ <version>${cs.batik.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-ext</artifactId>
+ <version>${cs.batik.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xmlgraphics</groupId>
+ <artifactId>batik-util</artifactId>
+ <version>${cs.batik.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${cs.commons-collections.version}</version>
+ </dependency>
+ <dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${cs.mysql.version}</version>
@@ -242,26 +298,26 @@
<version>${cs.ehcache.version}</version>
</dependency>
<dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${cs.pool.version}</version>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${cs.codec.version}</version>
</dependency>
<dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>${cs.commons-fileupload.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${cs.pool.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId>
<version>${cs.commons-validator.version}</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
- <version>${cs.bcprov.version}</version>
- </dependency>
- <dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
<version>${cs.jsch.version}</version>
@@ -386,7 +442,7 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
- <version>2.3.4_1</version>
+ <version>${cs.servicemix.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10166899/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index b8e3598..8461d18 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -70,8 +70,9 @@
<artifactId>mail</artifactId>
</dependency>
<dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
+ <groupId>javax.servlet.jsp.jstl</groupId>
+ <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+ <version>${cs.jstl.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10166899/services/console-proxy-rdp/rdpconsole/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml
index a27f2eb..628d039 100755
--- a/services/console-proxy-rdp/rdpconsole/pom.xml
+++ b/services/console-proxy-rdp/rdpconsole/pom.xml
@@ -77,6 +77,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
+ <version>1.46</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10166899/tools/whisker/LICENSE
----------------------------------------------------------------------
diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE
index 61ebc50..da8aaed 100644
--- a/tools/whisker/LICENSE
+++ b/tools/whisker/LICENSE
@@ -2896,7 +2896,7 @@ Within the target/jar directory
cloud-axis.jar from http://axis.apache.org/axis/
cloud-cglib.jar from http://cglib.sourceforge.net/
cloud-commons-codec-1.5.jar from http://commons.apache.org/codec/
- cloud-commons-collections-3.2.1.jar from http://commons.apache.org/collections/
+ cloud-commons-collections-3.2.2.jar from http://commons.apache.org/collections/
cloud-commons-configuration-1.8.jar from http://commons.apache.org/configuration/
cloud-commons-dbcp-1.4.jar from http://commons.apache.org/dbcp/
cloud-commons-httpclient-3.1.jar from http://hc.apache.org/httpclient-3.x/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10166899/tools/whisker/descriptor-for-packaging.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml
index 1a68a0d..01e6026 100644
--- a/tools/whisker/descriptor-for-packaging.xml
+++ b/tools/whisker/descriptor-for-packaging.xml
@@ -2673,7 +2673,7 @@ Copyright (C) 2008 Tóth István <stoty@tvnet.hu>
2009-2011 Bryan Kearney <bkearney@redhat.com>
</copyright-notice>
<by-organisation id='libvirt.org'>
- <resource name='libvirt-java-0.4.9' />
+ <resource name='libvirt-java-0.5.1' />
</by-organisation>
</with-license>
<with-license id="ApacheLicenseVersion2">
@@ -2683,7 +2683,7 @@ Copyright (c) 2012 The Apache Software Foundation
<by-organisation id="apache.org.2">
<resource name="cloud-axis.jar" source="http://axis.apache.org/axis/" notice='axis2.notice'/>
<resource name="cloud-commons-codec-1.5.jar" source="http://commons.apache.org/codec/" notice="codec" />
- <resource name="cloud-commons-collections-3.2.1.jar" source="http://commons.apache.org/collections/"/>
+ <resource name="cloud-commons-collections-3.2.2.jar" source="http://commons.apache.org/collections/"/>
<resource name="cloud-commons-configuration-1.8.jar" source="http://commons.apache.org/configuration/"/>
<resource name="cloud-commons-dbcp-1.4.jar" source="http://commons.apache.org/dbcp/" />
<resource name="cloud-commons-httpclient-3.1.jar" source="http://hc.apache.org/httpclient-3.x/" />
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10166899/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 93d7d01..206eb18 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
+ <artifactId>bcprov-jdk15on</artifactId>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
[6/9] git commit: updated refs/heads/master to 1f53adb
Posted by sw...@apache.org.
Log responses from asynchronous api commands
This is mainly useful so that we can see the job ids in the logs
whenever the job is created via the API.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7778e24b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7778e24b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7778e24b
Branch: refs/heads/master
Commit: 7778e24bf7bb7bd2c1a19fde5fb711b8d8086446
Parents: 5c1ad90
Author: Nathan Johnson <nj...@ena.com>
Authored: Wed Apr 27 14:49:50 2016 -0500
Committer: Nathan Johnson <nj...@ena.com>
Committed: Wed Apr 27 19:43:57 2016 -0500
----------------------------------------------------------------------
server/src/com/cloud/api/ApiServer.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7778e24b/server/src/com/cloud/api/ApiServer.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index f76b851..6ec2f18 100644
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -686,14 +686,21 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
s_logger.warn(errorMsg);
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, errorMsg);
}
-
+ final String response;
if (objectId != null) {
final String objUuid = (objectUuid == null) ? objectId.toString() : objectUuid;
- return getBaseAsyncCreateResponse(jobId, (BaseAsyncCreateCmd)asyncCmd, objUuid);
+ response = getBaseAsyncCreateResponse(jobId, (BaseAsyncCreateCmd)asyncCmd, objUuid);
} else {
SerializationContext.current().setUuidTranslation(true);
- return getBaseAsyncResponse(jobId, asyncCmd);
+ response = getBaseAsyncResponse(jobId, asyncCmd);
}
+ // Always log response for async for now, I don't think any sensitive data will be in here.
+ // It might be nice to send this through scrubbing similar to how
+ // ApiResponseSerializer.toSerializedStringWithSecureLogs works. For now, this gets jobid's
+ // in the api logs.
+ log.append(response);
+ return response;
+
} else {
dispatcher.dispatch(cmdObj, params, false);
[2/9] git commit: updated refs/heads/master to 1f53adb
Posted by sw...@apache.org.
maven: Upgrade dependency versions
Updated most dependencies to latest minor releases, EXCEPT:
- Gson 2.x
- Major spring framework version
- Servlet version
- Embedded jetty version
- Mockito version (beta)
- Mysql lib minor version upgrade (breaks mysql-ha plugin)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bb29b1d0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bb29b1d0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bb29b1d0
Branch: refs/heads/master
Commit: bb29b1d06389e41c779d94f2d433f3b7c48009b3
Parents: d518b61
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Jan 27 01:41:02 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Apr 22 16:20:16 2016 +0530
----------------------------------------------------------------------
engine/api/pom.xml | 2 +-
engine/service/pom.xml | 2 +-
framework/rest/pom.xml | 12 ++--
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/network-elements/globodns/pom.xml | 2 +-
.../network-elements/juniper-contrail/pom.xml | 2 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
plugins/user-authenticators/saml2/pom.xml | 2 +-
pom.xml | 58 +++++++++-----------
services/console-proxy-rdp/rdpconsole/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 2 +-
tools/checkstyle/pom.xml | 7 +--
usage/pom.xml | 6 +-
utils/pom.xml | 2 +-
16 files changed, 49 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/engine/api/pom.xml
----------------------------------------------------------------------
diff --git a/engine/api/pom.xml b/engine/api/pom.xml
index 01a6051..1f539fb 100644
--- a/engine/api/pom.xml
+++ b/engine/api/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-jaxrs</artifactId>
- <version>2.7.13</version>
+ <version>2.7.18</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/engine/service/pom.xml
----------------------------------------------------------------------
diff --git a/engine/service/pom.xml b/engine/service/pom.xml
index 38b6035..b816f29 100644
--- a/engine/service/pom.xml
+++ b/engine/service/pom.xml
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-jaxrs</artifactId>
- <version>2.7.13</version>
+ <version>2.7.18</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/framework/rest/pom.xml
----------------------------------------------------------------------
diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml
index 830b7ec..54cc4b6 100644
--- a/framework/rest/pom.xml
+++ b/framework/rest/pom.xml
@@ -33,32 +33,32 @@
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
- <version>2.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>2.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>2.6.3</version>
+ <version>2.7.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-bundle-jaxrs</artifactId>
- <version>2.7.13</version>
+ <version>2.7.18</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/plugins/event-bus/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/event-bus/kafka/pom.xml b/plugins/event-bus/kafka/pom.xml
index b6827a1..2c79aa8 100644
--- a/plugins/event-bus/kafka/pom.xml
+++ b/plugins/event-bus/kafka/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>0.8.2.0</version>
+ <version>0.9.0.0</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/plugins/event-bus/rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml
index bc8f78c..937d5bb 100644
--- a/plugins/event-bus/rabbitmq/pom.xml
+++ b/plugins/event-bus/rabbitmq/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
- <version>3.5.4</version>
+ <version>3.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/plugins/network-elements/globodns/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/globodns/pom.xml b/plugins/network-elements/globodns/pom.xml
index 9e177a5..9d2c354 100644
--- a/plugins/network-elements/globodns/pom.xml
+++ b/plugins/network-elements/globodns/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>com.globo.globodns</groupId>
<artifactId>globodns-client</artifactId>
- <version>0.0.15</version>
+ <version>0.0.20</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/plugins/network-elements/juniper-contrail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml
index cac4d59..13a3c5b 100644
--- a/plugins/network-elements/juniper-contrail/pom.xml
+++ b/plugins/network-elements/juniper-contrail/pom.xml
@@ -109,7 +109,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.9.5</version>
+ <version>1.10.19</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/plugins/storage/volume/cloudbyte/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml
index 2a4e02d..9cc874e 100755
--- a/plugins/storage/volume/cloudbyte/pom.xml
+++ b/plugins/storage/volume/cloudbyte/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
- <version>1.18.3</version>
+ <version>1.19</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/plugins/user-authenticators/ldap/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml
index a2af718..32970a7 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.spockframework</groupId>
<artifactId>spock-core</artifactId>
- <version>0.7-groovy-2.0</version>
+ <version>1.0-groovy-2.4</version>
</dependency>
<!-- Optional dependencies for using Spock -->
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/plugins/user-authenticators/saml2/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml
index a978860..bff0814 100644
--- a/plugins/user-authenticators/saml2/pom.xml
+++ b/plugins/user-authenticators/saml2/pom.xml
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.springframework.security.extensions</groupId>
<artifactId>spring-security-saml2-core</artifactId>
- <version>1.0.0.RELEASE</version>
+ <version>1.0.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.opensaml</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c18c377..3f546e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,10 +44,6 @@
<url>https://issues.apache.org/jira/browse/CLOUDSTACK</url>
</issueManagement>
- <prerequisites>
- <maven>3.0.4</maven>
- </prerequisites>
-
<properties>
<cs.jdk.version>1.7</cs.jdk.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -55,7 +51,7 @@
<cs.log4j.version>1.2.17</cs.log4j.version>
<cs.log4j.extras.version>1.2.17</cs.log4j.extras.version>
- <cs.cglib.version>3.1</cs.cglib.version>
+ <cs.cglib.version>3.2.0</cs.cglib.version>
<cs.dbcp.version>1.4</cs.dbcp.version>
<cs.pool.version>1.6</cs.pool.version>
<cs.codec.version>1.10</cs.codec.version>
@@ -65,25 +61,25 @@
<cs.discovery.version>0.5</cs.discovery.version>
<cs.ejb.version>3.0</cs.ejb.version>
<!-- do not forget to also upgrade hamcrest library with junit -->
- <cs.junit.version>4.11</cs.junit.version>
+ <cs.junit.version>4.12</cs.junit.version>
<cs.hamcrest.version>1.3</cs.hamcrest.version>
<cs.bcprov.version>1.46</cs.bcprov.version>
- <cs.jsch.version>0.1.51</cs.jsch.version>
- <cs.jpa.version>2.1.0</cs.jpa.version>
+ <cs.jsch.version>0.1.53</cs.jsch.version>
+ <cs.jpa.version>2.1.1</cs.jpa.version>
<cs.jasypt.version>1.9.2</cs.jasypt.version>
- <cs.trilead.version>1.0.0-build217</cs.trilead.version>
- <cs.ehcache.version>2.6.9</cs.ehcache.version>
+ <cs.trilead.version>1.0.0-build220</cs.trilead.version>
+ <cs.ehcache.version>2.6.11</cs.ehcache.version>
<cs.gson.version>1.7.2</cs.gson.version>
<cs.guava-testlib.version>18.0</cs.guava-testlib.version>
- <cs.guava.version>18.0</cs.guava.version>
+ <cs.guava.version>19.0</cs.guava.version>
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
- <cs.httpclient.version>4.5</cs.httpclient.version>
- <cs.httpcore.version>4.4</cs.httpcore.version>
+ <cs.httpclient.version>4.5.1</cs.httpclient.version>
+ <cs.httpcore.version>4.4.4</cs.httpcore.version>
<cs.commons-httpclient.version>3.1</cs.commons-httpclient.version>
<cs.mysql.version>5.1.34</cs.mysql.version>
- <cs.xstream.version>1.4.7</cs.xstream.version>
+ <cs.xstream.version>1.4.8</cs.xstream.version>
<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
- <cs.mail.version>1.4.7</cs.mail.version>
+ <cs.mail.version>1.5.0-b01</cs.mail.version>
<cs.axis.version>1.4</cs.axis.version>
<cs.axis2.version>1.5.6</cs.axis2.version>
<cs.rampart.version>1.5.1</cs.rampart.version>
@@ -93,27 +89,27 @@
<cs.jstl.version>1.2</cs.jstl.version>
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
<cs.vmware.api.version>5.5</cs.vmware.api.version>
- <org.springframework.version>3.2.12.RELEASE</org.springframework.version>
- <cs.mockito.version>1.9.5</cs.mockito.version>
- <cs.powermock.version>1.5.3</cs.powermock.version>
- <cs.aws.sdk.version>1.10.34</cs.aws.sdk.version>
+ <org.springframework.version>3.2.16.RELEASE</org.springframework.version>
+ <cs.mockito.version>1.10.19</cs.mockito.version>
+ <cs.powermock.version>1.6.4</cs.powermock.version>
+ <cs.aws.sdk.version>1.10.50</cs.aws.sdk.version>
<cs.jackson.version>2.6.3</cs.jackson.version>
<cs.lang.version>2.6</cs.lang.version>
<cs.commons-lang3.version>3.4</cs.commons-lang3.version>
<cs.commons-io.version>2.4</cs.commons-io.version>
- <cs.commons-validator.version>1.4.0</cs.commons-validator.version>
- <cs.reflections.version>0.9.9</cs.reflections.version>
- <cs.java-ipv6.version>0.15</cs.java-ipv6.version>
+ <cs.commons-validator.version>1.5.0</cs.commons-validator.version>
+ <cs.reflections.version>0.9.10</cs.reflections.version>
+ <cs.java-ipv6.version>0.16</cs.java-ipv6.version>
<cs.replace.properties>build/replace.properties</cs.replace.properties>
<cs.libvirt-java.version>0.5.1</cs.libvirt-java.version>
<cs.rados-java.version>0.2.0</cs.rados-java.version>
<cs.target.dir>target</cs.target.dir>
<cs.daemon.version>1.0.15</cs.daemon.version>
<cs.jna.version>4.0.0</cs.jna.version>
- <cs.checkstyle.version>2.11</cs.checkstyle.version>
- <cs.mycila.license.version>2.7</cs.mycila.license.version>
- <cs.findbugs.version>3.0.1</cs.findbugs.version>
- <cs.javadoc.version>2.10.1</cs.javadoc.version>
+ <cs.checkstyle.version>2.17</cs.checkstyle.version>
+ <cs.mycila.license.version>2.11</cs.mycila.license.version>
+ <cs.findbugs.version>3.0.3</cs.findbugs.version>
+ <cs.javadoc.version>2.10.3</cs.javadoc.version>
<cs.opensaml.version>2.6.1</cs.opensaml.version>
<cs.xml-apis.version>1.4.01</cs.xml-apis.version>
<cs.joda-time.version>2.8.1</cs.joda-time.version>
@@ -390,17 +386,17 @@
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
- <version>2.3.1_1</version>
+ <version>2.3.4_1</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
- <version>1.8.4</version>
+ <version>1.8.8</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.8.4</version>
+ <version>1.8.8</version>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
@@ -425,12 +421,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.7</version>
+ <version>1.7.14</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.7</version>
+ <version>1.7.14</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/services/console-proxy-rdp/rdpconsole/pom.xml
----------------------------------------------------------------------
diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml
index ba31183..a27f2eb 100755
--- a/services/console-proxy-rdp/rdpconsole/pom.xml
+++ b/services/console-proxy-rdp/rdpconsole/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
- <version>8.0.15</version>
+ <version>8.0.30</version>
</dependency>
<!-- Another implementation of SSL protocol. Does not work with broken MS RDP SSL too. -->
<dependency>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/services/secondary-storage/server/pom.xml
----------------------------------------------------------------------
diff --git a/services/secondary-storage/server/pom.xml b/services/secondary-storage/server/pom.xml
index b6bfbf7..f3d0176 100644
--- a/services/secondary-storage/server/pom.xml
+++ b/services/secondary-storage/server/pom.xml
@@ -57,7 +57,7 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
- <version>4.0.25.Final</version>
+ <version>4.0.33.Final</version>
<scope>compile</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/tools/checkstyle/pom.xml
----------------------------------------------------------------------
diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml
index f4ee2b8..c0c39c9 100644
--- a/tools/checkstyle/pom.xml
+++ b/tools/checkstyle/pom.xml
@@ -25,12 +25,7 @@
<groupId>org.apache.cloudstack</groupId>
<artifactId>checkstyle</artifactId>
<version>4.9.0-SNAPSHOT</version>
-
-
- <prerequisites>
- <maven>3.0.4</maven>
- </prerequisites>
-
+
<build>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/usage/pom.xml
----------------------------------------------------------------------
diff --git a/usage/pom.xml b/usage/pom.xml
index ff10e81..7e9e8c4 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -53,17 +53,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.7</version>
+ <version>1.7.14</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.7</version>
+ <version>1.7.14</version>
</dependency>
<dependency>
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
- <version>2.4.9</version>
+ <version>2.5.1</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb29b1d0/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 3a23a58..93d7d01 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -157,7 +157,7 @@
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>3.3</version>
+ <version>3.4</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
[9/9] git commit: updated refs/heads/master to 1f53adb
Posted by sw...@apache.org.
Merge pull request #1270 from anshul1886/CLOUDSTACK-9194
CLOUDSTACK-9194: Making the console popup window resizable in IE to make sure the focus is not losthttps://issues.apache.org/jira/browse/CLOUDSTACK-9194
To test:
Open any VM console in IE, and try resizing the browser window of console
It should be resizable.
* pr/1270:
CLOUDSTACK-9194: Making the console popup window resizable in IE to make sure the focus is not lost.
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1f53adba
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1f53adba
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1f53adba
Branch: refs/heads/master
Commit: 1f53adbac67f87723eaa078ea182ee0ee89850ef
Parents: 91ce3b9 e985db9
Author: Will Stevens <wi...@gmail.com>
Authored: Thu Apr 28 16:00:46 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Thu Apr 28 16:00:47 2016 -0400
----------------------------------------------------------------------
ui/scripts/ui/widgets/detailView.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[5/9] git commit: updated refs/heads/master to 1f53adb
Posted by sw...@apache.org.
maven: fix dependency version support by JDK7
- Fix jetty dependency that is compatible with Java7
- Upgrade minor revisions of dependencies
- Upgrade vmware mvn sdk dependency to 6.0
- Downgrade bounty castle version to 1.46 (same as before)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8af677a0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8af677a0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8af677a0
Branch: refs/heads/master
Commit: 8af677a0f0b2a74db74223fc3d0e2d3e9549e960
Parents: 1016689
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Jan 28 13:06:08 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Apr 22 17:29:59 2016 +0530
----------------------------------------------------------------------
client/pom.xml | 1 +
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
plugins/user-authenticators/saml2/pom.xml | 6 ++++
pom.xml | 40 +++++++++-----------------
usage/pom.xml | 6 ++--
7 files changed, 27 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8af677a0/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 1f3665d..a1e4f60 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -431,6 +431,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
+ <version>${cs.jetty.version}</version>
<dependencies>
<!-- specify the dependent jdbc driver here -->
<dependency>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8af677a0/plugins/event-bus/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/event-bus/kafka/pom.xml b/plugins/event-bus/kafka/pom.xml
index 2c79aa8..2bae703 100644
--- a/plugins/event-bus/kafka/pom.xml
+++ b/plugins/event-bus/kafka/pom.xml
@@ -36,7 +36,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>0.9.0.0</version>
+ <version>0.9.0.1</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8af677a0/plugins/event-bus/rabbitmq/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml
index 937d5bb..7e79709 100644
--- a/plugins/event-bus/rabbitmq/pom.xml
+++ b/plugins/event-bus/rabbitmq/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>com.rabbitmq</groupId>
<artifactId>amqp-client</artifactId>
- <version>3.6.0</version>
+ <version>3.6.1</version>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8af677a0/plugins/storage/volume/cloudbyte/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml
index 9cc874e..5372ab8 100755
--- a/plugins/storage/volume/cloudbyte/pom.xml
+++ b/plugins/storage/volume/cloudbyte/pom.xml
@@ -54,7 +54,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-bundle</artifactId>
- <version>1.19</version>
+ <version>1.19.1</version>
</dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8af677a0/plugins/user-authenticators/saml2/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml
index a541902..5e24df3 100644
--- a/plugins/user-authenticators/saml2/pom.xml
+++ b/plugins/user-authenticators/saml2/pom.xml
@@ -47,5 +47,11 @@
<artifactId>cloud-framework-config</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.11.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8af677a0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3b78e99..01828d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<cs.log4j.version>1.2.17</cs.log4j.version>
<cs.log4j.extras.version>1.2.17</cs.log4j.extras.version>
- <cs.cglib.version>3.2.0</cs.cglib.version>
+ <cs.cglib.version>3.2.1</cs.cglib.version>
<cs.dbcp.version>1.4</cs.dbcp.version>
<cs.pool.version>1.6</cs.pool.version>
<cs.codec.version>1.10</cs.codec.version>
@@ -63,7 +63,7 @@
<!-- do not forget to also upgrade hamcrest library with junit -->
<cs.junit.version>4.12</cs.junit.version>
<cs.hamcrest.version>1.3</cs.hamcrest.version>
- <cs.bcprov.version>1.54</cs.bcprov.version>
+ <cs.bcprov.version>1.46</cs.bcprov.version>
<cs.jsch.version>0.1.53</cs.jsch.version>
<cs.jpa.version>2.1.1</cs.jpa.version>
<cs.jasypt.version>1.9.2</cs.jasypt.version>
@@ -73,11 +73,11 @@
<cs.guava-testlib.version>18.0</cs.guava-testlib.version>
<cs.guava.version>19.0</cs.guava.version>
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
- <cs.httpclient.version>4.5.1</cs.httpclient.version>
+ <cs.httpclient.version>4.5.2</cs.httpclient.version>
<cs.httpcore.version>4.4.4</cs.httpcore.version>
<cs.commons-httpclient.version>3.1</cs.commons-httpclient.version>
<cs.mysql.version>5.1.34</cs.mysql.version>
- <cs.xstream.version>1.4.8</cs.xstream.version>
+ <cs.xstream.version>1.4.9</cs.xstream.version>
<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
<cs.mail.version>1.5.0-b01</cs.mail.version>
<cs.axis.version>1.4</cs.axis.version>
@@ -88,11 +88,11 @@
<cs.servlet.version>2.5</cs.servlet.version>
<cs.jstl.version>1.2.1</cs.jstl.version>
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
- <cs.vmware.api.version>5.5</cs.vmware.api.version>
+ <cs.vmware.api.version>6.0</cs.vmware.api.version>
<org.springframework.version>3.2.16.RELEASE</org.springframework.version>
<cs.mockito.version>1.10.19</cs.mockito.version>
<cs.powermock.version>1.6.4</cs.powermock.version>
- <cs.aws.sdk.version>1.10.50</cs.aws.sdk.version>
+ <cs.aws.sdk.version>1.10.64</cs.aws.sdk.version>
<cs.jackson.version>2.7.1</cs.jackson.version>
<cs.lang.version>2.6</cs.lang.version>
<cs.commons-lang3.version>3.4</cs.commons-lang3.version>
@@ -117,12 +117,10 @@
<cs.joda-time.version>2.8.1</cs.joda-time.version>
<cs.batik.version>1.8</cs.batik.version>
<cs.servicemix.version>2.3.4_1</cs.servicemix.version>
- <cs.jetty.version>9.3.7.v20160115</cs.jetty.version>
+ <cs.jetty.version>9.2.15.v20160210</cs.jetty.version>
<cs.cxf.version>3.1.4</cs.cxf.version>
- <cs.spring-security-saml2-core.version>1.0.1.RELEASE</cs.spring-security-saml2-core.version>
- <cs.spring-security-core.version>4.0.3.RELEASE</cs.spring-security-core.version>
- <cs.groovy.version>2.4.3</cs.groovy.version>
- <cs.apache-jsp.version>9.3.7.v20160115</cs.apache-jsp.version>
+ <cs.groovy.version>2.4.6</cs.groovy.version>
+ <cs.apache-jsp.version>9.2.15.v20160210</cs.apache-jsp.version>
<cs.nitro.version>10.1</cs.nitro.version>
</properties>
@@ -226,16 +224,6 @@
<version>${cs.groovy.version}</version>
</dependency>
<dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${cs.spring-security-core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security.extensions</groupId>
- <artifactId>spring-security-saml2-core</artifactId>
- <version>${cs.spring-security-saml2-core.version}</version>
- </dependency>
- <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${cs.bcprov.version}</version>
@@ -377,7 +365,7 @@
<dependency>
<groupId>org.owasp.esapi</groupId>
<artifactId>esapi</artifactId>
- <version>2.1.0</version>
+ <version>2.1.0.1</version>
</dependency>
<dependency>
<groupId>org.eclipse.persistence</groupId>
@@ -447,12 +435,12 @@
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
- <version>1.8.8</version>
+ <version>1.8.9</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.8.8</version>
+ <version>1.8.9</version>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
@@ -477,12 +465,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.14</version>
+ <version>1.7.21</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.14</version>
+ <version>1.7.21</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8af677a0/usage/pom.xml
----------------------------------------------------------------------
diff --git a/usage/pom.xml b/usage/pom.xml
index 7e9e8c4..dd80e82 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -53,17 +53,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.14</version>
+ <version>1.7.21</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.7.14</version>
+ <version>1.7.21</version>
</dependency>
<dependency>
<groupId>org.dbunit</groupId>
<artifactId>dbunit</artifactId>
- <version>2.5.1</version>
+ <version>2.5.2</version>
<scope>test</scope>
</dependency>
</dependencies>
[3/9] git commit: updated refs/heads/master to 1f53adb
Posted by sw...@apache.org.
framework/quota: fix checkstyle issue
Fixes enum name to supress checkstyle failure due to the latest checkstyle
version
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/770aa013
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/770aa013
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/770aa013
Branch: refs/heads/master
Commit: 770aa0133ee3011239033e2dfe3f6ed41b76761a
Parents: bb29b1d
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Tue Feb 2 19:55:06 2016 +0100
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Apr 22 16:20:34 2016 +0530
----------------------------------------------------------------------
.../cloudstack/quota/QuotaStatementImpl.java | 8 +++----
.../cloudstack/quota/QuotaStatementTest.java | 22 ++++++++++----------
2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/770aa013/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java
----------------------------------------------------------------------
diff --git a/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java b/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java
index 5c12ae6..30d2589 100644
--- a/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java
+++ b/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java
@@ -59,11 +59,11 @@ public class QuotaStatementImpl extends ManagerBase implements QuotaStatement {
final public static int s_LAST_STATEMENT_SENT_DAYS = 6; //ideally should be less than 7 days
- public enum STATEMENT_PERIODS {
+ public enum QuotaStatementPeriods {
BIMONTHLY, MONTHLY, QUATERLY, HALFYEARLY, YEARLY
};
- private STATEMENT_PERIODS _period = STATEMENT_PERIODS.MONTHLY;
+ private QuotaStatementPeriods _period = QuotaStatementPeriods.MONTHLY;
public QuotaStatementImpl() {
super();
@@ -87,7 +87,7 @@ public class QuotaStatementImpl extends ManagerBase implements QuotaStatement {
String period_str = configs.get(QuotaConfig.QuotaStatementPeriod.key());
int period = period_str == null ? 1 : Integer.parseInt(period_str);
- STATEMENT_PERIODS _period = STATEMENT_PERIODS.values()[period];
+ QuotaStatementPeriods _period = QuotaStatementPeriods.values()[period];
return true;
}
@@ -265,7 +265,7 @@ public class QuotaStatementImpl extends ManagerBase implements QuotaStatement {
return null;
}
- public Calendar[] statementTime(final Calendar today, final STATEMENT_PERIODS period) {
+ public Calendar[] statementTime(final Calendar today, final QuotaStatementPeriods period) {
//check if it is statement time
int day_of_month = today.get(Calendar.DAY_OF_MONTH);
int month_of_year = today.get(Calendar.MONTH);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/770aa013/framework/quota/test/org/apache/cloudstack/quota/QuotaStatementTest.java
----------------------------------------------------------------------
diff --git a/framework/quota/test/org/apache/cloudstack/quota/QuotaStatementTest.java b/framework/quota/test/org/apache/cloudstack/quota/QuotaStatementTest.java
index d1cc7ac..e2b5a0a 100644
--- a/framework/quota/test/org/apache/cloudstack/quota/QuotaStatementTest.java
+++ b/framework/quota/test/org/apache/cloudstack/quota/QuotaStatementTest.java
@@ -21,7 +21,7 @@ import com.cloud.user.dao.AccountDao;
import com.cloud.utils.db.TransactionLegacy;
import junit.framework.TestCase;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-import org.apache.cloudstack.quota.QuotaStatementImpl.STATEMENT_PERIODS;
+import org.apache.cloudstack.quota.QuotaStatementImpl.QuotaStatementPeriods;
import org.apache.cloudstack.quota.dao.QuotaAccountDao;
import org.apache.cloudstack.quota.dao.QuotaUsageDao;
import org.apache.cloudstack.quota.vo.QuotaAccountVO;
@@ -85,12 +85,12 @@ public class QuotaStatementTest extends TestCase {
//BIMONTHLY - first statement of month
date.set(Calendar.DATE, QuotaStatementImpl.s_LAST_STATEMENT_SENT_DAYS + 1);
- Calendar period[] = quotaStatement.statementTime(date, STATEMENT_PERIODS.BIMONTHLY);
+ Calendar period[] = quotaStatement.statementTime(date, QuotaStatementPeriods.BIMONTHLY);
assertTrue(period == null);
//1 of this month
date.set(Calendar.DATE, 1);
- period = quotaStatement.statementTime(date, STATEMENT_PERIODS.BIMONTHLY);
+ period = quotaStatement.statementTime(date, QuotaStatementPeriods.BIMONTHLY);
assertTrue(period != null);
assertTrue(period.length == 2);
assertTrue(period[0].toString(), period[0].before(period[1]));
@@ -100,12 +100,12 @@ public class QuotaStatementTest extends TestCase {
//BIMONTHLY - second statement of month
date = Calendar.getInstance();
date.set(Calendar.DATE, QuotaStatementImpl.s_LAST_STATEMENT_SENT_DAYS + 16);
- period = quotaStatement.statementTime(date, STATEMENT_PERIODS.BIMONTHLY);
+ period = quotaStatement.statementTime(date, QuotaStatementPeriods.BIMONTHLY);
assertTrue(period == null);
//17 of this month
date.set(Calendar.DATE, 17);
- period = quotaStatement.statementTime(date, STATEMENT_PERIODS.BIMONTHLY);
+ period = quotaStatement.statementTime(date, QuotaStatementPeriods.BIMONTHLY);
assertTrue(period != null);
assertTrue(period.length == 2);
assertTrue(period[0].toString(), period[0].before(period[1]));
@@ -128,12 +128,12 @@ public class QuotaStatementTest extends TestCase {
//MONTHLY
date = Calendar.getInstance();
date.set(Calendar.DATE, QuotaStatementImpl.s_LAST_STATEMENT_SENT_DAYS + 1);
- Calendar period[] = quotaStatement.statementTime(date, STATEMENT_PERIODS.MONTHLY);
+ Calendar period[] = quotaStatement.statementTime(date, QuotaStatementPeriods.MONTHLY);
assertTrue(period == null);
//1 of this month
date.set(Calendar.DATE, QuotaStatementImpl.s_LAST_STATEMENT_SENT_DAYS - 1);
- period = quotaStatement.statementTime(date, STATEMENT_PERIODS.MONTHLY);
+ period = quotaStatement.statementTime(date, QuotaStatementPeriods.MONTHLY);
assertTrue(period != null);
assertTrue(period.length == 2);
assertTrue(period[0].toString(), period[0].before(period[1]));
@@ -157,7 +157,7 @@ public class QuotaStatementTest extends TestCase {
date = Calendar.getInstance();
date.set(Calendar.MONTH, Calendar.JANUARY); // 1 Jan
date.set(Calendar.DATE, 1);
- Calendar period[] = quotaStatement.statementTime(date, STATEMENT_PERIODS.QUATERLY);
+ Calendar period[] = quotaStatement.statementTime(date, QuotaStatementPeriods.QUATERLY);
assertTrue(period != null);
assertTrue(period.length == 2);
assertTrue("period[0].before(period[1])" + period[0].toString(), period[0].before(period[1]));
@@ -182,7 +182,7 @@ public class QuotaStatementTest extends TestCase {
date = Calendar.getInstance();
date.set(Calendar.MONTH, Calendar.JANUARY); // 1 Jan
date.set(Calendar.DATE, 1);
- Calendar period[] = quotaStatement.statementTime(date, STATEMENT_PERIODS.HALFYEARLY);
+ Calendar period[] = quotaStatement.statementTime(date, QuotaStatementPeriods.HALFYEARLY);
assertTrue(period != null);
assertTrue(period.length == 2);
assertTrue("period[0].before(period[1])" + period[0].toString(), period[0].before(period[1]));
@@ -207,7 +207,7 @@ public class QuotaStatementTest extends TestCase {
date = Calendar.getInstance();
date.set(Calendar.MONTH, Calendar.JANUARY); // 1 Jan
date.set(Calendar.DATE, 1);
- Calendar period[] = quotaStatement.statementTime(date, STATEMENT_PERIODS.YEARLY);
+ Calendar period[] = quotaStatement.statementTime(date, QuotaStatementPeriods.YEARLY);
assertTrue("period != null", period != null);
assertTrue(period.length == 2);
assertTrue("period[0].before(period[1])" + period[0].toString(), period[0].before(period[1]));
@@ -244,7 +244,7 @@ public class QuotaStatementTest extends TestCase {
// call real method on send monthly statement
quotaStatement.sendStatement();
- Calendar period[] = quotaStatement.statementTime(date, STATEMENT_PERIODS.MONTHLY);
+ Calendar period[] = quotaStatement.statementTime(date, QuotaStatementPeriods.MONTHLY);
if (period != null){
Mockito.verify(alertManager, Mockito.times(1)).sendQuotaAlert(Mockito.any(QuotaAlertManagerImpl.DeferredQuotaEmail.class));
}