You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2015/06/29 09:00:31 UTC
[10/50] [abbrv] git commit: updated refs/heads/dhcpoffload to 45721ae
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 <da...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/301a7b9a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/301a7b9a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/301a7b9a
Branch: refs/heads/dhcpoffload
Commit: 301a7b9a7e26a803d9d7b02d7bb537c8393dca26
Parents: 1603f72
Author: Rafael da Fonseca <rs...@gmail.com>
Authored: Sun Jun 21 16:52:37 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Mon Jun 22 13:01:19 2015 +0200
----------------------------------------------------------------------
plugins/hypervisors/ovm3/pom.xml | 52 +++++++++++++++++---
.../com/cloud/hypervisor/ovm3/objects/Pool.java | 2 +-
.../com/cloud/hypervisor/ovm3/objects/Xen.java | 2 +-
.../resources/helpers/Ovm3Configuration.java | 4 +-
.../ovm3/objects/XmlTestResultTest.java | 4 +-
5 files changed, 51 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/301a7b9a/plugins/hypervisors/ovm3/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/pom.xml b/plugins/hypervisors/ovm3/pom.xml
index d7b1138..a0c8a9b 100644
--- a/plugins/hypervisors/ovm3/pom.xml
+++ b/plugins/hypervisors/ovm3/pom.xml
@@ -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>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/301a7b9a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java
index 48778d9..cf62993 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Pool.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/301a7b9a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
index 6387566..ddf6a56 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/objects/Xen.java
@@ -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 {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/301a7b9a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
index 6775a146..2154225 100644
--- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
+++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/helpers/Ovm3Configuration.java
@@ -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;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/301a7b9a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XmlTestResultTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XmlTestResultTest.java b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XmlTestResultTest.java
index 6e44a2b..b175a16 100644
--- a/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XmlTestResultTest.java
+++ b/plugins/hypervisors/ovm3/src/test/java/com/cloud/hypervisor/ovm3/objects/XmlTestResultTest.java
@@ -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;
}