commit | e4bb328ee4546ef5a601a063aa2028da3df0b326 | [log] [tgz] |
---|---|---|
author | Stian Soiland-Reyes <stain@apache.org> | Wed Jan 30 19:09:40 2019 +0000 |
committer | Stian Soiland-Reyes <stain@apache.org> | Wed Jan 30 19:09:40 2019 +0000 |
tree | c555d47665c320c4620fd967f49bc10af898e366 | |
parent | 0c9c5c9aa22d62bd554bef6fe5b3f03ad21ec621 [diff] |
use jdom2 .. but this module does not really compile
diff --git a/taverna-provenanceconnector/pom.xml b/taverna-provenanceconnector/pom.xml index b879a93..c8111e5 100644 --- a/taverna-provenanceconnector/pom.xml +++ b/taverna-provenanceconnector/pom.xml
@@ -71,9 +71,9 @@ <version>${project.parent.version}</version> </dependency> <dependency> - <groupId>org.jdom</groupId> - <artifactId>com.springsource.org.jdom</artifactId> - <version>${jdom.version}</version> + <groupId>org.apache.servicemix.bundles</groupId> + <artifactId>org.apache.servicemix.bundles.jdom</artifactId> + <version>${jdom2.version}</version> </dependency> <dependency> <groupId>log4j</groupId>
diff --git a/taverna-provenanceconnector/src/main/java/org/apache/taverna/provenance/lineageservice/AnnotationsLoader.java b/taverna-provenanceconnector/src/main/java/org/apache/taverna/provenance/lineageservice/AnnotationsLoader.java index a46089d..b08a038 100644 --- a/taverna-provenanceconnector/src/main/java/org/apache/taverna/provenance/lineageservice/AnnotationsLoader.java +++ b/taverna-provenanceconnector/src/main/java/org/apache/taverna/provenance/lineageservice/AnnotationsLoader.java
@@ -26,10 +26,10 @@ import java.util.Map; import org.apache.log4j.Logger; -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; /** * @author Paolo Missier
diff --git a/taverna-provenanceconnector/src/main/java/org/apache/taverna/provenance/lineageservice/EventProcessor.java b/taverna-provenanceconnector/src/main/java/org/apache/taverna/provenance/lineageservice/EventProcessor.java index fcb8224..64d045f 100644 --- a/taverna-provenanceconnector/src/main/java/org/apache/taverna/provenance/lineageservice/EventProcessor.java +++ b/taverna-provenanceconnector/src/main/java/org/apache/taverna/provenance/lineageservice/EventProcessor.java
@@ -105,12 +105,12 @@ //import org.apache.commons.io.FileUtils; import org.apache.log4j.Level; import org.apache.log4j.Logger; -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; import org.apache.taverna.scufl2.api.io.WorkflowBundleIO;
diff --git a/taverna-provenanceconnector/src/main/java/org/apache/taverna/provenance/lineageservice/ProvenanceQuery.java b/taverna-provenanceconnector/src/main/java/org/apache/taverna/provenance/lineageservice/ProvenanceQuery.java index fe3918b..7ec8304 100644 --- a/taverna-provenanceconnector/src/main/java/org/apache/taverna/provenance/lineageservice/ProvenanceQuery.java +++ b/taverna-provenanceconnector/src/main/java/org/apache/taverna/provenance/lineageservice/ProvenanceQuery.java
@@ -57,8 +57,8 @@ import org.apache.taverna.provenance.lineageservice.utils.WorkflowRun; import org.apache.log4j.Logger; -import org.jdom.Document; -import org.jdom.Element; +import org.jdom2.Document; +import org.jdom2.Element; import org.apache.taverna.configuration.database.DatabaseManager;