Skip to content

Commit 5291c51

Browse files
yadvryadvr
committed
upgrade dependency versions, migrate to spring5
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
1 parent 55bf188 commit 5291c51

14 files changed

Lines changed: 85 additions & 128 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ For more information on Apache CloudStack, please visit the [website](http://clo
4242

4343
Apache CloudStack project uses Git. The official Git repository is at:
4444

45-
https://git-wip-us.apache.org/repos/asf/cloudstack.git
45+
https://gitbox.apache.org/repos/asf/cloudstack.git
4646

4747
And a mirror is hosted on Github:
4848

‎client/WEB-INF/web.xml‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,20 @@
1919
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2020
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
2121
version="2.5">
22-
23-
<context-param>
24-
<param-name>log4jConfigLocation</param-name>
25-
<param-value>classpath:log4j-cloud.xml</param-value>
26-
</context-param>
27-
<listener>
28-
<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
29-
</listener>
30-
31-
<listener>
32-
<listener-class>org.apache.cloudstack.spring.module.web.CloudStackContextLoaderListener</listener-class>
33-
</listener>
22+
23+
<context-param>
24+
<param-name>log4jConfigLocation</param-name>
25+
<param-value>classpath:log4j-cloud.xml</param-value>
26+
</context-param>
27+
28+
<listener>
29+
<listener-class>org.apache.cloudstack.spring.module.web.CloudStackContextLoaderListener</listener-class>
30+
</listener>
3431
<context-param>
35-
<param-name>contextConfigLocation</param-name>
36-
<param-value>classpath:META-INF/cloudstack/webApplicationContext.xml</param-value>
32+
<param-name>contextConfigLocation</param-name>
33+
<param-value>classpath:META-INF/cloudstack/webApplicationContext.xml</param-value>
3734
</context-param>
38-
35+
3936
<servlet>
4037
<servlet-name>cloudStartupServlet</servlet-name>
4138
<servlet-class>com.cloud.servlet.CloudStartupServlet</servlet-class>
@@ -47,29 +44,29 @@
4744
<servlet-class>com.cloud.api.ApiServlet</servlet-class>
4845
<load-on-startup>5</load-on-startup>
4946
</servlet>
50-
47+
5148
<servlet>
5249
<servlet-name>consoleServlet</servlet-name>
5350
<servlet-class>com.cloud.servlet.ConsoleProxyServlet</servlet-class>
5451
<load-on-startup>6</load-on-startup>
5552
</servlet>
56-
53+
5754

5855
<servlet>
5956
<servlet-name>staticResources</servlet-name>
6057
<servlet-class>com.cloud.servlet.StaticResourceServlet</servlet-class>
6158
</servlet>
62-
59+
6360
<servlet-mapping>
6461
<servlet-name>apiServlet</servlet-name>
6562
<url-pattern>/api/*</url-pattern>
6663
</servlet-mapping>
67-
68-
<servlet-mapping>
69-
<servlet-name>consoleServlet</servlet-name>
70-
<url-pattern>/console</url-pattern>
64+
65+
<servlet-mapping>
66+
<servlet-name>consoleServlet</servlet-name>
67+
<url-pattern>/console</url-pattern>
7168
</servlet-mapping>
72-
69+
7370

7471
<servlet-mapping>
7572
<servlet-name>staticResources</servlet-name>
@@ -79,8 +76,8 @@
7976
</servlet-mapping>
8077

8178
<error-page>
82-
<exception-type>java.lang.Exception</exception-type>
83-
<location>/error.html</location>
79+
<exception-type>java.lang.Exception</exception-type>
80+
<location>/error.html</location>
8481
</error-page>
8582

8683
</web-app>

‎client/pom.xml‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@
6060
<groupId>org.eclipse.jetty</groupId>
6161
<artifactId>jetty-annotations</artifactId>
6262
</dependency>
63+
<dependency>
64+
<groupId>com.fasterxml.jackson.dataformat</groupId>
65+
<artifactId>jackson-dataformat-yaml</artifactId>
66+
<version>${cs.jackson.version}</version>
67+
</dependency>
68+
<dependency>
69+
<groupId>com.fasterxml.jackson.core</groupId>
70+
<artifactId>jackson-databind</artifactId>
71+
<version>${cs.jackson.version}</version>
72+
</dependency>
6373
<dependency>
6474
<groupId>mysql</groupId>
6575
<artifactId>mysql-connector-java</artifactId>
@@ -590,7 +600,7 @@
590600
<webAppSourceDirectory>${project.build.directory}/classes/META-INF/webapp/</webAppSourceDirectory>
591601
<webAppConfig>
592602
<contextPath>/client</contextPath>
593-
<extraClasspath>${project.build.directory}/utilities/scripts/db/;${project.build.directory}/utilities/scripts/db/db/</extraClasspath>
603+
<extraClasspath>${project.build.directory}/conf/;${project.build.directory}/common;${project.build.directory}/utilities/scripts/db/;${project.build.directory}/utilities/scripts/db/db/</extraClasspath>
594604
<webInfIncludeJarPattern>.*/cloud.*jar$|.*/classes/.*</webInfIncludeJarPattern>
595605
</webAppConfig>
596606
<systemProperties>
@@ -612,12 +622,12 @@
612622
</goals>
613623
<configuration>
614624
<target>
615-
<copy todir="${project.build.directory}/classes/scripts">
625+
<copy todir="${project.build.directory}/common/scripts">
616626
<fileset dir="${basedir}/../scripts"/>
617627
</copy>
618628
<!-- CLOUDSTACK-1304 -->
619629
<chmod perm="755"
620-
file="${project.build.directory}/classes/scripts/**" type="both"/>
630+
file="${project.build.directory}/common/scripts/**" type="both"/>
621631
<copy todir="${project.build.directory}/classes/META-INF/webapp/WEB-INF/">
622632
<fileset dir="${basedir}/WEB-INF/">
623633
<include name="web.xml"/>
@@ -687,7 +697,7 @@
687697
<target if="${noredist}">
688698
<echo>test</echo>
689699
<replaceregexp
690-
file="${basedir}/target/generated-webapp/WEB-INF/classes/environment.properties"
700+
file="${basedir}/target/conf/environment.properties"
691701
match="cloud-stack-components-specification=.*"
692702
replace="cloud-stack-components-specification=components-nonoss.xml" byline="true"
693703
/>
@@ -702,11 +712,11 @@
702712
</goals>
703713
<configuration>
704714
<target if="${noredist}">
705-
<replaceregexp file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
715+
<replaceregexp file="${basedir}/target/classes/META-INF/webapp/WEB-INF/web.xml"
706716
match="classpath:componentContext.xml"
707717
replace="classpath:nonossComponentContext.xml" byline="true"/>
708718
<copy overwrite="true"
709-
todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
719+
todir="${basedir}/target/common/scripts">
710720
<fileset dir="${basedir}/../plugins/network-elements/cisco-vnmc/scripts">
711721
<include name="**/*"/>
712722
</fileset>
@@ -736,12 +746,6 @@
736746
<overWrite>false</overWrite>
737747
<outputDirectory>${project.build.directory}/pythonlibs</outputDirectory>
738748
</artifactItem>
739-
<artifactItem>
740-
<groupId>org.bouncycastle</groupId>
741-
<artifactId>bcprov-jdk15on</artifactId>
742-
<overWrite>false</overWrite>
743-
<outputDirectory>${project.build.directory}</outputDirectory>
744-
</artifactItem>
745749
</artifactItems>
746750
</configuration>
747751
</execution>
@@ -777,7 +781,9 @@
777781
</includes>
778782
<excludes>
779783
<exclude>junit:junit</exclude>
780-
<exclude>org.bouncycastle:bcprov-jdk15on</exclude>
784+
<exclude>org.apache.tomcat.embed:tomcat-embed-core</exclude>
785+
<exclude>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</exclude>
786+
<exclude>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</exclude>
781787
</excludes>
782788
</artifactSet>
783789
<transformers>
@@ -844,7 +850,7 @@
844850
</goals>
845851
<configuration>
846852
<target>
847-
<copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/vms">
853+
<copy todir="${basedir}/target/common/vms">
848854
<fileset dir="${basedir}/../systemvm/dist">
849855
<include name="systemvm.zip"/>
850856
<include name="systemvm.iso"/>

‎core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<dependency>
5151
<groupId>org.apache.commons</groupId>
5252
<artifactId>commons-compress</artifactId>
53-
<version>1.12</version>
53+
<version>1.14</version>
5454
</dependency>
5555
</dependencies>
5656

‎engine/api/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,6 @@
3535
<artifactId>cloud-api</artifactId>
3636
<version>${project.version}</version>
3737
</dependency>
38-
<dependency>
39-
<groupId>org.apache.cxf</groupId>
40-
<artifactId>cxf-bundle-jaxrs</artifactId>
41-
<version>2.7.18</version>
42-
<exclusions>
43-
<exclusion>
44-
<groupId>org.eclipse.jetty</groupId>
45-
<artifactId>jetty-server</artifactId>
46-
</exclusion>
47-
<exclusion>
48-
<groupId>com.sun.xml.bind</groupId>
49-
<artifactId>jaxb-impl</artifactId>
50-
</exclusion>
51-
</exclusions>
52-
</dependency>
5338
<dependency>
5439
<groupId>org.apache.cloudstack</groupId>
5540
<artifactId>cloud-framework-rest</artifactId>

‎engine/service/src/main/webapp/WEB-INF/web.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131
org.springframework.web.context.ContextLoaderListener
3232
</listener-class>
3333
</listener>
34-
<listener>
35-
<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
36-
</listener>
3734
<servlet>
3835
<display-name>CXF Servlet</display-name>
3936
<servlet-name>CXFServlet</servlet-name>

‎plugins/event-bus/kafka/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>org.apache.kafka</groupId>
3838
<artifactId>kafka-clients</artifactId>
39-
<version>0.10.1.1</version>
39+
<version>0.11.0.1</version>
4040
</dependency>
4141
</dependencies>
4242
<build>

‎plugins/event-bus/rabbitmq/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.rabbitmq</groupId>
3333
<artifactId>amqp-client</artifactId>
34-
<version>3.6.6</version>
34+
<version>5.0.0</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>org.apache.cloudstack</groupId>

‎plugins/hypervisors/ovm3/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,6 @@
2727
<relativePath>../../pom.xml</relativePath>
2828
</parent>
2929
<dependencies>
30-
<dependency>
31-
<groupId>xml-apis</groupId>
32-
<artifactId>xml-apis</artifactId>
33-
<version>${cs.xml-apis.version}</version>
34-
</dependency>
3530
<dependency>
3631
<groupId>org.apache.xmlrpc</groupId>
3732
<artifactId>xmlrpc-client</artifactId>

‎plugins/network-elements/globodns/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>com.globo.globodns</groupId>
3333
<artifactId>globodns-client</artifactId>
34-
<version>0.0.22</version>
34+
<version>0.0.23</version>
3535
</dependency>
3636
</dependencies>
3737
</project>

0 commit comments

Comments
 (0)