You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/05/16 10:12:22 UTC
[3/4] incubator-taverna-language git commit: newer Jackson
newer Jackson
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/d40623b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/d40623b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/d40623b1
Branch: refs/heads/master
Commit: d40623b190aedeefd8c1dd0142aa4ac9a7e8f3fb
Parents: f937678
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon May 16 11:02:53 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon May 16 11:02:53 2016 +0100
----------------------------------------------------------------------
taverna-scufl2-wfdesc/pom.xml | 29 +++++---------------
.../taverna/scufl2/wfdesc/WfdescAgent.java | 9 +++---
2 files changed, 11 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/d40623b1/taverna-scufl2-wfdesc/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/pom.xml b/taverna-scufl2-wfdesc/pom.xml
index 4cc8023..c60646c 100755
--- a/taverna-scufl2-wfdesc/pom.xml
+++ b/taverna-scufl2-wfdesc/pom.xml
@@ -85,20 +85,15 @@
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
- <groupId>
- org.apache.jena
- </groupId>
- <artifactId>
- jena-maven-tools
- </artifactId>
- <versionRange>
- [3.0.1,)
- </versionRange>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-maven-tools</artifactId>
+ <versionRange>[${jena.version},)</versionRange>
<goals>
<goal>translate</goal>
</goals>
</pluginExecutionFilter>
<action>
+ <!-- Make target/generated-source/jena -->
<execute />
</action>
</pluginExecution>
@@ -140,17 +135,7 @@
<artifactId>jena-osgi</artifactId>
<version>${jena.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xerces</artifactId>
- <version>${servicemix.xerces.version}</version>
- </dependency>
- <!-- JENA-1178 workaround: Upgrade jsonlld-java -->
- <dependency>
- <groupId>com.github.jsonld-java</groupId>
- <artifactId>jsonld-java</artifactId>
- <version>${jsonldjava.version}</version>
- </dependency>
+
<dependency>
<groupId>junit</groupId>
@@ -167,8 +152,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
<type>jar</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/d40623b1/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescAgent.java
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescAgent.java b/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescAgent.java
index a75d9ba..0a0209e 100644
--- a/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescAgent.java
+++ b/taverna-scufl2-wfdesc/src/main/java/org/apache/taverna/scufl2/wfdesc/WfdescAgent.java
@@ -25,11 +25,10 @@ package org.apache.taverna.scufl2.wfdesc;
import java.io.IOException;
import java.net.URI;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.WebResource;