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 <[email protected]> Authored: Fri May 11 13:41:31 2018 +0100 Committer: Stian Soiland-Reyes <[email protected]> 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>
