Update JDOM

diff --git a/pom.xml b/pom.xml
index b3d2f9f..4c9c0a1 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -78,9 +78,9 @@
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>jdom</groupId>
-                       <artifactId>jdom</artifactId>
-                       <version>1.0</version>
+                       <groupId>org.jdom</groupId>
+                       <artifactId>jdom2</artifactId>
+                       <version>2.0.6.1</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>

diff --git a/src/main/java/com/ozacc/mail/impl/JDomXMLMailBuilder.java b/src/main/java/com/ozacc/mail/impl/JDomXMLMailBuilder.java
index 0147b2d..6843380 100644 (file)
--- a/src/main/java/com/ozacc/mail/impl/JDomXMLMailBuilder.java
+++ b/src/main/java/com/ozacc/mail/impl/JDomXMLMailBuilder.java
@@ -17,11 +17,11 @@ import org.apache.velocity.app.Velocity;
 import org.apache.velocity.exception.MethodInvocationException;
 import org.apache.velocity.exception.ParseErrorException;
 import org.apache.velocity.exception.ResourceNotFoundException;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.XMLOutputter;
 
 import com.ozacc.mail.Mail;
 import com.ozacc.mail.MailBuildException;

diff --git a/src/main/java/com/ozacc/mail/xml/impl/JDomXMLBuilder.java b/src/main/java/com/ozacc/mail/xml/impl/JDomXMLBuilder.java
index 0b507ef..5748828 100644 (file)
--- a/src/main/java/com/ozacc/mail/xml/impl/JDomXMLBuilder.java
+++ b/src/main/java/com/ozacc/mail/xml/impl/JDomXMLBuilder.java
@@ -6,14 +6,14 @@ import java.io.IOException;
 
 import javax.mail.internet.InternetAddress;
 
-import org.jdom.CDATA;
-import org.jdom.DocType;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.output.DOMOutputter;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.CDATA;
+import org.jdom2.DocType;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.output.DOMOutputter;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
 
 import com.ozacc.mail.Mail;
 import com.ozacc.mail.xml.XMLBuildException;

diff --git a/src/test/java/com/ozacc/mail/xml/impl/JDomXMLBuilderTest.java b/src/test/java/com/ozacc/mail/xml/impl/JDomXMLBuilderTest.java
index 3f8d86e..a8ae150 100644 (file)
--- a/src/test/java/com/ozacc/mail/xml/impl/JDomXMLBuilderTest.java
+++ b/src/test/java/com/ozacc/mail/xml/impl/JDomXMLBuilderTest.java
@@ -5,9 +5,9 @@ import java.io.File;
 import junit.framework.TestCase;
 
 import org.apache.log4j.BasicConfigurator;
-import org.jdom.Document;
-import org.jdom.input.DOMBuilder;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.input.DOMBuilder;
+import org.jdom2.output.XMLOutputter;
 
 import com.ozacc.mail.Mail;
 

diff --git a/src/test/java/com/ozacc/mail/xml/impl/XMLBuilderImplTest.java b/src/test/java/com/ozacc/mail/xml/impl/XMLBuilderImplTest.java
index 0adbae0..df6dae6 100644 (file)
--- a/src/test/java/com/ozacc/mail/xml/impl/XMLBuilderImplTest.java
+++ b/src/test/java/com/ozacc/mail/xml/impl/XMLBuilderImplTest.java
@@ -5,9 +5,9 @@ import java.io.File;
 import junit.framework.TestCase;
 
 import org.apache.log4j.BasicConfigurator;
-import org.jdom.Document;
-import org.jdom.input.DOMBuilder;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.input.DOMBuilder;
+import org.jdom2.output.XMLOutputter;
 
 import com.ozacc.mail.Mail;
 import com.ozacc.mail.xml.XMLBuilder;