Bump jdom to version 2.0.6.1

sbgn · Oct 8, 2024 · 2aae05b · 2aae05b
1 parent af0fec1
commit 2aae05b
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 27 deletions.
diff --git a/org.sbgn/lib/com.springsource.org.jdom-1.1.0.jar b/org.sbgn/lib/com.springsource.org.jdom-1.1.0.jar
diff --git a/org.sbgn/lib/jdom2-2.0.6.1.jar b/org.sbgn/lib/jdom2-2.0.6.1.jar
diff --git a/org.sbgn/src/org/sbgn/ConvertMilestone1to2.java b/org.sbgn/src/org/sbgn/ConvertMilestone1to2.java
@@ -6,12 +6,12 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-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.Namespace;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.XMLOutputter;
 
 public class ConvertMilestone1to2
 {

diff --git a/org.sbgn/src/org/sbgn/ConvertMilestone2to3.java b/org.sbgn/src/org/sbgn/ConvertMilestone2to3.java
@@ -4,12 +4,12 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-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.Namespace;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.XMLOutputter;
 
 public class ConvertMilestone2to3
 {

diff --git a/org.sbgn/src/org/sbgn/IAttributeTransformer.java b/org.sbgn/src/org/sbgn/IAttributeTransformer.java
@@ -1,6 +1,6 @@
 package org.sbgn;
 
-import org.jdom.Attribute;
+import org.jdom2.Attribute;
 
 interface IAttributeTransformer
 {

diff --git a/org.sbgn/src/org/sbgn/IElementTransformer.java b/org.sbgn/src/org/sbgn/IElementTransformer.java
@@ -1,6 +1,6 @@
 package org.sbgn;
 
-import org.jdom.Element;
+import org.jdom2.Element;
 
 interface IElementTransformer
 {

diff --git a/org.sbgn/src/org/sbgn/RenderUtil.java b/org.sbgn/src/org/sbgn/RenderUtil.java
@@ -10,7 +10,7 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.XMLStreamException;
 
-import org.jdom.Namespace;
+import org.jdom2.Namespace;
 import org.sbgn.bindings.Arc;
 import org.sbgn.bindings.ColorDefinition;
 import org.sbgn.bindings.G;

diff --git a/org.sbgn/src/org/sbgn/XmlUtil.java b/org.sbgn/src/org/sbgn/XmlUtil.java
@@ -16,14 +16,14 @@
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
-import org.jdom.input.DOMBuilder;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.DOMOutputter;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
+import org.jdom2.input.DOMBuilder;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.DOMOutputter;
+import org.jdom2.output.XMLOutputter;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
@@ -111,7 +111,7 @@ public static void transformElement(Element elt, IElementTransformer transformer
 			return;
 		if (attrTransformer != null) {
 			for (Object attr : elt.getAttributes())
-				attrTransformer.transform((org.jdom.Attribute) attr);
+				attrTransformer.transform((org.jdom2.Attribute) attr);
 		}
 
 		if (transformer != null) {
@@ -135,7 +135,7 @@ public static void replaceNamespace(Element elt, Namespace n1, Namespace n2, boo
 			return;
 
 		for (Object o : elt.getAttributes()) {
-			org.jdom.Attribute attr = (org.jdom.Attribute) o;
+			org.jdom2.Attribute attr = (org.jdom2.Attribute) o;
 			namespace = attr.getNamespace();
 
 			if (namespace == null || namespace.getURI().isEmpty() || namespace.equals(n1))

diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,7 @@
     <maven.javadoc.skip>false</maven.javadoc.skip>
     <junit.version>4.13.1</junit.version>
     <ant.version>1.6.5</ant.version>
-    <jdom.version>1.1</jdom.version>
+    <jdom.version>2.0.6.1</jdom.version>
     <velocity.version>1.6.2</velocity.version>
     <javax-api.version>2.3.1</javax-api.version>
     <xalan.version>2.7.3</xalan.version>
@@ -127,7 +127,7 @@
 
     <dependency>
       <groupId>org.jdom</groupId>
-      <artifactId>jdom</artifactId>
+      <artifactId>jdom2</artifactId>
       <version>${jdom.version}</version>
     </dependency>
     <dependency>