This is an automated email from the ASF dual-hosted git repository. bhaisaab pushed a commit to branch CLOUDSTACK-10012 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit e6398a8053acea71416d9d766c9d4e1628af23ad Author: Rohit Yadav <[email protected]> AuthorDate: Mon Oct 16 18:44:17 2017 +0530 more build fixes Signed-off-by: Rohit Yadav <[email protected]> --- client/pom.xml | 78 +----------------------------------------------------- engine/api/pom.xml | 15 +++++++++++ pom.xml | 5 ++++ 3 files changed, 21 insertions(+), 77 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 1127a3b..c00c2fa 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -83,43 +83,36 @@ <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-framework-spring-module</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-framework-spring-lifecycle</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-storage-volume-solidfire</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-storage-volume-cloudbyte</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-server</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-acl-static-role-based</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-acl-dynamic-role-based</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> @@ -130,175 +123,146 @@ <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-dedicated-resources</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-api-limit-account-based</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-api-discovery</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-user-authenticator-ldap</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-user-authenticator-md5</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-user-authenticator-pbkdf2</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-user-authenticator-plaintext</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-user-authenticator-saml2</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-user-authenticator-sha256salted</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-metrics</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-nvp</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-contrail</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-palo-alto</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-netscaler</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> - <groupId>org.apache.cloudstack</groupId> + <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-ovs</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-elb</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-bigswitch</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-ssp</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-internallb</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-vxlan</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-opendaylight</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-vcs</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-vsp</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-hypervisor-xenserver</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-hypervisor-baremetal</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-hypervisor-ucs</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-hypervisor-ovm</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-hypervisor-ovm3</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-hypervisor-kvm</artifactId> <version>${project.version}</version> - <scope>runtime</scope> <exclusions> <exclusion> <groupId>org.mortbay.jetty</groupId> @@ -310,235 +274,196 @@ <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-hypervisor-hyperv</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-storage-allocator-random</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-planner-user-dispersing</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-planner-skip-heurestics</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-planner-user-concentrated-pod</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-planner-implicit-dedication</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-explicit-dedication</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-host-allocator-random</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-outofbandmanagement-driver-ipmitool</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-outofbandmanagement-driver-nested-cloudstack</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-mom-rabbitmq</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-mom-inmemory</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-mom-kafka</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-framework-ca</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-framework-ipc</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-framework-quota</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-framework-rest</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-engine-api</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-engine-components-api</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-engine-network</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-engine-orchestration</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-engine-schema</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-engine-storage</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-engine-storage-cache</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-controller-secondary-storage</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-engine-storage-image</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-engine-storage-datamotion</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-engine-storage-snapshot</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-engine-storage-volume</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-storage-volume-default</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-storage-image-default</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-storage-image-s3</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-storage-image-swift</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-syslog-alerts</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-snmp-alerts</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-host-anti-affinity</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-api-solidfire-intg-test</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-network-globodns</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-database-quota</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> @@ -549,7 +474,6 @@ <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-integrations-prometheus-exporter</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> </dependencies> <build> diff --git a/engine/api/pom.xml b/engine/api/pom.xml index e11d70e..9dc53bd 100644 --- a/engine/api/pom.xml +++ b/engine/api/pom.xml @@ -36,6 +36,21 @@ <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> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-framework-rest</artifactId> <version>${project.version}</version> diff --git a/pom.xml b/pom.xml index fb63ea5..69edc1a 100644 --- a/pom.xml +++ b/pom.xml @@ -516,6 +516,11 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-io</artifactId> + <version>${cs.jetty.version}</version> + </dependency> + <dependency> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> <version>${cs.jetty.version}</version> </dependency> -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
