cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [cloudstack] 03/14: upgrade dependency versions, migrate to spring5
Date Wed, 25 Oct 2017 09:45:58 GMT
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 d24b03bbe3f4b5182a5a917a32d23c49813710ff
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
AuthorDate: Mon Oct 16 13:56:56 2017 +0530

    upgrade dependency versions, migrate to spring5
    
    Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 README.md                                          |  2 +-
 client/WEB-INF/web.xml                             | 47 +++++++++---------
 client/pom.xml                                     | 34 +++++++------
 core/pom.xml                                       |  2 +-
 engine/api/pom.xml                                 | 15 ------
 engine/service/src/main/webapp/WEB-INF/web.xml     |  3 --
 plugins/event-bus/kafka/pom.xml                    |  2 +-
 plugins/event-bus/rabbitmq/pom.xml                 |  2 +-
 plugins/hypervisors/ovm3/pom.xml                   |  5 --
 plugins/network-elements/globodns/pom.xml          |  2 +-
 .../nested-cloudstack/pom.xml                      |  2 +-
 pom.xml                                            | 57 +++++++++++-----------
 usage/src/com/cloud/usage/UsageServer.java         | 31 +-----------
 utils/pom.xml                                      |  7 ++-
 14 files changed, 84 insertions(+), 127 deletions(-)

