Repository: incubator-taverna-language Updated Branches: refs/heads/TAVERNA-1017 [created] a748e824f
indentation fix of pom.xml 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/66d74f7c Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/66d74f7c Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/66d74f7c Branch: refs/heads/TAVERNA-1017 Commit: 66d74f7c10c50e730ee1eb68ffcfc23ed85f93e6 Parents: 7b70e67 Author: Stian Soiland-Reyes <[email protected]> Authored: Mon Oct 31 17:03:03 2016 +0000 Committer: Stian Soiland-Reyes <[email protected]> Committed: Mon Oct 31 17:03:03 2016 +0000 ---------------------------------------------------------------------- pom.xml | 338 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 171 insertions(+), 167 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/66d74f7c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index af5f393..d6908df 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,8 @@ 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";> +<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> @@ -34,31 +35,31 @@ <build> <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <additionalparam>-Xdoclint:none</additionalparam> - </configuration> - </execution> - </executions> -</plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> + <configuration> + <additionalparam>-Xdoclint:none</additionalparam> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> <useDefaultExcludes>true</useDefaultExcludes> <excludes> - <!--Just a META-INF file --> - <exclude>DEPENDENCIES</exclude> - <!-- Following excludes needed for taverna-scufl2-rdf, - taverna-scufl2-integration-tests and taverna-scufl2-validation-integration - subfolders that should be modules but are not. --> + <!--Just a META-INF file --> + <exclude>DEPENDENCIES</exclude> + <!-- 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> @@ -83,80 +84,87 @@ <!-- 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> - <exclude>/src/test/resources/combine/Boris-skeleton.omex</exclude> - <exclude>/src/test/resources/combine/DirectoryMadnessZipped-skeleton.omex</exclude> - <exclude>/src/test/resources/combine/DirectoryMadness-skeleton.omex</exclude> + <!-- Test COMBINE archives. Skeleton only (files empty) --> + <exclude>/src/test/resources/combine/aslanidi_purkinje_model_skeleton.zip</exclude> + <exclude>/src/test/resources/combine/Boris-skeleton.omex</exclude> + <exclude>/src/test/resources/combine/DirectoryMadnessZipped-skeleton.omex</exclude> + <exclude>/src/test/resources/combine/DirectoryMadness-skeleton.omex</exclude> - <!-- Our own test documents - contains LICENSE --> - <exclude>src/test/resources/document.odt</exclude> - <exclude>src/test/resources/workflowrun.bundle.zip</exclude> + <!-- Our own test documents - contains LICENSE --> + <exclude>src/test/resources/document.odt</exclude> + <exclude>src/test/resources/workflowrun.bundle.zip</exclude> - <!-- Created by Maven Shade plugin --> - <exclude>dependency-reduced-pom.xml</exclude> + <!-- Created by Maven Shade plugin --> + <exclude>dependency-reduced-pom.xml</exclude> - <!-- - Below exclusions are for - externally sourced/derived files - that must be acknowledged in - NOTICE (and/or */src/*/resources/META-INF/NOTICE) - --> + <!-- Below exclusions are for externally sourced/derived files that + must be acknowledged in NOTICE (and/or */src/*/resources/META-INF/NOTICE) --> - <!-- W3C license --> + <!-- W3C license --> <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>**/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> - <!-- Research Object Model, Creative Commons Attribution 3.0 --> + <!-- Research Object Model, Creative Commons Attribution 3.0 --> <exclude>**/roterms.ttl</exclude> - <exclude>**/wf4ever.ttl</exclude> - <exclude>**/wfdesc.ttl</exclude> - <exclude>**/wfprov.ttl</exclude> + <exclude>**/wf4ever.ttl</exclude> + <exclude>**/wfdesc.ttl</exclude> + <exclude>**/wfprov.ttl</exclude> - <!-- Dublin Core, Creative Commons Attribution 3.0 --> - <exclude>**/dcam.owl</exclude> - <exclude>**/dcterms_od.owl</exclude> + <!-- Dublin Core, Creative Commons Attribution 3.0 --> + <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> - --> +<!-- + <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> @@ -179,15 +187,15 @@ <tag>HEAD</tag> </scm> - <repositories> - <repository> - <id>apache.snapshots</id> - <name>Apache Snapshot Repository</name> - <url>https://repository.apache.org/snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - </repository> + <repositories> + <repository> + <id>apache.snapshots</id> + <name>Apache Snapshot Repository</name> + <url>https://repository.apache.org/snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + </repository> </repositories> <dependencyManagement> @@ -234,7 +242,8 @@ <dependency> <groupId>org.jaxen</groupId> <artifactId>com.springsource.org.jaxen</artifactId> - <!-- Was 1.1.4. as "1.1.3 has missing dependencies" but 1.1.1 appears to work fine --> + <!-- Was 1.1.4. as "1.1.3 has missing dependencies" but 1.1.1 appears + to work fine --> <version>${jaxen.version}</version> <type>jar</type> </dependency> @@ -245,83 +254,78 @@ </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.servicemix.bundles</groupId> - <artifactId>org.apache.servicemix.bundles.xerces</artifactId> - <version>${servicemix.xerces.version}</version> - </dependency> - <!-- JENA-1178 workaround: Upgrade jsonlld-java --> - <dependency> - <groupId>com.github.jsonld-java</groupId> - <artifactId>jsonld-java</artifactId> - <version>${jsonldjava.version}</version> - </dependency> - <!-- Needed by Jena --> - <dependency> - <groupId>com.github.andrewoma.dexx</groupId> - <artifactId>collection</artifactId> - <version>${dexx.collection.version}</version> - </dependency> + <dependencies> + <!-- Common dependencies on jena-osgi, which requires some additional dependencies + to be a happy OSGi bundle --> -</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> - <property> - <name>environment</name> - <value>android</value> - </property> - </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> - </profile> -</profiles> + <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> + <version>${servicemix.xerces.version}</version> + </dependency> + <!-- JENA-1178 workaround: Upgrade jsonlld-java --> + <dependency> + <groupId>com.github.jsonld-java</groupId> + <artifactId>jsonld-java</artifactId> + <version>${jsonldjava.version}</version> + </dependency> + <!-- Needed by Jena --> + <dependency> + <groupId>com.github.andrewoma.dexx</groupId> + <artifactId>collection</artifactId> + <version>${dexx.collection.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> + <profile> + <id>android</id> + <!-- <activation> <property> <name>environment</name> <value>android</value> + </property> </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> + </profile> + </profiles> </project>
