etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Specify all external dependencies in pom Upgrade to lang3 and change usage of deprecated xmlparse method 

Add another missing dependency

Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This commit is contained in:
Rafael da Fonseca 2015-06-21 16:52:37 +02:00 committed by Daan Hoogland
parent 1603f722c4
commit 301a7b9a7e
5 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
plugins/hypervisors/ovm3/pom.xml
View File

@ -27,11 +27,41 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<dependencies>
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-client</artifactId>
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
</dependency>
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-client</artifactId>
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.xmlrpc</groupId>
<artifactId>xmlrpc-common</artifactId>
<version>3.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
</dependency>
</dependencies>
<build>
<sourceDirectory>${basedir}/src/main/java</sourceDirectory>
@ -55,16 +85,24 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<optimize>true</optimize>
<proc>none</proc>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<debug>true</debug>
<debuglevel>lines,vars,source</debuglevel>
<verbose>true</verbose>
<useIncrementalCompilation>true</useIncrementalCompilation>
<useIncrementalCompilation>false</useIncrementalCompilation>
<failOnError>false</failOnError>
<forceJavacCompilerUse>true</forceJavacCompilerUse>
<compilerReuseStrategy>alwaysNew</compilerReuseStrategy>
<compilerArgs>
<arg>-verbose</arg>
<arg>-Xlint:all,-options,-path</arg>
<arg>-Xlint:all</arg>
<arg>-version</arg>
<arg>-deprecation</arg>
<arg>-Xprefer:source</arg>
<arg>-XprintProcessorInfo</arg>
</compilerArgs>
</configuration>
</plugin>

2
plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java
View File

@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.w3c.dom.Document;

2
plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
View File

@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
public class Xen extends OvmObject {

4
plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
View File

@ -24,7 +24,7 @@ import java.util.Map;
import javax.naming.ConfigurationException;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.log4j.Logger;
import com.cloud.hypervisor.ovm3.objects.Network;
@ -34,7 +34,7 @@ import com.cloud.utils.net.NetUtils;
/* holds config data for the Ovm3 Hypervisor */
public class Ovm3Configuration {
private static final Logger LOGGER = Logger
.getLogger(Ovm3Configuration.class);
.getLogger(Ovm3Configuration.class);
private String agentIp;
private Long agentZoneId;
private Long agentPodId;

4
plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XmlTestResultTest.java
View File

@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull;
import java.util.List;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang3.StringEscapeUtils;
public class XmlTestResultTest {
private static final String NULL = "<nil/>";
@ -33,7 +33,7 @@ public class XmlTestResultTest {
public String escapeOrNot(String s) {
if (s.startsWith("<")) {
return StringEscapeUtils.escapeXml(s);
return StringEscapeUtils.escapeXml10(s);
}
return s;
}