TAVERNA-971 No more need for workaround with Taverna Language 0.15.2-SNAPSHOT
diff --git a/pom.xml b/pom.xml
index 3ac2c13..6e14239 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
<packaging>pom</packaging>
<name>Apache Taverna Commandline</name>
<properties>
- <taverna.language.version>0.15.1-incubating</taverna.language.version>
+ <taverna.language.version>0.15.2-incubating-SNAPSHOT</taverna.language.version>
<taverna.osgi.version>0.2.1-incubating</taverna.osgi.version>
<taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version>
<taverna.commonactivities.version>2.1.0-incubating-SNAPSHOT</taverna.commonactivities.version>
@@ -44,7 +44,7 @@
<servicemix.xerces.version>2.11.0_1</servicemix.xerces.version>
<apache.httpclient.version>4.5.2</apache.httpclient.version>
<apache.httpcore.version>4.4.4</apache.httpcore.version>
- <jackson.version>2.6.6</jackson.version>
+ <jackson.version>2.7.0</jackson.version>
<jsonldjava.version>0.8.2</jsonldjava.version>
<commons.configuration.version>1.10</commons.configuration.version>
<slf4j.version>1.7.20</slf4j.version>
diff --git a/taverna-commandline-common/src/main/java/org/apache/taverna/commandline/CommandLineTool.java b/taverna-commandline-common/src/main/java/org/apache/taverna/commandline/CommandLineTool.java
index 90a6d47..cf8227e 100644
--- a/taverna-commandline-common/src/main/java/org/apache/taverna/commandline/CommandLineTool.java
+++ b/taverna-commandline-common/src/main/java/org/apache/taverna/commandline/CommandLineTool.java
@@ -172,8 +172,6 @@
return 0;
}
setupDatabase(commandLineOptions);
- setupJarCache();
-
if (commandLineOptions.getWorkflow() != null) {
@@ -325,21 +323,6 @@
return 0;
}
- private void setupJarCache() {
- // TAVERNA-xx workaround - we'll have our own jarcache.json and
- // our own bundle.jsonld
- Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-
- // Verify:
- try {
- JsonUtils.fromURL(new URL(BUNDLE_CONTEXT));
- } catch (Exception e) {
- System.err.println("Can't load " + BUNDLE_CONTEXT + "");
- e.printStackTrace();
-
- }
- }
-
private boolean workflowFinished(WorkflowReport report) {
State state = report.getState();
if (state == State.CANCELLED || state == State.COMPLETED || state == State.FAILED) {
diff --git a/taverna-commandline-common/src/main/resources/contexts/bundle.jsonld b/taverna-commandline-common/src/main/resources/contexts/bundle.jsonld
deleted file mode 100644
index cadb9ff..0000000
--- a/taverna-commandline-common/src/main/resources/contexts/bundle.jsonld
+++ /dev/null
@@ -1,140 +0,0 @@
-{
- "http://purl.org/dc/terms/license" :
- "Licensed to the Apache Software Foundation (ASF) under one or more\n contributor license agreements. See the NOTICE file distributed with\n this work for additional information regarding copyright ownership.\n The ASF licenses this file to You under the Apache License, Version 2.0\n (the \"License\"); you may not use this file except in compliance with\n the License. You may obtain a copy of the License at\n \n http://www.apache.org/licenses/LICENSE-2.0\n \n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n",
- "@context": {
- "ao": "http://purl.org/ao/",
- "oa": "http://www.w3.org/ns/oa#",
- "dc": "http://purl.org/dc/elements/1.1/",
- "dct": "http://purl.org/dc/terms/",
- "ore": "http://www.openarchives.org/ore/terms/",
- "ro": "http://purl.org/wf4ever/ro#",
- "roterms": "http://purl.org/wf4ever/roterms#",
- "bundle": "http://purl.org/wf4ever/bundle#",
- "prov": "http://www.w3.org/ns/prov#",
- "pav": "http://purl.org/pav/",
- "xsd": "http://www.w3.org/2001/XMLSchema#",
- "foaf": "http://xmlns.com/foaf/0.1/",
- "owl": "http://www.w3.org/2002/07/owl#",
-
- "uri": "@id",
- "id": {
- "@id": "owl:sameAs",
- "@type": "@id" },
- "file": {
- "@id": "owl:sameAs",
- "@type": "@id" },
- "annotation": {
- "@id": "owl:sameAs",
- "@type": "@id" },
-
- "manifest": {
- "@id": "ore:isDescribedBy",
- "@type": "@id"
- },
-
- "createdOn": {
- "@id": "pav:createdOn",
- "@type": "xsd:dateTime"
- },
- "createdBy": {
- "@id": "pav:createdBy",
- "@type": "@id"
- },
- "aggregatedOn": {
- "@id": "pav:createdOn",
- "@type": "xsd:dateTime"
- },
- "aggregatedBy": {
- "@id": "pav:createdBy",
- "@type": "@id"
- },
- "authoredOn": {
- "@id": "pav:authoredOn",
- "@type": "xsd:dateTime"
- },
- "authoredBy": {
- "@id": "pav:authoredBy",
- "@type": "@id"
- },
- "curatedOn": {
- "@id": "pav:curatedOn",
- "@type": "xsd:dateTime"
- },
- "curatedBy": {
- "@id": "pav:curatedBy",
- "@type": "@id"
- },
- "contributedOn": {
- "@id": "pav:contributedOn",
- "@type": "xsd:dateTime"
- },
- "contributedBy": {
- "@id": "pav:contributedBy",
- "@type": "@id"
- },
- "retrievedOn": {
- "@id": "pav:retrievedOn",
- "@type": "xsd:dateTime"
- },
- "retrievedBy": {
- "@id": "pav:retrievedBy",
- "@type": "@id"
- },
- "retrievedFrom": {
- "@id": "pav:retrievedFrom",
- "@type": "@id"
- },
- "name": {
- "@id": "foaf:name"
- },
- "orcid": {
- "@id": "roterms:orcid",
- "@type": "@id"
- },
-
- "history": {
- "@id": "prov:has_provenance",
- "@type": "@id"
- },
- "aggregates": {
- "@id": "ore:aggregates",
- "@type": "@id"
- },
- "mediatype": {
- "@id": "dc:format"
- },
- "folder": {
- "@id": "bundle:inFolder",
- "@type": "@id"
- },
- "filename": {
- "@id": "ro:entryName"
- },
- "proxy": {
- "@id": "bundle:hasProxy",
- "@type": "@id"
- },
- "bundledAs": {
- "@id": "bundle:bundledAs",
- "@type": "@id"
- },
- "conformsTo": {
- "@id": "dct:conformsTo",
- "@type": "@id"
- },
- "annotations": {
- "@id": "bundle:hasAnnotation",
- "@type": "@id"
- },
- "content": {
- "@id": "oa:hasBody",
- "@type": "@id"
- },
- "about": {
- "@id": "oa:hasTarget",
- "@type": "@id"
- }
-
- },
- "http://purl.org/pav/retrievedFrom": { "@id": "https://raw.githubusercontent.com/wf4ever/ro/61b563e7e9941485ff6e7b338875d4015d734b6f/bundle/draft/context.json" }
-}
diff --git a/taverna-commandline-common/src/main/resources/jarcache.json b/taverna-commandline-common/src/main/resources/jarcache.json
deleted file mode 100644
index 64aa4d3..0000000
--- a/taverna-commandline-common/src/main/resources/jarcache.json
+++ /dev/null
@@ -1,11 +0,0 @@
-[
- {
- "X-License" :
- "Licensed to the Apache Software Foundation (ASF) under one or more\n contributor license agreements. See the NOTICE file distributed with\n this work for additional information regarding copyright ownership.\n The ASF licenses this file to You under the Apache License, Version 2.0\n (the \"License\"); you may not use this file except in compliance with\n the License. You may obtain a copy of the License at\n \n http://www.apache.org/licenses/LICENSE-2.0\n \n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n",
-
- "Content-Location": "https://w3id.org/bundle/context",
- "X-Classpath": "contexts/bundle.jsonld",
- "Content-Type": "application/ld+json"
- }
-]
-
