Repository: incubator-taverna-common-activities Updated Branches: refs/heads/docker bebc1f292 -> 048639d00
Fixing jackson version mismatch compile time 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/689b6d28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/689b6d28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/689b6d28 Branch: refs/heads/docker Commit: 689b6d2898ea5412d6ee3db8071a373d8bca669d Parents: d4e585b Author: Nadeesh Dilanga <[email protected]> Authored: Wed Jun 22 22:55:11 2016 -0400 Committer: Nadeesh Dilanga <[email protected]> Committed: Wed Jun 22 22:55:11 2016 -0400 ---------------------------------------------------------------------- taverna-docker-activity/pom.xml | 71 ++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/689b6d28/taverna-docker-activity/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-docker-activity/pom.xml b/taverna-docker-activity/pom.xml index 5daed36..8a2fc51 100644 --- a/taverna-docker-activity/pom.xml +++ b/taverna-docker-activity/pom.xml @@ -30,25 +30,61 @@ <name>Apache Taverna Docker Activity</name> <dependencies> + <dependency> + <groupId>com.github.docker-java</groupId> + <artifactId>docker-java</artifactId> + <version>3.0.0</version> + <scope>compile</scope> + <exclusions> + <exclusion> <!-- declare the exclusion here --> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.taverna.engine</groupId> <artifactId>taverna-reference-api</artifactId> <version>${taverna.engine.version}</version> + <exclusions> + <exclusion> <!-- declare the exclusion here --> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.taverna.engine</groupId> <artifactId>taverna-workflowmodel-api</artifactId> <version>${taverna.engine.version}</version> + <exclusions> + <exclusion> <!-- declare the exclusion here --> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.taverna.osgi</groupId> <artifactId>taverna-app-configuration-api</artifactId> <version>${taverna.osgi.version}</version> + <exclusions> + <exclusion> <!-- declare the exclusion here --> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.taverna.osgi</groupId> <artifactId>taverna-configuration-api</artifactId> <version>${taverna.osgi.version}</version> + <exclusions> + <exclusion> <!-- declare the exclusion here --> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>junit</groupId> @@ -56,23 +92,34 @@ <version>${junit.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.taverna.engine</groupId> - <artifactId>taverna-activity-test-utils</artifactId> - <version>${taverna.engine.version}</version> - <scope>test</scope> - </dependency> + <!--<dependency>--> + <!--<groupId>org.apache.taverna.engine</groupId>--> + <!--<artifactId>taverna-activity-test-utils</artifactId>--> + <!--<version>${taverna.engine.version}</version>--> + <!--<scope>test</scope>--> + <!--</dependency>--> <dependency> <groupId>org.apache.taverna.engine</groupId> <artifactId>taverna-workflowmodel-impl</artifactId> <version>${taverna.engine.version}</version> <scope>test</scope> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${jackson.version}</version> - </dependency> + <exclusions> + <exclusion> <!-- declare the exclusion here --> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </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> + <version>2.7.4</version> + </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient-osgi</artifactId>
