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/05/11 13:36:57 UTC
[1/5] incubator-taverna-language git commit: Reformatting: tab ->
spaces
Repository: incubator-taverna-language
Updated Branches:
refs/heads/master e50826e64 -> 4da380952
Reformatting: tab -> spaces
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/f3520944
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/f3520944
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/f3520944
Branch: refs/heads/master
Commit: f35209443a295417dd8768311e42cb1c19e37106
Parents: e50826e
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri May 11 13:41:31 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri May 11 13:41:31 2018 +0100
----------------------------------------------------------------------
pom.xml | 362 +++++++++++++-------------
taverna-baclava-language/pom.xml | 12 +-
taverna-databundle/pom.xml | 6 +-
taverna-robundle/pom.xml | 144 +++++-----
taverna-scufl2-annotation/pom.xml | 66 ++---
taverna-scufl2-api/pom.xml | 22 +-
taverna-scufl2-examples/pom.xml | 176 ++++++-------
taverna-scufl2-integration-tests/pom.xml | 102 ++++----
taverna-scufl2-schemas/pom.xml | 26 +-
taverna-scufl2-scufl/pom.xml | 44 ++--
taverna-scufl2-t2flow/pom.xml | 234 ++++++++---------
taverna-scufl2-ucfpackage/pom.xml | 82 +++---
taverna-scufl2-wfbundle/pom.xml | 116 ++++-----
taverna-scufl2-wfdesc/pom.xml | 314 +++++++++++-----------
taverna-tavlang-tool/pom.xml | 348 ++++++++++++-------------
15 files changed, 1027 insertions(+), 1027 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c976afd..a8b27ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,47 +16,47 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taverna</groupId>
- <artifactId>apache-taverna-parent</artifactId>
- <version>3-incubating</version>
- </parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.taverna</groupId>
+ <artifactId>apache-taverna-parent</artifactId>
+ <version>3-incubating</version>
+ </parent>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <name>Apache Taverna Language APIs (Scufl2, Databundle)</name>
- <description>Taverna Language API for workflow definitions (SCUFL2)
- and workflow inputs/outputs/run (DataBundle).
- </description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes combine.children="append">
- <!-- Following excludes needed for taverna-scufl2-rdf,
- taverna-scufl2-integration-tests and taverna-scufl2-validation-integration
- subfolders that should be modules but are not. -->
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- <exclude>**/.settings/</exclude>
- <exclude>**/target/</exclude>
- <!-- No headers in JSON which haven't got comments ... -->
- <exclude>**/*.json</exclude>
- <!-- Really a binary format, but must look like text -->
- <exclude>**/mimetype</exclude>
- <!-- Effectively a binary format -->
- <exclude>**/*.url</exclude>
- <!-- Cannot contain comments; content must match program output. -->
- <exclude>/src/test/resources/org/apache/taverna/scufl2/api/io/HelloWorld.txt</exclude>
- <exclude>/src/test/resources/as.txt</exclude>
- <!-- Expanded data bundle. Generated. -->
- <exclude>/src/test/resources/full-example/ebi-wfrun-2013-05-31/</exclude>
+ <name>Apache Taverna Language APIs (Scufl2, Databundle)</name>
+ <description>Taverna Language API for workflow definitions (SCUFL2)
+ and workflow inputs/outputs/run (DataBundle).
+ </description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes combine.children="append">
+ <!-- Following excludes needed for taverna-scufl2-rdf,
+ taverna-scufl2-integration-tests and taverna-scufl2-validation-integration
+ subfolders that should be modules but are not. -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/</exclude>
+ <exclude>**/target/</exclude>
+ <!-- No headers in JSON which haven't got comments ... -->
+ <exclude>**/*.json</exclude>
+ <!-- Really a binary format, but must look like text -->
+ <exclude>**/mimetype</exclude>
+ <!-- Effectively a binary format -->
+ <exclude>**/*.url</exclude>
+ <!-- Cannot contain comments; content must match program output. -->
+ <exclude>/src/test/resources/org/apache/taverna/scufl2/api/io/HelloWorld.txt</exclude>
+ <exclude>/src/test/resources/as.txt</exclude>
+ <!-- Expanded data bundle. Generated. -->
+ <exclude>/src/test/resources/full-example/ebi-wfrun-2013-05-31/</exclude>
<!-- Test COMBINE archives. Skeleton only (files empty) -->
<exclude>/src/test/resources/combine/aslanidi_purkinje_model_skeleton.zip</exclude>
@@ -76,18 +76,18 @@
-->
<!-- W3C license -->
- <exclude>**/xml.xsd</exclude>
- <exclude>**/xenc-schema.xsd</exclude>
- <exclude>**/xmldsig-core-schema.xsd</exclude>
+ <exclude>**/xml.xsd</exclude>
+ <exclude>**/xenc-schema.xsd</exclude>
+ <exclude>**/xmldsig-core-schema.xsd</exclude>
<exclude>**/prov-o.rdf</exclude>
<exclude>**/prov-o.ttl</exclude>
<exclude>**/prov-aq.rdf</exclude>
<!-- W3C Community license -->
<!-- FOAF, Creative Commons Attribution 1.0 -->
<exclude>**/oa.rdf</exclude>
- <exclude>**/foaf.rdf</exclude>
+ <exclude>**/foaf.rdf</exclude>
<!-- Research Object Model, Creative Commons Attribution 3.0 -->
- <exclude>**/roterms.ttl</exclude>
+ <exclude>**/roterms.ttl</exclude>
<exclude>**/wf4ever.ttl</exclude>
<exclude>**/wfdesc.ttl</exclude>
<exclude>**/wfprov.ttl</exclude>
@@ -96,67 +96,67 @@
<exclude>**/dcam.owl</exclude>
<exclude>**/dcterms_od.owl</exclude>
- </excludes>
- </configuration>
- </plugin>
-
- <!--
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>1.7</version>
- <executions>
- <execution>
- <id>add-licenses</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>aggregate-add-third-party</goal>
- </goals>
- <configuration>
- <excludedGroups>.*(mygrid|taverna).*</excludedGroups>
- <useMissingFile>true</useMissingFile>
- <missingFile>src/license/THIRD-PARTY.properties</missingFile>
- <licenseMerges>
- <licenseMerge>The Apache Software License, Version 2.0|Apache 2|Apache License|Apache License, Version 2.0|Apache Public License 2.0|Apache License Version 2.0|Apache Software License 2.0|Apache Software License - Version 2.0</licenseMerge>
- <licenseMerge>The BSD License|BSD|BSD License|BSD-style license|BSD style|Aduna BSD license|Aduna BSD-style license</licenseMerge>
- <licenseMerge>MIT License|The MIT License|MIT license</licenseMerge>
- <licenseMerge>GNU Lesser General Public License|GNU LESSER GENERAL PUBLIC LICENSE|GNU Library or Lesser General Public License|LGPL</licenseMerge>
- <licenseMerge>Common Development and Distribution License (CDDL) v1.0|CDDL 1.1|COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</licenseMerge>
- <licenseMerge>Eclipse Public License, Version 1.0|Eclipse Public License</licenseMerge>
- </licenseMerges>
- </configuration>
- </execution>
- </executions>
- </plugin>
- -->
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <!-- replaces maven-jaxb2-plugin -->
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-plugin</artifactId>
- <version>3.2.1</version>
- <configuration>
- <sourceRoot>${basedir}/target/generated-sources/cxf-xjc</sourceRoot>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- <version>${activation.version}</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-language.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-language.git</developerConnection>
- <url>https://github.com/apache/incubator-taverna-language</url>
- <tag>HEAD</tag>
- </scm>
+ </excludes>
+ </configuration>
+ </plugin>
+
+ <!--
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>add-licenses</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>aggregate-add-third-party</goal>
+ </goals>
+ <configuration>
+ <excludedGroups>.*(mygrid|taverna).*</excludedGroups>
+ <useMissingFile>true</useMissingFile>
+ <missingFile>src/license/THIRD-PARTY.properties</missingFile>
+ <licenseMerges>
+ <licenseMerge>The Apache Software License, Version 2.0|Apache 2|Apache License|Apache License, Version 2.0|Apache Public License 2.0|Apache License Version 2.0|Apache Software License 2.0|Apache Software License - Version 2.0</licenseMerge>
+ <licenseMerge>The BSD License|BSD|BSD License|BSD-style license|BSD style|Aduna BSD license|Aduna BSD-style license</licenseMerge>
+ <licenseMerge>MIT License|The MIT License|MIT license</licenseMerge>
+ <licenseMerge>GNU Lesser General Public License|GNU LESSER GENERAL PUBLIC LICENSE|GNU Library or Lesser General Public License|LGPL</licenseMerge>
+ <licenseMerge>Common Development and Distribution License (CDDL) v1.0|CDDL 1.1|COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0</licenseMerge>
+ <licenseMerge>Eclipse Public License, Version 1.0|Eclipse Public License</licenseMerge>
+ </licenseMerges>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- replaces maven-jaxb2-plugin -->
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-plugin</artifactId>
+ <version>3.2.1</version>
+ <configuration>
+ <sourceRoot>${basedir}/target/generated-sources/cxf-xjc</sourceRoot>
+ </configuration>
+ <dependencies>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>${activation.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-language.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-language.git</developerConnection>
+ <url>https://github.com/apache/incubator-taverna-language</url>
+ <tag>HEAD</tag>
+ </scm>
<repositories>
<repository>
@@ -167,81 +167,81 @@
<enabled>false</enabled>
</releases>
</repository>
- </repositories>
+ </repositories>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-jsonSchema</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>com.springsource.org.jdom</artifactId>
- <version>${jdom.version}</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxb.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>${jaxb.version}</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-osgi</artifactId>
- <version>${jaxb.version}</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>${jaxen.version}</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>${commons.beanutils.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.module</groupId>
+ <artifactId>jackson-module-jsonSchema</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>com.springsource.org.jdom</artifactId>
+ <version>${jdom.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <version>${jaxb.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>${jaxen.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>${commons.beanutils.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<!-- Common dependencies on jena-osgi, which requires some
additional dependencies to be a happy OSGi bundle -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-osgi</artifactId>
- <version>${jena.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-osgi</artifactId>
+ <version>${jena.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xerces</artifactId>
@@ -260,7 +260,7 @@ additional dependencies to be a happy OSGi bundle -->
<version>${dexx.collection.version}</version>
</dependency>
- <!-- Needed for Java 9+ -->
+ <!-- Needed for Java 9+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
@@ -283,7 +283,7 @@ additional dependencies to be a happy OSGi bundle -->
<activation>
<activeByDefault>true</activeByDefault>
</activation>
- <modules>
+ <modules>
<module>taverna-baclava-language</module>
<module>taverna-databundle</module>
<module>taverna-robundle</module>
@@ -298,7 +298,7 @@ additional dependencies to be a happy OSGi bundle -->
<module>taverna-scufl2-wfbundle</module>
<module>taverna-tavlang-tool</module>
<module>taverna-scufl2-wfdesc</module>
- </modules>
+ </modules>
</profile>
<profile>
<id>android</id>
@@ -312,7 +312,7 @@ additional dependencies to be a happy OSGi bundle -->
<maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.7</maven.compiler.target>
</properties>
- <modules>
+ <modules>
<module>taverna-baclava-language</module>
<module>taverna-scufl2-annotation</module>
<module>taverna-scufl2-api</module>
@@ -324,7 +324,7 @@ additional dependencies to be a happy OSGi bundle -->
<module>taverna-scufl2-ucfpackage</module>
<module>taverna-scufl2-wfbundle</module>
<module>taverna-tavlang-tool</module>
- </modules>
+ </modules>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/taverna-baclava-language/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-baclava-language/pom.xml b/taverna-baclava-language/pom.xml
index 76a55a8..3fbf35c 100644
--- a/taverna-baclava-language/pom.xml
+++ b/taverna-baclava-language/pom.xml
@@ -20,17 +20,17 @@ under the License.
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
+ </parent>
<artifactId>taverna-baclava-language</artifactId>
<name>Apache Taverna Baclava support</name>
<packaging>bundle</packaging>
<description>Support for reading and writing Baclava files</description>
<build>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/taverna-databundle/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-databundle/pom.xml b/taverna-databundle/pom.xml
index 25f76b9..d0a5683 100644
--- a/taverna-databundle/pom.xml
+++ b/taverna-databundle/pom.xml
@@ -19,9 +19,9 @@
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>taverna-databundle</artifactId>
<name>Apache Taverna Databundle API</name>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/taverna-robundle/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-robundle/pom.xml b/taverna-robundle/pom.xml
index 628f620..25fb517 100644
--- a/taverna-robundle/pom.xml
+++ b/taverna-robundle/pom.xml
@@ -16,83 +16,83 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging>
- <parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-robundle</artifactId>
- <name>Apache Taverna RO Bundle API</name>
- <description>API for dealing with RO Bundles</description>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>${commons.configuration.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-osgi</artifactId>
- <version>${jena.version}</version>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>bundle</packaging>
+ <parent>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>taverna-robundle</artifactId>
+ <name>Apache Taverna RO Bundle API</name>
+ <description>API for dealing with RO Bundles</description>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>${commons.configuration.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-osgi</artifactId>
+ <version>${jena.version}</version>
+ </dependency>
<!-- for UUIDv5 SHA named
- <dependency>
- <groupId>com.fasterxml.uuid</groupId>
- <artifactId>java-uuid-generator</artifactId>
- <version>3.1.3</version>
- <type>bundle</type>
- </dependency>
+ <dependency>
+ <groupId>com.fasterxml.uuid</groupId>
+ <artifactId>java-uuid-generator</artifactId>
+ <version>3.1.3</version>
+ <type>bundle</type>
+ </dependency>
-->
- </dependencies>
+ </dependencies>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <xsdOptions>
- <xsdOption>
- <xsdDir>${project.basedir}/src/main/xsd</xsdDir>
- <bindingFile>${project.basedir}/src/main/xsd/binding.xjb</bindingFile>
- </xsdOption>
- </xsdOptions>
- </configuration>
- </plugin>
- </plugins>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>xsdtojava</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <xsdOptions>
+ <xsdOption>
+ <xsdDir>${project.basedir}/src/main/xsd</xsdDir>
+ <bindingFile>${project.basedir}/src/main/xsd/binding.xjb</bindingFile>
+ </xsdOption>
+ </xsdOptions>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/taverna-scufl2-annotation/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-annotation/pom.xml b/taverna-scufl2-annotation/pom.xml
index b5d7ea2..d5afb76 100644
--- a/taverna-scufl2-annotation/pom.xml
+++ b/taverna-scufl2-annotation/pom.xml
@@ -16,40 +16,40 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-scufl2-annotation</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Taverna Scufl 2 annotations</name>
- <description>Convenience methods for working with SCUFL2 annotations</description>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>taverna-scufl2-annotation</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Taverna Scufl 2 annotations</name>
+ <description>Convenience methods for working with SCUFL2 annotations</description>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-t2flow</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-osgi</artifactId>
- <version>${jena.version}</version>
- </dependency>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-t2flow</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-osgi</artifactId>
+ <version>${jena.version}</version>
+ </dependency>
- </dependencies>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/taverna-scufl2-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-api/pom.xml b/taverna-scufl2-api/pom.xml
index 31f5c73..7c648b8 100644
--- a/taverna-scufl2-api/pom.xml
+++ b/taverna-scufl2-api/pom.xml
@@ -65,17 +65,17 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/taverna-scufl2-examples/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-examples/pom.xml b/taverna-scufl2-examples/pom.xml
index f69d73b..70389af 100644
--- a/taverna-scufl2-examples/pom.xml
+++ b/taverna-scufl2-examples/pom.xml
@@ -16,97 +16,97 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-scufl2-examples</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Taverna Scufl 2 examples</name>
- <dependencies>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-scufl2-t2flow</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-scufl2-wfbundle</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>taverna-scufl2-examples</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Taverna Scufl 2 examples</name>
+ <dependencies>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-scufl2-t2flow</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-scufl2-wfbundle</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
- <!-- For writing out JSON-LD annotations -->
+ <!-- For writing out JSON-LD annotations -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
- <version>${jena.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>${jena.version}</version>
+ </dependency>
- <!-- Following only needed by src/test/java -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <!-- Following only needed by src/test/java -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <version>1.10</version>
- <executions>
- <execution>
- <id>assemble</id>
- <phase>package</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <repositoryLayout>flat</repositoryLayout>
- <repositoryName>lib</repositoryName>
- <assembleDirectory>${project.build.directory}/${project.artifactId}</assembleDirectory>
- <programs>
- <program>
- <mainClass>org.apache.taverna.examples.ConvertT2flowToWorkflowBundle</mainClass>
- <name>t2flowtowfbundle</name>
- </program>
- <program>
- <mainClass>org.apache.taverna.examples.ProcessorNames</mainClass>
- <name>processornames</name>
- </program>
- <program>
- <mainClass>org.apache.taverna.examples.ServiceTypes</mainClass>
- <name>servicetypes</name>
- </program>
- <program>
- <mainClass>org.apache.taverna.examples.WorkflowMaker</mainClass>
- <name>workflowmaker</name>
- </program>
- <program>
- <mainClass>org.apache.taverna.examples.JsonExport</mainClass>
- <name>jsonexport</name>
- </program>
- </programs>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>appassembler-maven-plugin</artifactId>
+ <version>1.10</version>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>package</phase>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <repositoryLayout>flat</repositoryLayout>
+ <repositoryName>lib</repositoryName>
+ <assembleDirectory>${project.build.directory}/${project.artifactId}</assembleDirectory>
+ <programs>
+ <program>
+ <mainClass>org.apache.taverna.examples.ConvertT2flowToWorkflowBundle</mainClass>
+ <name>t2flowtowfbundle</name>
+ </program>
+ <program>
+ <mainClass>org.apache.taverna.examples.ProcessorNames</mainClass>
+ <name>processornames</name>
+ </program>
+ <program>
+ <mainClass>org.apache.taverna.examples.ServiceTypes</mainClass>
+ <name>servicetypes</name>
+ </program>
+ <program>
+ <mainClass>org.apache.taverna.examples.WorkflowMaker</mainClass>
+ <name>workflowmaker</name>
+ </program>
+ <program>
+ <mainClass>org.apache.taverna.examples.JsonExport</mainClass>
+ <name>jsonexport</name>
+ </program>
+ </programs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/taverna-scufl2-integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-integration-tests/pom.xml b/taverna-scufl2-integration-tests/pom.xml
index 5fcff46..125ef08 100644
--- a/taverna-scufl2-integration-tests/pom.xml
+++ b/taverna-scufl2-integration-tests/pom.xml
@@ -16,58 +16,58 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-scufl2-integration-tests</artifactId>
- <name>Apache Taverna Scufl 2 integration tests</name>
- <packaging>bundle</packaging>
- <description>Integration tests depending on multiple modules</description>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.12.4</version>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>taverna-scufl2-integration-tests</artifactId>
+ <name>Apache Taverna Scufl 2 integration tests</name>
+ <packaging>bundle</packaging>
+ <description>Integration tests depending on multiple modules</description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>2.12.4</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-wfbundle</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-t2flow</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-scufl</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-wfbundle</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-t2flow</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-scufl</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/taverna-scufl2-schemas/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-schemas/pom.xml b/taverna-scufl2-schemas/pom.xml
index 9026fec..8c7f9f0 100644
--- a/taverna-scufl2-schemas/pom.xml
+++ b/taverna-scufl2-schemas/pom.xml
@@ -16,18 +16,18 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-scufl2-schemas</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Taverna Scufl 2 Schemas</name>
- <description>Schemas for SCUFL2</description>
- <build>
- <plugins>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>taverna-scufl2-schemas</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Taverna Scufl 2 Schemas</name>
+ <description>Schemas for SCUFL2</description>
+ <build>
+ <plugins>
<plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-plugin</artifactId>
@@ -47,5 +47,5 @@
</configuration>
</plugin>
</plugins>
- </build>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/taverna-scufl2-scufl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/pom.xml b/taverna-scufl2-scufl/pom.xml
index 3a976e1..1db51a5 100644
--- a/taverna-scufl2-scufl/pom.xml
+++ b/taverna-scufl2-scufl/pom.xml
@@ -27,7 +27,7 @@
<name>Apache Taverna Scufl 2 SCUFL parser</name>
<description>Parse Taverna 1.x workflows (Status: Experimental)</description>
<build>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -61,32 +61,32 @@
</plugin>
</plugins>
- </build>
+ </build>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
<version>${jdom.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
<version>${jaxen.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/taverna-scufl2-t2flow/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/pom.xml b/taverna-scufl2-t2flow/pom.xml
index 3f005c5..f068555 100644
--- a/taverna-scufl2-t2flow/pom.xml
+++ b/taverna-scufl2-t2flow/pom.xml
@@ -16,18 +16,18 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-scufl2-t2flow</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Taverna Scufl 2 t2flow parser</name>
- <description>Parser for .t2flow file format (Taverna 2.x)</description>
- <build>
- <plugins>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>taverna-scufl2-t2flow</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Taverna Scufl 2 t2flow parser</name>
+ <description>Parser for .t2flow file format (Taverna 2.x)</description>
+ <build>
+ <plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -40,116 +40,116 @@
-->
</plugin>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-xjc-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>xsdtojava</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <xsdOptions>
- <xsdOption>
- <xsdDir>${project.basedir}/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/</xsdDir>
- <packagename>org.apache.taverna.scufl2.xml.t2flow.jaxb</packagename>
- </xsdOption>
- </xsdOptions>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>xsdtojava</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <xsdOptions>
+ <xsdOption>
+ <xsdDir>${project.basedir}/src/main/resources/org/apache/taverna/scufl2/translator/t2flow/xsd/</xsdDir>
+ <packagename>org.apache.taverna.scufl2.xml.t2flow.jaxb</packagename>
+ </xsdOption>
+ </xsdOptions>
+ </configuration>
+ </plugin>
- <plugin>
- <!-- So that Eclipse m2e (with the buildhelper m2e connector) can find
- the generated sources -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.8</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources/jaxb/</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <!-- So that Eclipse m2e (with the buildhelper m2e connector) can find
+ the generated sources -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-sources/jaxb/</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings
- only. It has no influence on the Maven build itself. -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>
- org.codehaus.mojo
- </groupId>
- <artifactId>
- build-helper-maven-plugin
- </artifactId>
- <versionRange>
- [1.8,)
- </versionRange>
- <goals>
- <goal>add-source</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-wfbundle</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings
+ only. It has no influence on the Maven build itself. -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>
+ org.codehaus.mojo
+ </groupId>
+ <artifactId>
+ build-helper-maven-plugin
+ </artifactId>
+ <versionRange>
+ [1.8,)
+ </versionRange>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-wfbundle</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>com.springsource.org.jdom</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>com.springsource.org.jdom</artifactId>
<version>${jdom.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
<version>${jaxen.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/taverna-scufl2-ucfpackage/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-ucfpackage/pom.xml b/taverna-scufl2-ucfpackage/pom.xml
index 8c426d4..abff957 100644
--- a/taverna-scufl2-ucfpackage/pom.xml
+++ b/taverna-scufl2-ucfpackage/pom.xml
@@ -16,52 +16,52 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-scufl2-ucfpackage</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Taverna Scufl 2 UCF Package</name>
- <description>Adobe UCF compatible Package API, making a structured ZIP file with manifest</description>
- <dependencies>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>taverna-scufl2-ucfpackage</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Taverna Scufl 2 UCF Package</name>
+ <description>Adobe UCF compatible Package API, making a structured ZIP file with manifest</description>
+ <dependencies>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
<version>${jdom.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
<version>${jaxen.version}</version>
- <scope>test</scope>
- </dependency>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-robundle</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- </dependencies>
- <licenses>
- <license>
- <name>Apache 2</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <comments>The package org.apache.taverna.scufl2.ucfpackage.impl.odfdom
- contains a patched subset of ODFDOM 0.8.6 -
- http://odftoolkit.org/projects/odfdom/pages/Home
- Copyright 2008, 2010 Oracle and/or its affiliates.
- All rights reserved. Copyright 2009 IBM. All rights reserved.</comments>
- </license>
- </licenses>
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-robundle</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+ </dependencies>
+ <licenses>
+ <license>
+ <name>Apache 2</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <comments>The package org.apache.taverna.scufl2.ucfpackage.impl.odfdom
+ contains a patched subset of ODFDOM 0.8.6 -
+ http://odftoolkit.org/projects/odfdom/pages/Home
+ Copyright 2008, 2010 Oracle and/or its affiliates.
+ All rights reserved. Copyright 2009 IBM. All rights reserved.</comments>
+ </license>
+ </licenses>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/taverna-scufl2-wfbundle/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfbundle/pom.xml b/taverna-scufl2-wfbundle/pom.xml
index e6fe2ff..547b95c 100644
--- a/taverna-scufl2-wfbundle/pom.xml
+++ b/taverna-scufl2-wfbundle/pom.xml
@@ -16,69 +16,69 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-scufl2-wfbundle</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Taverna Scufl 2 wfbundle read/write</name>
- <description>Read/write support for wfbundle with RDF/XML-compatible XML files</description>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>taverna-scufl2-wfbundle</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Taverna Scufl 2 wfbundle read/write</name>
+ <description>Read/write support for wfbundle with RDF/XML-compatible XML files</description>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-schemas</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-ucfpackage</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-schemas</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-ucfpackage</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
<version>${jdom.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-repository-sail</artifactId>
- <version>${sesame.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.openrdf.sesame</groupId>
- <artifactId>sesame-sail-memory</artifactId>
- <version>${sesame.version}</version>
- <scope>test</scope>
- </dependency>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-repository-sail</artifactId>
+ <version>${sesame.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-sail-memory</artifactId>
+ <version>${sesame.version}</version>
+ <scope>test</scope>
+ </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
<version>${jaxen.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/taverna-scufl2-wfdesc/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/pom.xml b/taverna-scufl2-wfdesc/pom.xml
index ddf7e91..fc84034 100755
--- a/taverna-scufl2-wfdesc/pom.xml
+++ b/taverna-scufl2-wfdesc/pom.xml
@@ -1,168 +1,168 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- You under the Apache License, Version 2.0 (the "License"); you may not use
- this file except in compliance with the License. You may obtain a copy of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
- by applicable law or agreed to in writing, software distributed under the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
- OF ANY KIND, either express or implied. See the License for the specific
- language governing permissions and limitations under the License. -->
+ license agreements. See the NOTICE file distributed with this work for additional
+ information regarding copyright ownership. The ASF licenses this file to
+ You under the Apache License, Version 2.0 (the "License"); you may not use
+ this file except in compliance with the License. You may obtain a copy of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
+ by applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
+ language governing permissions and limitations under the License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-scufl2-wfdesc</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Taverna Scufl 2 wfdesc export</name>
- <description>Convert Scufl2 workflow to wfdesc structure (from Wf4Ever RO ontology)</description>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-maven-tools</artifactId>
- <version>${jena.version}</version>
- <configuration>
- <includes>
- <include>src/main/resources/org/purl/wf4ever/wfdesc/*.ttl</include>
- <include>src/main/resources/org/purl/wf4ever/wfdesc/*.ttl</include>
- <include>src/main/resources/com/xmlns/foaf/foaf.rdf</include>
- <include>src/main/resources/org/w3/prov-o.ttl</include>
- </includes>
- <fileOptions>
- <source>
- <input>default</input>
- <package-name>org.apache.taverna.scufl2.wfdesc.ontologies</package-name>
- <ontology>true</ontology>
- <output>${project.build.directory}/generated-sources/jena</output>
- </source>
- </fileOptions>
- </configuration>
- <executions>
- <execution>
- <id>schemagen</id>
- <goals>
- <goal>translate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>taverna-scufl2-wfdesc</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Taverna Scufl 2 wfdesc export</name>
+ <description>Convert Scufl2 workflow to wfdesc structure (from Wf4Ever RO ontology)</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-maven-tools</artifactId>
+ <version>${jena.version}</version>
+ <configuration>
+ <includes>
+ <include>src/main/resources/org/purl/wf4ever/wfdesc/*.ttl</include>
+ <include>src/main/resources/org/purl/wf4ever/wfdesc/*.ttl</include>
+ <include>src/main/resources/com/xmlns/foaf/foaf.rdf</include>
+ <include>src/main/resources/org/w3/prov-o.ttl</include>
+ </includes>
+ <fileOptions>
+ <source>
+ <input>default</input>
+ <package-name>org.apache.taverna.scufl2.wfdesc.ontologies</package-name>
+ <ontology>true</ontology>
+ <output>${project.build.directory}/generated-sources/jena</output>
+ </source>
+ </fileOptions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>schemagen</id>
+ <goals>
+ <goal>translate</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.10</version>
- <executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/generated-sources/jena</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <!--This plugin's configuration is used to store Eclipse m2e settings
- only. It has no influence on the Maven build itself. -->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-maven-tools</artifactId>
- <versionRange>[${jena.version},)</versionRange>
- <goals>
- <goal>translate</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <!-- Make target/generated-source/jena -->
- <execute />
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- <dependencies>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.10</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-sources/jena</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <!--This plugin's configuration is used to store Eclipse m2e settings
+ only. It has no influence on the Maven build itself. -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-maven-tools</artifactId>
+ <versionRange>[${jena.version},)</versionRange>
+ <goals>
+ <goal>translate</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <!-- Make target/generated-source/jena -->
+ <execute />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-t2flow</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-t2flow</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-scufl</artifactId>
- <version>${project.version}</version>
- </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-scufl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-osgi</artifactId>
- <version>${jena.version}</version>
- </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-osgi</artifactId>
+ <version>${jena.version}</version>
+ </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-client</artifactId>
- <version>${jersey.client.version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>${jersey.client.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/f3520944/taverna-tavlang-tool/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-tavlang-tool/pom.xml b/taverna-tavlang-tool/pom.xml
index 2ee2135..654d0b4 100644
--- a/taverna-tavlang-tool/pom.xml
+++ b/taverna-tavlang-tool/pom.xml
@@ -18,9 +18,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>taverna-tavlang-tool</artifactId>
<name>Apache Taverna tavlang tool</name>
@@ -29,186 +29,186 @@
<dependencies>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>taverna-scufl2-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-wfbundle</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-t2flow</artifactId>
- <version>${project.version}</version>
- </dependency>
-
-<!-- <dependency> -->
-<!-- <groupId>org.shiwa.iwir</groupId> -->
-<!-- <artifactId>iwir</artifactId> -->
-<!-- <version>1.1.4</version> -->
-<!-- <scope>optional</scope> -->
-<!-- <systemPath>${project.build.directory}/taverna-language-commandline/lib/</systemPath> -->
-<!-- </dependency> -->
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-wfbundle</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-t2flow</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+<!-- <dependency> -->
+<!-- <groupId>org.shiwa.iwir</groupId> -->
+<!-- <artifactId>iwir</artifactId> -->
+<!-- <version>1.1.4</version> -->
+<!-- <scope>optional</scope> -->
+<!-- <systemPath>${project.build.directory}/taverna-language-commandline/lib/</systemPath> -->
+<!-- </dependency> -->
<!-- Disabled due to LGPL depenency
- <dependency>
- <groupId>no.s11.scufl2</groupId>
- <artifactId>scufl2-iwir</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <dependency>
+ <groupId>no.s11.scufl2</groupId>
+ <artifactId>scufl2-iwir</artifactId>
+ <version>0.2-SNAPSHOT</version>
<optional>true</optional>
</dependency>
-->
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.4.8</version>
- </dependency>
-
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-wfdesc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-ucfpackage</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-robundle</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>io.airlift</groupId>
- <artifactId>airline</artifactId>
- <!-- <version>${io.airlift.airline.version}</version> -->
- <version>0.7</version>
- </dependency>
-
-
- </dependencies>
-
- <build>
- <!-- TODO: plugins for launchers and executable jar files? -->
- <plugins>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>appassembler-maven-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <id>assemble</id>
- <phase>package</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <repositoryLayout>flat</repositoryLayout>
- <repositoryName>lib</repositoryName>
- <assembleDirectory>${project.build.directory}/${project.artifactId}</assembleDirectory>
- <programs>
- <program>
- <mainClass>org.apache.taverna.tavlang.TavernaCommandline</mainClass>
- <name>tavlang</name>
- </program>
- </programs>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
- <mainClass>org.apache.taverna.tavlang.TavernaCommandline</mainClass>
- </transformer>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
- <addHeader>false</addHeader>
- </transformer>
- </transformers>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
-
- </plugins>
- </build>
-
- <repositories>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.4.8</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-wfdesc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-ucfpackage</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-robundle</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>io.airlift</groupId>
+ <artifactId>airline</artifactId>
+ <!-- <version>${io.airlift.airline.version}</version> -->
+ <version>0.7</version>
+ </dependency>
+
+
+ </dependencies>
+
+ <build>
+ <!-- TODO: plugins for launchers and executable jar files? -->
+ <plugins>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>appassembler-maven-plugin</artifactId>
+ <version>1.1.1</version>
+ <executions>
+ <execution>
+ <id>assemble</id>
+ <phase>package</phase>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <repositoryLayout>flat</repositoryLayout>
+ <repositoryName>lib</repositoryName>
+ <assembleDirectory>${project.build.directory}/${project.artifactId}</assembleDirectory>
+ <programs>
+ <program>
+ <mainClass>org.apache.taverna.tavlang.TavernaCommandline</mainClass>
+ <name>tavlang</name>
+ </program>
+ </programs>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+ <mainClass>org.apache.taverna.tavlang.TavernaCommandline</mainClass>
+ </transformer>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+ <addHeader>false</addHeader>
+ </transformer>
+ </transformers>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ </plugins>
+ </build>
+
+ <repositories>
<!-- Enable the below if using scufl2-iwir
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>mygrid-repository</id>
- <name>myGrid Repository</name>
- <url>http://www.mygrid.org.uk/maven/repository</url>
- </repository>
-
- <repository>
- <id>mygrid-snapshot-repository</id>
- <name>myGrid Snapshot Repository</name>
- <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- </repository>
+ <repository>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots />
+ <id>mygrid-repository</id>
+ <name>myGrid Repository</name>
+ <url>http://www.mygrid.org.uk/maven/repository</url>
+ </repository>
+
+ <repository>
+ <id>mygrid-snapshot-repository</id>
+ <name>myGrid Snapshot Repository</name>
+ <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots />
+ </repository>
-->
- <repository>
- <id>apache.snapshots</id>
- <name>Apache Snapshot Repository</name>
- <url>http://repository.apache.org/snapshots</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://repository.apache.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
</project>
[3/5] incubator-taverna-language git commit: Avoid some System.out
Posted by st...@apache.org.
Avoid some System.out
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/4ffc37c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/4ffc37c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/4ffc37c0
Branch: refs/heads/master
Commit: 4ffc37c0cacbb9108fbc5bee714019507ea10b56
Parents: b761bfd
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri May 11 14:30:36 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri May 11 14:30:36 2018 +0100
----------------------------------------------------------------------
.../apache/taverna/robundle/manifest/TestRDFToManifest.java | 2 +-
.../taverna/robundle/manifest/combine/TestCombineManifest.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/4ffc37c0/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java
index a5d6835..bd70333 100644
--- a/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java
+++ b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/TestRDFToManifest.java
@@ -103,7 +103,7 @@ public class TestRDFToManifest {
Set<URI> aggregatedUris = manifest.getAggregates().stream()
.map(PathMetadata::getUri)
.collect(Collectors.toSet());
- System.out.println(aggregatedUris);
+ //System.out.println(aggregatedUris);
// Compare as Set as order is not necessarily preserved
assertTrue(aggregatedUris.contains(URI.create("/folder/soup.jpeg")));
assertTrue(aggregatedUris.contains(URI.create("http://example.com/blog/")));
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/4ffc37c0/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/combine/TestCombineManifest.java
----------------------------------------------------------------------
diff --git a/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/combine/TestCombineManifest.java b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/combine/TestCombineManifest.java
index 4ac0dfa..f56c88c 100644
--- a/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/combine/TestCombineManifest.java
+++ b/taverna-robundle/src/test/java/org/apache/taverna/robundle/manifest/combine/TestCombineManifest.java
@@ -48,7 +48,7 @@ public class TestCombineManifest {
"/combine/aslanidi_purkinje_model_skeleton.zip")) {
Files.copy(src, file, StandardCopyOption.REPLACE_EXISTING);
}
- System.out.println(file);
+ //System.out.println(file);
try (Bundle bundle = Bundles.openBundle(file)) {
Manifest manifest = bundle.getManifest();
Path manifestXml = bundle.getRoot().resolve("manifest.xml");
@@ -163,7 +163,7 @@ public class TestCombineManifest {
"/combine/jwsonline-broken-date.sedx")) {
Files.copy(src, file, StandardCopyOption.REPLACE_EXISTING);
}
- System.out.println(file);
+ //System.out.println(file);
try (Bundle bundle = Bundles.openBundle(file)) {
Manifest manifest = bundle.getManifest();
@@ -209,7 +209,7 @@ public class TestCombineManifest {
"/combine/jwsonline-fixed-date.sedx")) {
Files.copy(src, file, StandardCopyOption.REPLACE_EXISTING);
}
- System.out.println(file);
+ //System.out.println(file);
try (Bundle bundle = Bundles.openBundle(file)) {
Manifest manifest = bundle.getManifest();
Path manifestXml = bundle.getRoot().resolve("manifest.xml");
[4/5] incubator-taverna-language git commit: Use Jena 3.7.0 (except
for jena-maven-tools)
Posted by st...@apache.org.
Use Jena 3.7.0 (except for jena-maven-tools)
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/4c0dd0e5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/4c0dd0e5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/4c0dd0e5
Branch: refs/heads/master
Commit: 4c0dd0e546956e6362491d91096139739d912e4a
Parents: 4ffc37c
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri May 11 14:30:56 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri May 11 14:31:27 2018 +0100
----------------------------------------------------------------------
pom.xml | 25 ++++++++++++++++++-------
taverna-scufl2-wfdesc/pom.xml | 1 -
2 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/4c0dd0e5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 63762a9..44dc74f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,13 @@
<version>${activation.version}</version>
</dependency>
</dependencies>
- </plugin>
+ </plugin>
+ <plugin>
+ <!-- JENA-1474: jena-maven-tools was not included in 3.7.0; we'll downgrade -->
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-maven-tools</artifactId>
+ <version>3.6.0</version>
+ </plugin>
</plugins>
</pluginManagement>
</build>
@@ -168,6 +174,16 @@
</releases>
</repository>
</repositories>
+
+ <!-- TODO: Remove from below when these versions have
+ been updated in taverna-parent 4 -->
+ <properties>
+ <!-- Fixes TAVERNA-1027 / JENA-1462 -->
+ <jena.version>3.7.0</jena.version>
+ <!-- Java 9 compatible jaxb -->
+ <jaxb.version>2.3.0</jaxb.version>
+ </properties>
+
<dependencyManagement>
<dependencies>
@@ -242,17 +258,12 @@ additional dependencies to be a happy OSGi bundle -->
<artifactId>jena-osgi</artifactId>
<version>${jena.version}</version>
</dependency>
+ <!-- TODO: Remove for Jena 3.8.x which has inbuilt xerces -->
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xerces</artifactId>
<version>${servicemix.xerces.version}</version>
</dependency>
- <!-- JENA-1178 workaround: Upgrade jsonlld-java -->
- <dependency>
- <groupId>com.github.jsonld-java</groupId>
- <artifactId>jsonld-java</artifactId>
- <version>${jsonldjava.version}</version>
- </dependency>
<!-- Needed by Jena -->
<dependency>
<groupId>com.github.andrewoma.dexx</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/4c0dd0e5/taverna-scufl2-wfdesc/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfdesc/pom.xml b/taverna-scufl2-wfdesc/pom.xml
index fc84034..b0becfc 100755
--- a/taverna-scufl2-wfdesc/pom.xml
+++ b/taverna-scufl2-wfdesc/pom.xml
@@ -25,7 +25,6 @@
<plugin>
<groupId>org.apache.jena</groupId>
<artifactId>jena-maven-tools</artifactId>
- <version>${jena.version}</version>
<configuration>
<includes>
<include>src/main/resources/org/purl/wf4ever/wfdesc/*.ttl</include>
[2/5] incubator-taverna-language git commit: Formatting: somewhat
harmonized pom.xml indenting
Posted by st...@apache.org.
Formatting: somewhat harmonized pom.xml indenting
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/b761bfd6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/b761bfd6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/b761bfd6
Branch: refs/heads/master
Commit: b761bfd6ed82acbe444830c0a0df445bce5599d4
Parents: f352094
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri May 11 13:53:36 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri May 11 13:53:36 2018 +0100
----------------------------------------------------------------------
pom.xml | 97 +++++++++++++--------------
taverna-databundle/pom.xml | 115 ++++++++++++++++-----------------
taverna-robundle/pom.xml | 3 +-
taverna-scufl2-annotation/pom.xml | 2 -
taverna-scufl2-api/pom.xml | 114 ++++++++++++++++----------------
taverna-scufl2-scufl/pom.xml | 39 ++++++-----
taverna-scufl2-t2flow/pom.xml | 28 ++++----
taverna-scufl2-wfbundle/pom.xml | 11 ++--
taverna-tavlang-tool/pom.xml | 24 +++----
9 files changed, 213 insertions(+), 220 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b761bfd6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a8b27ad..63762a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -233,15 +233,15 @@
</dependency>
</dependencies>
</dependencyManagement>
-<dependencies>
+ <dependencies>
<!-- Common dependencies on jena-osgi, which requires some
additional dependencies to be a happy OSGi bundle -->
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-osgi</artifactId>
- <version>${jena.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-osgi</artifactId>
+ <version>${jena.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.xerces</artifactId>
@@ -276,55 +276,56 @@ additional dependencies to be a happy OSGi bundle -->
<artifactId>activation</artifactId>
<version>${activation.version}</version>
</dependency>
-</dependencies>
-<profiles>
-<profile>
-<id>all</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>taverna-baclava-language</module>
- <module>taverna-databundle</module>
- <module>taverna-robundle</module>
- <module>taverna-scufl2-annotation</module>
- <module>taverna-scufl2-api</module>
- <module>taverna-scufl2-examples</module>
- <module>taverna-scufl2-integration-tests</module>
- <module>taverna-scufl2-schemas</module>
- <module>taverna-scufl2-scufl</module>
- <module>taverna-scufl2-t2flow</module>
- <module>taverna-scufl2-ucfpackage</module>
- <module>taverna-scufl2-wfbundle</module>
- <module>taverna-tavlang-tool</module>
- <module>taverna-scufl2-wfdesc</module>
- </modules>
-</profile>
+ </dependencies>
+ <profiles>
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>taverna-baclava-language</module>
+ <module>taverna-databundle</module>
+ <module>taverna-robundle</module>
+ <module>taverna-scufl2-annotation</module>
+ <module>taverna-scufl2-api</module>
+ <module>taverna-scufl2-examples</module>
+ <module>taverna-scufl2-integration-tests</module>
+ <module>taverna-scufl2-schemas</module>
+ <module>taverna-scufl2-scufl</module>
+ <module>taverna-scufl2-t2flow</module>
+ <module>taverna-scufl2-ucfpackage</module>
+ <module>taverna-scufl2-wfbundle</module>
+ <module>taverna-tavlang-tool</module>
+ <module>taverna-scufl2-wfdesc</module>
+ </modules>
+ </profile>
<profile>
<id>android</id>
- <!-- <activation>
+ <!--<activation>
<property>
<name>environment</name>
<value>android</value>
</property>
- </activation>-->
+ </activation>
+ -->
<properties>
-<maven.compiler.source>1.7</maven.compiler.source>
-<maven.compiler.target>1.7</maven.compiler.target>
-</properties>
- <modules>
- <module>taverna-baclava-language</module>
- <module>taverna-scufl2-annotation</module>
- <module>taverna-scufl2-api</module>
- <module>taverna-scufl2-examples</module>
- <module>taverna-scufl2-integration-tests</module>
- <module>taverna-scufl2-schemas</module>
- <module>taverna-scufl2-scufl</module>
- <module>taverna-scufl2-t2flow</module>
- <module>taverna-scufl2-ucfpackage</module>
- <module>taverna-scufl2-wfbundle</module>
- <module>taverna-tavlang-tool</module>
- </modules>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+ <modules>
+ <module>taverna-baclava-language</module>
+ <module>taverna-scufl2-annotation</module>
+ <module>taverna-scufl2-api</module>
+ <module>taverna-scufl2-examples</module>
+ <module>taverna-scufl2-integration-tests</module>
+ <module>taverna-scufl2-schemas</module>
+ <module>taverna-scufl2-scufl</module>
+ <module>taverna-scufl2-t2flow</module>
+ <module>taverna-scufl2-ucfpackage</module>
+ <module>taverna-scufl2-wfbundle</module>
+ <module>taverna-tavlang-tool</module>
+ </modules>
</profile>
</profiles>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b761bfd6/taverna-databundle/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-databundle/pom.xml b/taverna-databundle/pom.xml
index d0a5683..2ce8358 100644
--- a/taverna-databundle/pom.xml
+++ b/taverna-databundle/pom.xml
@@ -16,64 +16,59 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <packaging>bundle</packaging>
- <parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-databundle</artifactId>
- <name>Apache Taverna Databundle API</name>
- <description>API for dealing with Data Bundles</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.jena</groupId>
- <artifactId>jena-osgi</artifactId>
- <version>${jena.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-wfbundle</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-t2flow</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-wfdesc</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-robundle</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- <scope>test</scope>
- </dependency>
-
-
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>${commons.configuration.version}</version>
- </dependency>
- </dependencies>
-
-
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>bundle</packaging>
+ <parent>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>taverna-databundle</artifactId>
+ <name>Apache Taverna Databundle API</name>
+ <description>API for dealing with Data Bundles</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-osgi</artifactId>
+ <version>${jena.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-wfbundle</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-t2flow</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-wfdesc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-robundle</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>${commons.configuration.version}</version>
+ </dependency>
+ </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b761bfd6/taverna-robundle/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-robundle/pom.xml b/taverna-robundle/pom.xml
index 25fb517..196cccc 100644
--- a/taverna-robundle/pom.xml
+++ b/taverna-robundle/pom.xml
@@ -60,7 +60,6 @@
<artifactId>jena-osgi</artifactId>
<version>${jena.version}</version>
</dependency>
-
<!-- for UUIDv5 SHA named
<dependency>
<groupId>com.fasterxml.uuid</groupId>
@@ -92,7 +91,7 @@
</xsdOptions>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b761bfd6/taverna-scufl2-annotation/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-annotation/pom.xml b/taverna-scufl2-annotation/pom.xml
index d5afb76..4fc60c0 100644
--- a/taverna-scufl2-annotation/pom.xml
+++ b/taverna-scufl2-annotation/pom.xml
@@ -49,7 +49,5 @@
<artifactId>jena-osgi</artifactId>
<version>${jena.version}</version>
</dependency>
-
-
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b761bfd6/taverna-scufl2-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-api/pom.xml b/taverna-scufl2-api/pom.xml
index 7c648b8..86de020 100644
--- a/taverna-scufl2-api/pom.xml
+++ b/taverna-scufl2-api/pom.xml
@@ -7,7 +7,7 @@
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- http://www.apache.org/licenses/LICENSE-2.0
+ http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,66 +16,66 @@
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taverna.language</groupId>
- <artifactId>apache-taverna-language</artifactId>
- <version>0.16.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-scufl2-api</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Taverna Scufl 2 API</name>
- <description>Taverna workflow language API</description>
- <dependencies>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>taverna-scufl2-ucfpackage</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <!-- Expose test-jar, e.g. for taverna-scufl2-wfbundle -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>apache-taverna-language</artifactId>
+ <version>0.16.0-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache Taverna Scufl 2 API</name>
+ <description>Taverna workflow language API</description>
+ <dependencies>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>taverna-scufl2-ucfpackage</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <!-- Expose test-jar, e.g. for taverna-scufl2-wfbundle -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
- </plugins>
- </build>
+ </plugins>
+ </build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b761bfd6/taverna-scufl2-scufl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-scufl/pom.xml b/taverna-scufl2-scufl/pom.xml
index 1db51a5..baf3eee 100644
--- a/taverna-scufl2-scufl/pom.xml
+++ b/taverna-scufl2-scufl/pom.xml
@@ -28,19 +28,19 @@
<description>Parse Taverna 1.x workflows (Status: Experimental)</description>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <!--
- <configuration>
- <instructions>
- <Export-Package>org.apache.taverna.scufl2.api.io;provide:=true</Export-Package>
- </instructions>
- </configuration>
- -->
- </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <!--
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.taverna.scufl2.api.io;provide:=true</Export-Package>
+ </instructions>
+ </configuration>
+ -->
+ </plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-plugin</artifactId>
<executions>
@@ -58,9 +58,8 @@
</xsdOption>
</xsdOptions>
</configuration>
- </plugin>
-
- </plugins>
+ </plugin>
+ </plugins>
</build>
<dependencies>
@@ -72,20 +71,20 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
+ <version>${commons.io.version}</version>
<type>jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>com.springsource.org.jdom</artifactId>
- <version>${jdom.version}</version>
+ <groupId>org.jdom</groupId>
+ <artifactId>com.springsource.org.jdom</artifactId>
+ <version>${jdom.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
- <version>${jaxen.version}</version>
+ <version>${jaxen.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b761bfd6/taverna-scufl2-t2flow/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-t2flow/pom.xml b/taverna-scufl2-t2flow/pom.xml
index f068555..38f5098 100644
--- a/taverna-scufl2-t2flow/pom.xml
+++ b/taverna-scufl2-t2flow/pom.xml
@@ -28,19 +28,19 @@
<description>Parser for .t2flow file format (Taverna 2.x)</description>
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <!--
- <configuration>
- <instructions>
- <Export-Package>org.apache.taverna.scufl2.api.io;provide:=true</Export-Package>
- </instructions>
- </configuration>
- -->
- </plugin>
-
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <!--
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.taverna.scufl2.api.io;provide:=true</Export-Package>
+ </instructions>
+ </configuration>
+ -->
+ </plugin>
+
+ <plugin>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-xjc-plugin</artifactId>
<executions>
@@ -58,9 +58,9 @@
</xsdOption>
</xsdOptions>
</configuration>
- </plugin>
+ </plugin>
- <plugin>
+ <plugin>
<!-- So that Eclipse m2e (with the buildhelper m2e connector) can find
the generated sources -->
<groupId>org.codehaus.mojo</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b761bfd6/taverna-scufl2-wfbundle/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-wfbundle/pom.xml b/taverna-scufl2-wfbundle/pom.xml
index 547b95c..52f7079 100644
--- a/taverna-scufl2-wfbundle/pom.xml
+++ b/taverna-scufl2-wfbundle/pom.xml
@@ -52,13 +52,13 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
+ <version>${commons.io.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>com.springsource.org.jdom</artifactId>
- <version>${jdom.version}</version>
+ <groupId>org.jdom</groupId>
+ <artifactId>com.springsource.org.jdom</artifactId>
+ <version>${jdom.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -73,11 +73,10 @@
<version>${sesame.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
- <version>${jaxen.version}</version>
+ <version>${jaxen.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/b761bfd6/taverna-tavlang-tool/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-tavlang-tool/pom.xml b/taverna-tavlang-tool/pom.xml
index 654d0b4..6eb3683 100644
--- a/taverna-tavlang-tool/pom.xml
+++ b/taverna-tavlang-tool/pom.xml
@@ -29,7 +29,7 @@
<dependencies>
- <dependency>
+ <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
@@ -52,19 +52,21 @@
<version>${project.version}</version>
</dependency>
-<!-- <dependency> -->
-<!-- <groupId>org.shiwa.iwir</groupId> -->
-<!-- <artifactId>iwir</artifactId> -->
-<!-- <version>1.1.4</version> -->
-<!-- <scope>optional</scope> -->
-<!-- <systemPath>${project.build.directory}/taverna-language-commandline/lib/</systemPath> -->
-<!-- </dependency> -->
+<!--
+ <dependency>
+ <groupId>org.shiwa.iwir</groupId>
+ <artifactId>iwir</artifactId>
+ <version>1.1.4</version>
+ <scope>optional</scope>
+ <systemPath>${project.build.directory}/taverna-language-commandline/lib/</systemPath>
+ </dependency>
+-->
<!-- Disabled due to LGPL depenency
<dependency>
- <groupId>no.s11.scufl2</groupId>
- <artifactId>scufl2-iwir</artifactId>
- <version>0.2-SNAPSHOT</version>
+ <groupId>no.s11.scufl2</groupId>
+ <artifactId>scufl2-iwir</artifactId>
+ <version>0.2-SNAPSHOT</version>
<optional>true</optional>
</dependency>
-->
[5/5] incubator-taverna-language git commit: README update - require
Java 8/9
Posted by st...@apache.org.
README update - require Java 8/9
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/4da38095
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/4da38095
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/4da38095
Branch: refs/heads/master
Commit: 4da380952bac12a4ff8e861f97044d6a1737f2e8
Parents: 4c0dd0e
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri May 11 14:36:39 2018 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri May 11 14:36:39 2018 +0100
----------------------------------------------------------------------
README.md | 50 ++++++++++++++++++++++++++------------------------
1 file changed, 26 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/4da38095/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 59e799b..0e332d2 100644
--- a/README.md
+++ b/README.md
@@ -16,13 +16,16 @@
-->
# Apache Taverna Language
-Apache Taverna Language is a set of APIs for workflow definitions (SCUFL2)
-and workflow inputs/outputs/run (DataBundle), as consumed and produced
-by the [Apache Taverna](http://taverna.incubator.apache.org/) (incubating)
-workflow system.
+Apache Taverna Language is a set of APIs for workflow definitions (SCUFL2),
+Research Object Bundles and workflow inputs/outputs/run (DataBundle),
+as consumed and produced by the
+[Apache Taverna](http://taverna.incubator.apache.org/) (incubating) workflow system.
The API includes support for the legacy formats from Taverna 2 and Taverna
-1, and therefore can be also used independently of Apache Taverna 3.
+1, and can be also used independently of Apache Taverna 3.
+
+The command line tool `tavlang` can be used for conversion and
+inspection of research objects and workflow bundles.
## License
@@ -113,8 +116,8 @@ For more details, see the READMEs of:
## Prerequisites
-* Java 1.8 or newer (tested with OpenJDK 1.8)
-* [Apache Maven](https://maven.apache.org/download.html) 3.2.5 or newer (older
+* Java JDK 8 or 9
+* [Apache Maven](https://maven.apache.org/download.html) 3.5.3 or newer (older
versions probably also work)
@@ -125,7 +128,7 @@ To build Apache Taverna Language, use:
mvn clean install
This will build each module and run their tests, producing JARs like
-`taverna-scufl2-api/target/taverna-scufl2-api-0.15.1-incubating.jar`.
+`taverna-scufl2-api/target/taverna-scufl2-api-0.16.0-incubating.jar`.
Some of the experimental modules are not built automatically, to build
them separately, run the same command from within their folder.
@@ -136,8 +139,7 @@ If you are building on Windows, ensure you unpack this source code
to a folder with a [short path name](http://stackoverflow.com/questions/1880321/why-does-the-260-character-path-length-limit-exist-in-windows)
lenght, e.g. `C:\src` - as
Windows has a [limitation on the total path length](https://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx#maxpath)
-which might otherwise
-prevent this code from building successfully.
+which might otherwise prevent this code from building successfully.
## Skipping tests
@@ -175,27 +177,27 @@ Typical users of this API will depend on these modules:
<dependency>
<groupId>org.apache.taverna.language</groupId>
<artifactId>taverna-robundle</artifactId>
- <version>0.15.1-incubating</version>
+ <version>0.16.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.taverna.language</groupId>
<artifactId>taverna-databundle</artifactId>
- <version>0.15.1-incubating</version>
+ <version>0.16.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.taverna.language</groupId>
<artifactId>taverna-scufl2-api</artifactId>
- <version>0.15.1-incubating</version>
+ <version>0.16.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.taverna.language</groupId>
<artifactId>taverna-scufl2-wfbundle</artifactId>
- <version>0.15.1-incubating</version>
+ <version>0.16.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.taverna.language</groupId>
<artifactId>taverna-scufl2-t2flow</artifactId>
- <version>0.15.1-incubating</version>
+ <version>0.16.0-incubating</version>
</dependency>
To find the latest `<version>` to use above (this README might
@@ -209,12 +211,12 @@ providing [OSGi services](taverna-scufl2-api#osgi-services).
You can alternatively copy and add these JARs from the build to add
to your classpath:
-* `taverna-robundle/target/taverna-scufl2-robundle-0.15.1-incubating.jar`
-* `taverna-databundle/target/taverna-scufl2-databundle-0.15.1-incubating.jar`
-* `taverna-scufl2-api/target/taverna-scufl2-api-0.15.1-incubating.jar`
-* `taverna-scufl2-wfbundle/target/taverna-scufl2-wfbundle-0.15.1-incubating.jar`
-* `taverna-scufl2-ucfpackage/target/taverna-scufl2-ucfpackage-0.15.1-incubating.jar`
-* `taverna-scufl2-t2flow/target/taverna-scufl2-t2flow-0.15.1-incubating.jar`
+* `taverna-robundle/target/taverna-scufl2-robundle-0.16.0-incubating.jar`
+* `taverna-databundle/target/taverna-scufl2-databundle-0.16.0-incubating.jar`
+* `taverna-scufl2-api/target/taverna-scufl2-api-0.16.0-incubating.jar`
+* `taverna-scufl2-wfbundle/target/taverna-scufl2-wfbundle-0.16.0-incubating.jar`
+* `taverna-scufl2-ucfpackage/target/taverna-scufl2-ucfpackage-0.16.0-incubating.jar`
+* `taverna-scufl2-t2flow/target/taverna-scufl2-t2flow-0.16.0-incubating.jar`
## Javadoc
@@ -222,9 +224,9 @@ See the [Taverna Language
Javadoc](http://taverna.incubator.apache.org/javadoc/taverna-language/) for
documentation of classes and methods of Taverna Language. Good starting
points:
- * [org.apache.taverna.scufl2.api](http://taverna.incubator.apache.org/javadoc/taverna-language/org/apache/taverna/scufl2/api/package-summary.html)
- * [org.apache.taverna.robundle](http://taverna.incubator.apache.org/javadoc/taverna-language/org/apache/taverna/robundle/package-summary.html)
- * [org.apache.taverna.databundle](http://taverna.incubator.apache.org/javadoc/taverna-language/org/apache/taverna/databundle/package-summary.html)
+ * [org.apache.taverna.scufl2.api](https://taverna.incubator.apache.org/javadoc/taverna-language/org/apache/taverna/scufl2/api/package-summary.html)
+ * [org.apache.taverna.robundle](https://taverna.incubator.apache.org/javadoc/taverna-language/org/apache/taverna/robundle/package-summary.html)
+ * [org.apache.taverna.databundle](https://taverna.incubator.apache.org/javadoc/taverna-language/org/apache/taverna/databundle/package-summary.html)
# Export restrictions