Formatting: somewhat harmonized pom.xml indenting
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 @@
<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>
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>
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>
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>
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>
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>
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>
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>
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>
-->
