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 2018/01/11 15:56:52 UTC
[5/8] incubator-taverna-language git commit: Merge branch 'master'
into TAVERNA-1027
Merge branch 'master' into TAVERNA-1027
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/658f257c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/658f257c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/658f257c
Branch: refs/heads/TAVERNA-1027
Commit: 658f257c0b8cd2eee3490f8a2d15c2287a44c144
Parents: cb45105 bbcee92
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Jan 9 23:53:44 2018 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Jan 9 23:53:44 2018 +0000
----------------------------------------------------------------------
taverna-scufl2-api/pom.xml | 13 ++++++++++++-
.../org/apache/taverna/scufl2/rdfxml/xsd/scufl2.xsd | 2 +-
taverna-scufl2-scufl/pom.xml | 4 ++--
taverna-scufl2-t2flow/pom.xml | 4 ++--
.../scufl2/translator/t2flow/xsd/componentactivity.xsd | 4 ++--
.../translator/t2flow/xsd/externaltoolactivity.xsd | 4 ++--
.../translator/t2flow/xsd/interactionactivity.xsd | 4 ++--
.../scufl2/translator/t2flow/xsd/restactivity.xsd | 4 ++--
.../scufl2/translator/t2flow/xsd/t2activities.xsd | 4 ++--
.../scufl2/translator/t2flow/xsd/t2annotations.xsd | 4 ++--
.../scufl2/translator/t2flow/xsd/xpathactivity.xsd | 6 +++---
.../resources/semantic_annotations__eclipse.t2flow | 4 ++--
taverna-scufl2-ucfpackage/pom.xml | 6 +++---
taverna-scufl2-wfbundle/pom.xml | 4 ++--
.../org/apache/taverna/scufl2/rdfxml/roevo-test.xml | 2 +-
15 files changed, 40 insertions(+), 29 deletions(-)
----------------------------------------------------------------------