diff --git a/README.md b/README.md
index 5785328..17a7a8f 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ For more information on Apache CloudStack, please visit the [website](http://clo
 
 Apache CloudStack project uses Git. The official Git repository is at:
 
-    https://git-wip-us.apache.org/repos/asf/cloudstack.git
+    https://gitbox.apache.org/repos/asf/cloudstack.git
 
 And a mirror is hosted on Github:
 
diff --git a/client/WEB-INF/web.xml b/client/WEB-INF/web.xml
index 73a755b..1550b0c 100644
--- a/client/WEB-INF/web.xml
+++ b/client/WEB-INF/web.xml
@@ -19,23 +19,20 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
     version="2.5">
-   
-    <context-param>  
-      <param-name>log4jConfigLocation</param-name>  
-      <param-value>classpath:log4j-cloud.xml</param-value>  
-    </context-param>  
-    <listener>  
-      <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
 
-    </listener>  
-    
-	<listener>
-      <listener-class>org.apache.cloudstack.spring.module.web.CloudStackContextLoaderListener</listener-class>
-	</listener>
+
+    <context-param>
+        <param-name>log4jConfigLocation</param-name>
+        <param-value>classpath:log4j-cloud.xml</param-value>
+    </context-param>
+
+    <listener>
+        <listener-class>org.apache.cloudstack.spring.module.web.CloudStackContextLoaderListener</listener-class>
+    </listener>
     <context-param>
-        <param-name>contextConfigLocation</param-name>    
-        <param-value>classpath:META-INF/cloudstack/webApplicationContext.xml</param-value>
   
+        <param-name>contextConfigLocation</param-name>
+        <param-value>classpath:META-INF/cloudstack/webApplicationContext.xml</param-value>
     </context-param>
-          
+
     <servlet>
         <servlet-name>cloudStartupServlet</servlet-name>
         <servlet-class>com.cloud.servlet.CloudStartupServlet</servlet-class>
@@ -47,29 +44,29 @@
         <servlet-class>com.cloud.api.ApiServlet</servlet-class>
         <load-on-startup>5</load-on-startup>
     </servlet>
-    
+
     <servlet>
         <servlet-name>consoleServlet</servlet-name>
         <servlet-class>com.cloud.servlet.ConsoleProxyServlet</servlet-class>
         <load-on-startup>6</load-on-startup>
     </servlet>
-	
+
 
     <servlet>
         <servlet-name>staticResources</servlet-name>
         <servlet-class>com.cloud.servlet.StaticResourceServlet</servlet-class>
     </servlet>
- 
+
     <servlet-mapping>
          <servlet-name>apiServlet</servlet-name>
          <url-pattern>/api/*</url-pattern>
     </servlet-mapping>
-    
-    <servlet-mapping>   
-         <servlet-name>consoleServlet</servlet-name>   
-         <url-pattern>/console</url-pattern> 
+
+    <servlet-mapping>
+         <servlet-name>consoleServlet</servlet-name>
+         <url-pattern>/console</url-pattern>
     </servlet-mapping>
-	
+
 
     <servlet-mapping>
         <servlet-name>staticResources</servlet-name>
@@ -79,8 +76,8 @@
     </servlet-mapping>
 
     <error-page>
-      <exception-type>java.lang.Exception</exception-type>
-      <location>/error.html</location>
+        <exception-type>java.lang.Exception</exception-type>
+        <location>/error.html</location>
     </error-page>
 
 </web-app>
diff --git a/client/pom.xml b/client/pom.xml
index 5a8716e..568e01d 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -61,6 +61,16 @@
       <artifactId>jetty-annotations</artifactId>
     </dependency>
     <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-yaml</artifactId>
+      <version>${cs.jackson.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${cs.jackson.version}</version>
+    </dependency>
+    <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
       <scope>runtime</scope>
@@ -595,7 +605,7 @@
           <webAppSourceDirectory>${project.build.directory}/classes/META-INF/webapp/</webAppSourceDirectory>
           <webAppConfig>
             <contextPath>/client</contextPath>
-            <extraClasspath>${project.build.directory}/utilities/scripts/db/;${project.build.directory}/utilities/scripts/db/db/</extraClasspath>
+            <extraClasspath>${project.build.directory}/conf/;${project.build.directory}/common;${project.build.directory}/utilities/scripts/db/;${project.build.directory}/utilities/scripts/db/db/</extraClasspath>
             <webInfIncludeJarPattern>.*/cloud.*jar$|.*/classes/.*</webInfIncludeJarPattern>
           </webAppConfig>
           <systemProperties>
@@ -617,12 +627,12 @@
             </goals>
             <configuration>
               <target>
-                <copy todir="${project.build.directory}/classes/scripts">
+                <copy todir="${project.build.directory}/common/scripts">
                   <fileset dir="${basedir}/../scripts"/>
                 </copy>
                 <!-- CLOUDSTACK-1304 -->
                 <chmod perm="755"
-                  file="${project.build.directory}/classes/scripts/**" type="both"/>
+                  file="${project.build.directory}/common/scripts/**" type="both"/>
                 <copy todir="${project.build.directory}/classes/META-INF/webapp/WEB-INF/">
                   <fileset dir="${basedir}/WEB-INF/">
                     <include name="web.xml"/>
@@ -692,7 +702,7 @@
               <target if="${noredist}">
                 <echo>test</echo>
                 <replaceregexp
-                  file="${basedir}/target/generated-webapp/WEB-INF/classes/environment.properties"
+                  file="${basedir}/target/conf/environment.properties"
                   match="cloud-stack-components-specification=.*"
                   replace="cloud-stack-components-specification=components-nonoss.xml" byline="true"
                 />
@@ -707,11 +717,11 @@
             </goals>
             <configuration>
               <target if="${noredist}">
-                <replaceregexp file="${basedir}/target/generated-webapp/WEB-INF/web.xml"
+                <replaceregexp file="${basedir}/target/classes/META-INF/webapp/WEB-INF/web.xml"
                   match="classpath:componentContext.xml"
                   replace="classpath:nonossComponentContext.xml" byline="true"/>
                 <copy overwrite="true"
-                  todir="${basedir}/target/generated-webapp/WEB-INF/classes/scripts">
+                  todir="${basedir}/target/common/scripts">
                   <fileset dir="${basedir}/../plugins/network-elements/cisco-vnmc/scripts">
                     <include name="**/*"/>
                   </fileset>
@@ -741,12 +751,6 @@
                   <overWrite>false</overWrite>
                   <outputDirectory>${project.build.directory}/pythonlibs</outputDirectory>
                 </artifactItem>
-                <artifactItem>
-                  <groupId>org.bouncycastle</groupId>
-                  <artifactId>bcprov-jdk15on</artifactId>
-                  <overWrite>false</overWrite>
-                  <outputDirectory>${project.build.directory}</outputDirectory>
-                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
@@ -782,7 +786,9 @@
                 </includes>
                 <excludes>
                   <exclude>junit:junit</exclude>
-                  <exclude>org.bouncycastle:bcprov-jdk15on</exclude>
+                  <exclude>org.apache.tomcat.embed:tomcat-embed-core</exclude>
+                  <exclude>org.apache.geronimo.specs:geronimo-servlet_3.0_spec</exclude>
+                  <exclude>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</exclude>
                 </excludes>
               </artifactSet>
               <transformers>
@@ -849,7 +855,7 @@
                 </goals>
                 <configuration>
                   <target>
-                    <copy todir="${basedir}/target/generated-webapp/WEB-INF/classes/vms">
+                    <copy todir="${basedir}/target/common/vms">
                       <fileset dir="${basedir}/../systemvm/dist">
                         <include name="systemvm.zip"/>
                         <include name="systemvm.iso"/>
diff --git a/core/pom.xml b/core/pom.xml
index afd86d4..4697311 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -50,7 +50,7 @@
       <dependency>
           <groupId>org.apache.commons</groupId>
           <artifactId>commons-compress</artifactId>
-          <version>1.12</version>
+          <version>1.14</version>
       </dependency>
   </dependencies>
 
diff --git a/engine/api/pom.xml b/engine/api/pom.xml
index 9dc53bd..e11d70e 100644
--- a/engine/api/pom.xml
+++ b/engine/api/pom.xml
@@ -36,21 +36,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>
-        <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/engine/service/src/main/webapp/WEB-INF/web.xml b/engine/service/src/main/webapp/WEB-INF/web.xml
index c5bb44f..e7663ce 100644
--- a/engine/service/src/main/webapp/WEB-INF/web.xml
+++ b/engine/service/src/main/webapp/WEB-INF/web.xml
@@ -31,9 +31,6 @@
       org.springframework.web.context.ContextLoaderListener
     </listener-class>
   </listener>
-  <listener>
-    <listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
-  </listener>
   <servlet>
     <display-name>CXF Servlet</display-name>
     <servlet-name>CXFServlet</servlet-name>
diff --git a/plugins/event-bus/kafka/pom.xml b/plugins/event-bus/kafka/pom.xml
index 4e38004..e395961 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.10.1.1</version>
+      <version>0.11.0.1</version>
     </dependency>
   </dependencies>
   <build>
diff --git a/plugins/event-bus/rabbitmq/pom.xml b/plugins/event-bus/rabbitmq/pom.xml
index ce7e8f7..50c7710 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.6</version>
+        <version>5.0.0</version>
     </dependency>
     <dependency>
     <groupId>org.apache.cloudstack</groupId>
diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml
index 6247809..b73aec4 100644
--- a/plugins/hypervisors/ovm3/pom.xml
+++ b/plugins/hypervisors/ovm3/pom.xml
@@ -28,11 +28,6 @@
   </parent>
   <dependencies>
     <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>${cs.xml-apis.version}</version>
-    </dependency>
-    <dependency>
       <groupId>org.apache.xmlrpc</groupId>
       <artifactId>xmlrpc-client</artifactId>
       <version>${cs.xmlrpc.version}</version>
diff --git a/plugins/network-elements/globodns/pom.xml b/plugins/network-elements/globodns/pom.xml
index 9dab3de..33cf20f 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.22</version>
+      <version>0.0.23</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml b/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml
index 6759610..29ae888 100644
--- a/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml
+++ b/plugins/outofbandmanagement-drivers/nested-cloudstack/pom.xml
@@ -40,7 +40,7 @@
     <dependency>
         <groupId>br.com.autonomiccs</groupId>
         <artifactId>apache-cloudstack-java-client</artifactId>
-        <version>1.0.5</version>
+        <version>1.0.6</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 1c603cf..f1099c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,11 +33,11 @@
   <version>4.11.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Apache CloudStack</name>
-  <description>Apache CloudStack is an IaaS (“Infrastructure as a Service”) cloud
orchestration platform.</description>
+  <description>Apache CloudStack is an IaaS ("Infrastructure as a Service") cloud orchestration
platform.</description>
   <url>http://www.cloudstack.org</url>
   <scm>
-    <connection>scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git</connection>
-    <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git</developerConnection>
+    <connection>scm:git:https://gitbox.apache.org/repos/asf/cloudstack.git</connection>
+    <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/cloudstack.git</developerConnection>
   </scm>
   <issueManagement>
     <system>jira</system>
@@ -51,34 +51,33 @@
 
     <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.4</cs.cglib.version>
+    <cs.cglib.version>3.2.5</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>
     <cs.configuration.version>1.10</cs.configuration.version>
-    <cs.collections.version>3.2.2</cs.collections.version>
     <cs.logging.version>1.1.1</cs.logging.version>
     <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.12</cs.junit.version>
     <cs.hamcrest.version>1.3</cs.hamcrest.version>
-    <cs.junit.dataprovider.version>1.12.0</cs.junit.dataprovider.version>
-    <cs.bcprov.version>1.57</cs.bcprov.version>
+    <cs.junit.dataprovider.version>1.13.1</cs.junit.dataprovider.version>
+    <cs.bcprov.version>1.58</cs.bcprov.version>
     <cs.jsch.version>0.1.54</cs.jsch.version>
-    <cs.jpa.version>2.1.1</cs.jpa.version>
+    <cs.jpa.version>2.2.0</cs.jpa.version>
     <cs.jasypt.version>1.9.2</cs.jasypt.version>
-    <cs.trilead.version>1.0.0-build220</cs.trilead.version>
+    <cs.trilead.version>1.0.0-build221</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>20.0</cs.guava.version>
+    <cs.guava.version>23.2-jre</cs.guava.version>
     <cs.xapi.version>6.2.0-3.1</cs.xapi.version>
-    <cs.httpclient.version>4.5.2</cs.httpclient.version>
-    <cs.httpcore.version>4.4.5</cs.httpcore.version>
+    <cs.httpclient.version>4.5.3</cs.httpclient.version>
+    <cs.httpcore.version>4.4.8</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.9</cs.xstream.version>
+    <cs.xstream.version>1.4.10</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>
@@ -86,24 +85,24 @@
     <cs.rampart.version>1.5.1</cs.rampart.version>
     <cs.axiom.version>1.2.8</cs.axiom.version>
     <cs.neethi.version>2.0.4</cs.neethi.version>
-    <cs.servlet.version>3.1.0</cs.servlet.version>
+    <cs.servlet.version>4.0.0</cs.servlet.version>
     <cs.jstl.version>1.2</cs.jstl.version>
     <cs.jstl-api.version>1.2.1</cs.jstl-api.version>
     <cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
     <cs.vmware.api.version>6.0</cs.vmware.api.version>
-    <org.springframework.version>4.3.4.RELEASE</org.springframework.version>
+    <org.springframework.version>5.0.0.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.11.61</cs.aws.sdk.version>
-    <cs.jackson.version>2.7.1</cs.jackson.version>
+    <cs.aws.sdk.version>1.11.213</cs.aws.sdk.version>
+    <cs.jackson.version>2.9.2</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.5</cs.commons-io.version>
-    <cs.commons-fileupload.version>1.3.2</cs.commons-fileupload.version>
-    <cs.commons-collections.version>3.2.2</cs.commons-collections.version>
-    <cs.commons-validator.version>1.5.1</cs.commons-validator.version>
-    <cs.reflections.version>0.9.10</cs.reflections.version>
-    <cs.javassist.version>3.18.2-GA</cs.javassist.version>
+    <cs.commons-fileupload.version>1.3.3</cs.commons-fileupload.version>
+    <cs.commons-collections.version>4.1</cs.commons-collections.version>
+    <cs.commons-validator.version>1.6</cs.commons-validator.version>
+    <cs.reflections.version>0.9.11</cs.reflections.version>
+    <cs.javassist.version>3.22.0-GA</cs.javassist.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>
@@ -118,10 +117,10 @@
     <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.batik.version>1.9.1</cs.batik.version>
+    <cs.servicemix.version>2.5.7_1</cs.servicemix.version>
     <cs.cxf.version>3.1.4</cs.cxf.version>
-    <cs.groovy.version>2.4.7</cs.groovy.version>
+    <cs.groovy.version>2.4.12</cs.groovy.version>
     <cs.nitro.version>10.1</cs.nitro.version>
     <cs.wiremock.version>2.8.0</cs.wiremock.version>
     <cs.jetty.version>9.2.22.v20170606</cs.jetty.version>
@@ -247,8 +246,8 @@
         <version>${cs.batik.version}</version>
       </dependency>
       <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-collections4</artifactId>
         <version>${cs.commons-collections.version}</version>
       </dependency>
       <dependency>
@@ -443,12 +442,12 @@
       <dependency>
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjtools</artifactId>
-        <version>1.8.10</version>
+        <version>1.8.11</version>
       </dependency>
       <dependency>
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjweaver</artifactId>
-        <version>1.8.10</version>
+        <version>1.8.11</version>
       </dependency>
       <dependency>
         <groupId>org.apache.axis</groupId>
diff --git a/usage/src/com/cloud/usage/UsageServer.java b/usage/src/com/cloud/usage/UsageServer.java
index 246ad06..df3f374 100644
--- a/usage/src/com/cloud/usage/UsageServer.java
+++ b/usage/src/com/cloud/usage/UsageServer.java
@@ -16,19 +16,13 @@
 // under the License.
 package com.cloud.usage;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-
 import org.apache.commons.daemon.Daemon;
 import org.apache.commons.daemon.DaemonContext;
 import org.apache.commons.daemon.DaemonInitException;
 import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
-import org.apache.log4j.xml.DOMConfigurator;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.util.Log4jConfigurer;
 
-import com.cloud.utils.PropertiesUtil;
+import com.cloud.utils.LogUtils;
 import com.cloud.utils.component.ComponentContext;
 
 public class UsageServer implements Daemon {
@@ -83,28 +77,7 @@ public class UsageServer implements Daemon {
     }
 
     static private void initLog4j() {
-        File file = PropertiesUtil.findConfigFile("log4j-cloud.xml");
-        if (file != null) {
-            System.out.println("log4j configuration found at " + file.getAbsolutePath());
-            try {
-                Log4jConfigurer.initLogging(file.getAbsolutePath());
-            } catch (FileNotFoundException e) {
-                s_logger.info("[ignored] log initialisation ;)" + e.getLocalizedMessage(),
e);
-            }
-            DOMConfigurator.configureAndWatch(file.getAbsolutePath());
-
-        } else {
-            file = PropertiesUtil.findConfigFile("log4j-cloud.properties");
-            if (file != null) {
-                System.out.println("log4j configuration found at " + file.getAbsolutePath());
-                try {
-                    Log4jConfigurer.initLogging(file.getAbsolutePath());
-                } catch (FileNotFoundException e) {
-                    s_logger.info("[ignored] log properties initialization :)" + e.getLocalizedMessage(),
e);
-                }
-                PropertyConfigurator.configureAndWatch(file.getAbsolutePath());
-            }
-        }
+        LogUtils.initLog4j("log4j-cloud.xml");
     }
 
 }
diff --git a/utils/pom.xml b/utils/pom.xml
index 52e5dd5..4537c78 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -166,7 +166,7 @@
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>3.5</version>
+      <version>3.6</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -178,6 +178,11 @@
       <version>${cs.guava-testlib.version}</version>
     </dependency>
     <dependency>
+      <groupId>com.fasterxml.jackson.dataformat</groupId>
+      <artifactId>jackson-dataformat-yaml</artifactId>
+      <version>${cs.jackson.version}</version>
+    </dependency>
+    <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
       <version>${cs.jackson.version}</version>

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>.

Mime
View raw message