diff --git a/client/pom.xml b/client/pom.xml index 5cafd832d20..a1e4f609f4c 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -429,9 +429,9 @@ - org.mortbay.jetty - maven-jetty-plugin - 6.1.26 + org.eclipse.jetty + jetty-maven-plugin + ${cs.jetty.version} diff --git a/engine/api/pom.xml b/engine/api/pom.xml index 01a6051a34a..1f539fbd045 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -38,7 +38,7 @@ org.apache.cxf cxf-bundle-jaxrs - 2.7.13 + 2.7.18 org.eclipse.jetty diff --git a/engine/service/pom.xml b/engine/service/pom.xml index 38b6035e871..7f07323d48a 100644 --- a/engine/service/pom.xml +++ b/engine/service/pom.xml @@ -60,17 +60,6 @@ cloud-engine-network ${project.version} - - org.apache.cxf - cxf-bundle-jaxrs - 2.7.13 - - - org.eclipse.jetty - jetty-server - - - org.springframework spring-context @@ -84,9 +73,9 @@ engine - org.mortbay.jetty + org.eclipse.jetty jetty-maven-plugin - 8.1.7.v20120910 + ${cs.jetty.version} 10 diff --git a/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java b/framework/quota/src/org/apache/cloudstack/quota/QuotaStatementImpl.java index 5c12ae6e75d..30d2589187e 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); diff --git a/framework/quota/test/org/apache/cloudstack/quota/QuotaStatementTest.java b/framework/quota/test/org/apache/cloudstack/quota/QuotaStatementTest.java index d1cc7ace29d..e2b5a0abe95 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)); } diff --git a/framework/rest/pom.xml b/framework/rest/pom.xml index 830b7ec94d5..03aad768dcb 100644 --- a/framework/rest/pom.xml +++ b/framework/rest/pom.xml @@ -33,32 +33,32 @@ com.fasterxml.jackson.module jackson-module-jaxb-annotations - 2.6.3 + ${cs.jackson.version} com.fasterxml.jackson.core jackson-annotations - 2.6.3 + ${cs.jackson.version} com.fasterxml.jackson.core jackson-core - 2.6.3 + ${cs.jackson.version} com.fasterxml.jackson.core jackson-databind - 2.6.3 + ${cs.jackson.version} com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - 2.6.3 + ${cs.jackson.version} org.apache.cxf - cxf-bundle-jaxrs - 2.7.13 + cxf-rt-frontend-jaxrs + ${cs.cxf.version} org.eclipse.jetty diff --git a/plugins/event-bus/kafka/pom.xml b/plugins/event-bus/kafka/pom.xml index b6827a176b0..2bae7034436 100644 --- a/plugins/event-bus/kafka/pom.xml +++ b/plugins/event-bus/kafka/pom.xml @@ -36,7 +36,7 @@ org.apache.kafka kafka-clients - 0.8.2.0 + 0.9.0.1 diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml index bc8f78cab50..7e797099c05 100644 --- a/plugins/event-bus/rabbitmq/pom.xml +++ b/plugins/event-bus/rabbitmq/pom.xml @@ -31,7 +31,7 @@ com.rabbitmq amqp-client - 3.5.4 + 3.6.1 org.apache.cloudstack diff --git a/plugins/hypervisors/hyperv/pom.xml b/plugins/hypervisors/hyperv/pom.xml index d88fd141885..165eaf6cf4d 100644 --- a/plugins/hypervisors/hyperv/pom.xml +++ b/plugins/hypervisors/hyperv/pom.xml @@ -41,11 +41,6 @@ cloud-core ${project.version} - - org.mortbay.jetty - jetty - 6.1.26 - org.apache.cloudstack cloud-utils diff --git a/plugins/network-elements/globodns/pom.xml b/plugins/network-elements/globodns/pom.xml index 9e177a53d68..9d2c3547192 100644 --- a/plugins/network-elements/globodns/pom.xml +++ b/plugins/network-elements/globodns/pom.xml @@ -31,7 +31,7 @@ com.globo.globodns globodns-client - 0.0.15 + 0.0.20 diff --git a/plugins/network-elements/juniper-contrail/pom.xml b/plugins/network-elements/juniper-contrail/pom.xml index cac4d593d52..13a3c5b6e82 100644 --- a/plugins/network-elements/juniper-contrail/pom.xml +++ b/plugins/network-elements/juniper-contrail/pom.xml @@ -109,7 +109,7 @@ org.mockito mockito-all - 1.9.5 + 1.10.19 diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml index 2475c413636..d7b54e92e74 100644 --- a/plugins/network-elements/netscaler/pom.xml +++ b/plugins/network-elements/netscaler/pom.xml @@ -30,12 +30,12 @@ com.citrix.netscaler.nitro nitro - 10.1 + ${cs.nitro.version} com.citrix.netscaler.nitro sdx_nitro - 10.1 + ${cs.nitro.version} diff --git a/plugins/storage/volume/cloudbyte/pom.xml b/plugins/storage/volume/cloudbyte/pom.xml index 2a4e02dd8e5..5372ab80134 100755 --- a/plugins/storage/volume/cloudbyte/pom.xml +++ b/plugins/storage/volume/cloudbyte/pom.xml @@ -54,7 +54,7 @@ com.sun.jersey jersey-bundle - 1.18.3 + 1.19.1 diff --git a/plugins/user-authenticators/ldap/pom.xml b/plugins/user-authenticators/ldap/pom.xml index a2af7187378..7b3b8f76e16 100644 --- a/plugins/user-authenticators/ldap/pom.xml +++ b/plugins/user-authenticators/ldap/pom.xml @@ -96,13 +96,15 @@ org.spockframework spock-core - 0.7-groovy-2.0 + 1.0-groovy-2.4 + test cglib cglib-nodep - + test + diff --git a/plugins/user-authenticators/saml2/pom.xml b/plugins/user-authenticators/saml2/pom.xml index a9788604614..5e24df35c55 100644 --- a/plugins/user-authenticators/saml2/pom.xml +++ b/plugins/user-authenticators/saml2/pom.xml @@ -27,11 +27,6 @@ ../../pom.xml - - org.springframework.security.extensions - spring-security-saml2-core - 1.0.0.RELEASE - org.opensaml opensaml @@ -52,5 +47,11 @@ cloud-framework-config ${project.version} + + xerces + xercesImpl + 2.11.0 + test + diff --git a/pom.xml b/pom.xml index c18c377cf22..01828d4393d 100644 --- a/pom.xml +++ b/pom.xml @@ -44,10 +44,6 @@ https://issues.apache.org/jira/browse/CLOUDSTACK - - 3.0.4 - - 1.7 UTF-8 @@ -55,7 +51,7 @@ 1.2.17 1.2.17 - 3.1 + 3.2.1 1.4 1.6 1.10 @@ -65,58 +61,67 @@ 0.5 3.0 - 4.11 + 4.12 1.3 1.46 - 0.1.51 - 2.1.0 + 0.1.53 + 2.1.1 1.9.2 - 1.0.0-build217 - 2.6.9 + 1.0.0-build220 + 2.6.11 1.7.2 18.0 - 18.0 + 19.0 6.2.0-3.1 - 4.5 - 4.4 + 4.5.2 + 4.4.4 3.1 5.1.34 - 1.4.7 + 1.4.9 3.1.3 - 1.4.7 + 1.5.0-b01 1.4 1.5.6 1.5.1 1.2.8 2.0.4 2.5 - 1.2 + 1.2.1 1.0-20081010.060147 - 5.5 - 3.2.12.RELEASE - 1.9.5 - 1.5.3 - 1.10.34 - 2.6.3 + 6.0 + 3.2.16.RELEASE + 1.10.19 + 1.6.4 + 1.10.64 + 2.7.1 2.6 3.4 2.4 - 1.4.0 - 0.9.9 - 0.15 + 1.3.1 + 3.2.2 + 1.5.0 + 0.9.10 + 0.16 build/replace.properties 0.5.1 0.2.0 target 1.0.15 4.0.0 - 2.11 - 2.7 - 3.0.1 - 2.10.1 - 2.6.1 + 2.17 + 2.11 + 3.0.3 + 2.10.3 + 2.6.4 1.4.01 2.8.1 + 1.8 + 2.3.4_1 + 9.2.15.v20160210 + 3.1.4 + 2.4.6 + 9.2.15.v20160210 + 10.1 @@ -208,6 +213,41 @@ + + org.eclipse.jetty + apache-jsp + ${cs.apache-jsp.version} + + + org.codehaus.groovy + groovy-all + ${cs.groovy.version} + + + org.bouncycastle + bcprov-jdk15on + ${cs.bcprov.version} + + + org.apache.xmlgraphics + batik-css + ${cs.batik.version} + + + org.apache.xmlgraphics + batik-ext + ${cs.batik.version} + + + org.apache.xmlgraphics + batik-util + ${cs.batik.version} + + + commons-collections + commons-collections + ${cs.commons-collections.version} + mysql mysql-connector-java @@ -245,26 +285,26 @@ ehcache-core ${cs.ehcache.version} - - commons-pool - commons-pool - ${cs.pool.version} - commons-codec commons-codec ${cs.codec.version} + + commons-fileupload + commons-fileupload + ${cs.commons-fileupload.version} + + + commons-pool + commons-pool + ${cs.pool.version} + commons-validator commons-validator ${cs.commons-validator.version} - - org.bouncycastle - bcprov-jdk16 - ${cs.bcprov.version} - com.jcraft jsch @@ -325,7 +365,7 @@ org.owasp.esapi esapi - 2.1.0 + 2.1.0.1 org.eclipse.persistence @@ -390,17 +430,17 @@ org.apache.servicemix.bundles org.apache.servicemix.bundles.snmp4j - 2.3.1_1 + ${cs.servicemix.version} org.aspectj aspectjtools - 1.8.4 + 1.8.9 org.aspectj aspectjweaver - 1.8.4 + 1.8.9 org.apache.axis @@ -425,12 +465,12 @@ org.slf4j slf4j-api - 1.7.7 + 1.7.21 org.slf4j slf4j-log4j12 - 1.7.7 + 1.7.21 diff --git a/server/pom.xml b/server/pom.xml index b8e3598e3e6..8461d18a4f4 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -70,8 +70,9 @@ mail - jstl - jstl + javax.servlet.jsp.jstl + javax.servlet.jsp.jstl-api + ${cs.jstl.version} commons-codec diff --git a/services/console-proxy-rdp/rdpconsole/pom.xml b/services/console-proxy-rdp/rdpconsole/pom.xml index ba311830af7..628d039a6e6 100755 --- a/services/console-proxy-rdp/rdpconsole/pom.xml +++ b/services/console-proxy-rdp/rdpconsole/pom.xml @@ -71,12 +71,13 @@ org.apache.tomcat.embed tomcat-embed-core - 8.0.15 + 8.0.30 org.bouncycastle bcprov-jdk16 + 1.46 diff --git a/services/secondary-storage/server/pom.xml b/services/secondary-storage/server/pom.xml index b6bfbf7df73..f3d01762079 100644 --- a/services/secondary-storage/server/pom.xml +++ b/services/secondary-storage/server/pom.xml @@ -57,7 +57,7 @@ io.netty netty-all - 4.0.25.Final + 4.0.33.Final compile diff --git a/tools/checkstyle/pom.xml b/tools/checkstyle/pom.xml index f4ee2b8e1fa..c0c39c956da 100644 --- a/tools/checkstyle/pom.xml +++ b/tools/checkstyle/pom.xml @@ -25,12 +25,7 @@ org.apache.cloudstack checkstyle 4.9.0-SNAPSHOT - - - - 3.0.4 - - + diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE index 61ebc50f106..da8aaedfd9e 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/ diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml index 1a68a0d9c5c..01e60269f48 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> - + @@ -2683,7 +2683,7 @@ Copyright (c) 2012 The Apache Software Foundation - + diff --git a/usage/pom.xml b/usage/pom.xml index ff10e819e46..dd80e82ce77 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -53,17 +53,17 @@ org.slf4j slf4j-api - 1.7.7 + 1.7.21 org.slf4j slf4j-log4j12 - 1.7.7 + 1.7.21 org.dbunit dbunit - 2.4.9 + 2.5.2 test diff --git a/utils/pom.xml b/utils/pom.xml index 3a23a58774f..206eb1896a6 100755 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -69,7 +69,7 @@ org.bouncycastle - bcprov-jdk16 + bcprov-jdk15on com.jcraft @@ -157,7 +157,7 @@ commons-net commons-net - 3.3 + 3.4 com.google.code.gson