update jdom from 1.x to 2.x.

Author: liyanzhang505

pom.xml

@@ -25,8 +25,8 @@
         </dependency>
         <dependency>
             <groupId>org.jdom</groupId>
-            <artifactId>jdom</artifactId>
-            <version>1.1</version>
+            <artifactId>jdom2</artifactId>
+            <version>2.0.6</version>
         </dependency>
         <dependency>
             <groupId>org.codehaus.jettison</groupId>

src/main/java/com/aliyun/oss/common/parser/JAXBResponseParser.java

@@ -32,10 +32,13 @@
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.sax.SAXSource;
 
+import com.aliyun.oss.ClientException;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
 import com.aliyun.oss.common.comm.ResponseMessage;
+import org.xml.sax.SAXNotRecognizedException;
+import org.xml.sax.SAXNotSupportedException;
 
 /**
  * Implementation of <code>ResponseParser<code> with JAXB.
@@ -56,6 +59,13 @@ public class JAXBResponseParser implements ResponseParser<Object> {
     static {
         saxParserFactory.setNamespaceAware(true);
         saxParserFactory.setValidating(false);
+        try {
+            saxParserFactory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+            saxParserFactory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+            saxParserFactory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+            saxParserFactory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+        } catch (Exception e) {
+        }
     }
 
     public JAXBResponseParser(Class<?> modelClass) {

src/main/java/com/aliyun/oss/internal/ResponseParsers.java

@@ -46,10 +46,10 @@
 import com.aliyun.oss.model.InventorySchedule;
 import com.aliyun.oss.model.InventoryServerSideEncryptionKMS;
 import com.aliyun.oss.model.ListObjectsV2Result;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.JDOMParseException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.JDOMParseException;
+import org.jdom2.input.SAXBuilder;
 
 import com.aliyun.oss.common.comm.ResponseMessage;
 import com.aliyun.oss.common.parser.ResponseParseException;
@@ -1157,6 +1157,10 @@ public static <ResultType extends GenericResult> void setServerCRC(ResultType re
 
     private static Element getXmlRootElement(InputStream responseBody) throws Exception {
         SAXBuilder builder = new SAXBuilder();
+        builder.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+        builder.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+        builder.setFeature("http://xml.org/sax/features/external-general-entities", false);
+        builder.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
         Document doc = builder.build(responseBody);
         return doc.getRootElement();
     }

src/test/java/com/aliyun/oss/common/parser/RequestMarshallersTest.java

@@ -7,10 +7,10 @@
 import com.aliyun.oss.common.comm.io.FixedLengthInputStream;
 import com.aliyun.oss.model.*;
 import junit.framework.Assert;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;

src/test/java/com/aliyun/oss/common/parser/ResponseParsersTest.java

@@ -3,8 +3,12 @@
 import com.aliyun.oss.common.comm.ResponseMessage;
 import com.aliyun.oss.common.utils.DateUtil;
 import com.aliyun.oss.internal.ResponseParsers;
+import com.aliyun.oss.internal.model.OSSErrorResult;
 import com.aliyun.oss.model.*;
 import junit.framework.Assert;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
 import org.junit.Test;
 
 import java.io.ByteArrayInputStream;

src/test/java/com/aliyun/oss/integrationtests/ObjectEncryptionTest.java

@@ -45,7 +45,7 @@ public void setUp() throws Exception {
         super.setUp();
 
         bucketName = super.bucketName + "-object-encryption";
-        endpoint = "http://oss-ap-southeast-5.aliyuncs.com";
+        endpoint = "http://oss-cn-hongkong.aliyuncs.com";
 
         //create client
         ClientConfiguration conf = new ClientConfiguration().setSupportCname(false);

src/test/java/com/aliyun/oss/perftests/PerftestRunner.java

@@ -39,10 +39,10 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
 
 import com.aliyun.oss.ClientException;
 import com.aliyun.oss.OSS;