You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by al...@apache.org on 2016/07/29 12:55:54 UTC
[02/10] incubator-taverna-common-activities git commit: Fixing pom
issue.
Fixing pom issue.
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/0c45da37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/0c45da37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/0c45da37
Branch: refs/heads/docker
Commit: 0c45da370f9454190c46215df6c6f6b6ac4a78e2
Parents: 4cf2009
Author: Nadeesh Dilanga <na...@gmail.com>
Authored: Thu Jun 30 22:36:17 2016 -0400
Committer: Nadeesh Dilanga <na...@gmail.com>
Committed: Thu Jun 30 22:36:17 2016 -0400
----------------------------------------------------------------------
taverna-docker-activity/pom.xml | 35 +++++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/0c45da37/taverna-docker-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-docker-activity/pom.xml b/taverna-docker-activity/pom.xml
index 515e9bb..03361a9 100644
--- a/taverna-docker-activity/pom.xml
+++ b/taverna-docker-activity/pom.xml
@@ -31,10 +31,21 @@
<dependencies>
<dependency>
+ <groupId>org.glassfish.jersey.connectors</groupId>
+ <artifactId>jersey-apache-connector</artifactId>
+ <version>2.11</version>
+ <exclusions>
+ <exclusion> <!-- declare the exclusion here -->
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>com.github.docker-java</groupId>
<artifactId>docker-java</artifactId>
<version>3.0.0</version>
- <scope>compile</scope>
+ <!--<scope>compile</scope>-->
<exclusions>
<exclusion> <!-- declare the exclusion here -->
<groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -62,6 +73,11 @@
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</exclusion>
+ <exclusion> <!-- declare the exclusion here -->
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </exclusion>
+
</exclusions>
</dependency>
<dependency>
@@ -96,7 +112,7 @@
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-activity-test-utils</artifactId>
<version>${taverna.engine.version}</version>
- <scope>test</scope>
+ <!--<scope>test</scope>-->
<exclusions>
<exclusion> <!-- declare the exclusion here -->
<groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -108,7 +124,7 @@
<groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-workflowmodel-impl</artifactId>
<version>${taverna.engine.version}</version>
- <scope>test</scope>
+ <!--<scope>test</scope>-->
<exclusions>
<exclusion> <!-- declare the exclusion here -->
<groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -116,11 +132,6 @@
</exclusion>
</exclusions>
</dependency>
- <!--<dependency>-->
- <!--<groupId>com.fasterxml.jackson.core</groupId>-->
- <!--<artifactId>jackson-databind</artifactId>-->
- <!--<version>2.7.4</version>-->
- <!--</dependency>-->
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
@@ -152,6 +163,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>fluent-hc</artifactId>
</exclusion>
+ <exclusion> <!-- declare the exclusion here -->
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -167,6 +182,10 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-nio</artifactId>
</exclusion>
+ <exclusion> <!-- declare the exclusion here -->
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ </exclusion>
</exclusions>
</dependency>