remove snakeyaml dep from ui module
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/de398c61 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/de398c61 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/de398c61 Branch: refs/heads/cwl-browse Commit: de398c61da66d20338f7878a90783010730fe49d Parents: 97e9870 Author: ThilinaManamgoda <maanafun...@gmail.com> Authored: Tue Jul 12 06:34:48 2016 +0530 Committer: ThilinaManamgoda <maanafun...@gmail.com> Committed: Tue Jul 12 06:34:48 2016 +0530 ---------------------------------------------------------------------- taverna-cwl-activity-ui/pom.xml | 5 ----- .../taverna/cwl/ui/serviceprovider/CwlServiceDesc.java | 4 ++-- taverna-cwl-activity/pom.xml | 6 ------ taverna-cwl-utilities/pom.xml | 11 ++++++----- 4 files changed, 8 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/de398c61/taverna-cwl-activity-ui/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-cwl-activity-ui/pom.xml b/taverna-cwl-activity-ui/pom.xml index 287d4df..407e1f8 100644 --- a/taverna-cwl-activity-ui/pom.xml +++ b/taverna-cwl-activity-ui/pom.xml @@ -60,11 +60,6 @@ </dependency> <!-- =====================================These Dependencies were added later !!! =============================================================== --> - <dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - <version>1.17</version> - </dependency> <dependency> <groupId>org.apache.taverna.commonactivities</groupId> http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/de398c61/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java ---------------------------------------------------------------------- diff --git a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java index 80533bd..d404fd2 100644 --- a/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java +++ b/taverna-cwl-activity-ui/src/main/java/org/apache/taverna/cwl/ui/serviceprovider/CwlServiceDesc.java @@ -55,8 +55,8 @@ public class CwlServiceDesc extends ServiceDescription<JsonNode > { @Override public Class<? extends Activity<JsonNode>> getActivityClass() { - - return (Class<? extends Activity<JsonNode>>) CwlDumyActivity.class; + //should fix this + return null; } @Override public JsonNode getActivityConfiguration() { http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/de398c61/taverna-cwl-activity/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-cwl-activity/pom.xml b/taverna-cwl-activity/pom.xml index 1f97639..85868cb 100644 --- a/taverna-cwl-activity/pom.xml +++ b/taverna-cwl-activity/pom.xml @@ -77,12 +77,6 @@ <dependency> <groupId>org.apache.taverna.commonactivities</groupId> <artifactId>taverna-cwl-utilities</artifactId> - <version>2.1.0-incubating-SNAPSHOT</version> - <type>bundle</type> - </dependency> -<dependency> - <groupId>org.apache.taverna.commonactivities</groupId> - <artifactId>taverna-cwl-utilities</artifactId> <version>${project.version}</version> <type>bundle</type> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/de398c61/taverna-cwl-utilities/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-cwl-utilities/pom.xml b/taverna-cwl-utilities/pom.xml index 674b14c..7706a68 100644 --- a/taverna-cwl-utilities/pom.xml +++ b/taverna-cwl-utilities/pom.xml @@ -22,15 +22,16 @@ <name>Apache Taverna CWL Activity</name> <dependencies> -<dependency> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - <version>1.17</version> - </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> <version>${jackson.version}</version> </dependency> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.17</version> + <type>bundle</type> + </dependency> </dependencies> </project>
