You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/05/09 14:03:56 UTC
[1/2] incubator-taverna-engine git commit: tab -> space
Repository: incubator-taverna-engine
Updated Branches:
refs/heads/master ed99f648d -> ed1abad91
tab -> space
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/fd0dddae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/fd0dddae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/fd0dddae
Branch: refs/heads/master
Commit: fd0dddae64e1b90c0764fbf9af8f22afbc5c9ddd
Parents: ed99f64
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon May 9 14:55:19 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon May 9 14:55:19 2016 +0100
----------------------------------------------------------------------
pom.xml | 228 +++++++++++++++++++++++++++++------------------------------
1 file changed, 114 insertions(+), 114 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/fd0dddae/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c905d45..0c676d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,122 +18,122 @@
-->
<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</groupId>
- <artifactId>apache-taverna-parent</artifactId>
- <version>2-incubating</version>
- </parent>
-
- <groupId>org.apache.taverna.engine</groupId>
- <artifactId>apache-taverna-engine</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Apache Taverna Engine and Platform</name>
-
- <properties>
- <taverna.language.version>0.15.1-incubating</taverna.language.version>
- <taverna.osgi.version>0.2.1-incubating</taverna.osgi.version>
+ 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</groupId>
+ <artifactId>apache-taverna-parent</artifactId>
+ <version>2-incubating</version>
+ </parent>
+
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>apache-taverna-engine</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Apache Taverna Engine and Platform</name>
+
+ <properties>
+ <taverna.language.version>0.15.1-incubating</taverna.language.version>
+ <taverna.osgi.version>0.2.1-incubating</taverna.osgi.version>
<servicemix.derby.version>10.12.1.1_1</servicemix.derby.version>
- </properties>
-
- <modules>
- <!-- TODO: see separate branch taverna-platform-integration-tests -->
- <!-- <module>taverna-platform-integration-tests</module> -->
-
- <!-- TODO: see separate branch taverna-integration-tests -->
- <!-- <module>taverna-integration-tests</module> -->
-
- <module>taverna-activity-archetype</module>
- <module>taverna-activity-test-utils</module>
- <module>taverna-capability-api</module>
- <module>taverna-capability-impl</module>
- <module>taverna-credential-manager-api</module>
- <module>taverna-credential-manager-impl</module>
- <module>taverna-database-configuration-api</module>
- <module>taverna-database-configuration-impl</module>
-
- <module>taverna-dataflow-activity</module>
- <module>taverna-execution-api</module>
- <module>taverna-execution-hadoop</module>
- <module>taverna-execution-impl</module>
- <module>taverna-execution-local</module>
- <module>taverna-execution-remote</module>
- <module>taverna-observer</module>
-
- <!-- FIXME: Upgrade to T3 <module>taverna-prov</module>
- <module>taverna-prov-owl-bindings</module>
+ </properties>
+
+ <modules>
+ <!-- TODO: see separate branch taverna-platform-integration-tests -->
+ <!-- <module>taverna-platform-integration-tests</module> -->
+
+ <!-- TODO: see separate branch taverna-integration-tests -->
+ <!-- <module>taverna-integration-tests</module> -->
+
+ <module>taverna-activity-archetype</module>
+ <module>taverna-activity-test-utils</module>
+ <module>taverna-capability-api</module>
+ <module>taverna-capability-impl</module>
+ <module>taverna-credential-manager-api</module>
+ <module>taverna-credential-manager-impl</module>
+ <module>taverna-database-configuration-api</module>
+ <module>taverna-database-configuration-impl</module>
+
+ <module>taverna-dataflow-activity</module>
+ <module>taverna-execution-api</module>
+ <module>taverna-execution-hadoop</module>
+ <module>taverna-execution-impl</module>
+ <module>taverna-execution-local</module>
+ <module>taverna-execution-remote</module>
+ <module>taverna-observer</module>
+
+ <!-- FIXME: Upgrade to T3 <module>taverna-prov</module>
+ <module>taverna-prov-owl-bindings</module>
-->
- <!-- <module>taverna-provenanceconnector</module> -->
- <module>taverna-reference-api</module>
- <module>taverna-reference-impl</module>
- <module>taverna-reference-testhelpers</module>
- <module>taverna-reference-types</module>
- <module>taverna-report-api</module>
- <module>taverna-run-api</module>
- <module>taverna-run-impl</module>
- <module>taverna-services-api</module>
- <module>taverna-services-impl</module>
- <module>taverna-stringconstant-activity</module>
- <module>taverna-workflowmodel-api</module>
- <module>taverna-workflowmodel-extensions</module>
- <module>taverna-workflowmodel-impl</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <exclude>**/mimetype</exclude> <!-- really a binary file -->
- <exclude>**/*.txt</exclude> <!-- workflow values -->
- <exclude>**/src/main/resources/archetype-resources/</exclude> <!-- Don't want our archetype to generate ASF headers -->
- <exclude>**/META-INF/spring.*</exclude> <!-- Miniscule spring marker files -->
- <exclude>**/workflowrun.json</exclude> <!-- example workflow run report -->
-
- <exclude>**/org/pingel/util/CrossProduct.java</exclude> <!-- BSD 3-Clause (see NOTICE) -->
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <scm>
- <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-engine.git</connection>
- <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-engine.git</developerConnection>
- <url>https://github.com/apache/incubator-taverna-engine</url>
- <tag>HEAD</tag>
- </scm>
-
- <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>
+ <!-- <module>taverna-provenanceconnector</module> -->
+ <module>taverna-reference-api</module>
+ <module>taverna-reference-impl</module>
+ <module>taverna-reference-testhelpers</module>
+ <module>taverna-reference-types</module>
+ <module>taverna-report-api</module>
+ <module>taverna-run-api</module>
+ <module>taverna-run-impl</module>
+ <module>taverna-services-api</module>
+ <module>taverna-services-impl</module>
+ <module>taverna-stringconstant-activity</module>
+ <module>taverna-workflowmodel-api</module>
+ <module>taverna-workflowmodel-extensions</module>
+ <module>taverna-workflowmodel-impl</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>**/mimetype</exclude> <!-- really a binary file -->
+ <exclude>**/*.txt</exclude> <!-- workflow values -->
+ <exclude>**/src/main/resources/archetype-resources/</exclude> <!-- Don't want our archetype to generate ASF headers -->
+ <exclude>**/META-INF/spring.*</exclude> <!-- Miniscule spring marker files -->
+ <exclude>**/workflowrun.json</exclude> <!-- example workflow run report -->
+
+ <exclude>**/org/pingel/util/CrossProduct.java</exclude> <!-- BSD 3-Clause (see NOTICE) -->
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <scm>
+ <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-engine.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-engine.git</developerConnection>
+ <url>https://github.com/apache/incubator-taverna-engine</url>
+ <tag>HEAD</tag>
+ </scm>
+
+ <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>
[2/2] incubator-taverna-engine git commit: JAvadoc cross references
Posted by st...@apache.org.
JAvadoc cross references
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/ed1abad9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/ed1abad9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/ed1abad9
Branch: refs/heads/master
Commit: ed1abad9169baf8f081f7d441a02cda7ca246f12
Parents: fd0ddda
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon May 9 14:59:29 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon May 9 14:59:29 2016 +0100
----------------------------------------------------------------------
pom.xml | 33 +++++++++++++++++++++------------
1 file changed, 21 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/ed1abad9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0c676d1..17b3b61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,20 +100,29 @@
<build>
<plugins>
- <plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes combine.children="append">
- <exclude>**/mimetype</exclude> <!-- really a binary file -->
- <exclude>**/*.txt</exclude> <!-- workflow values -->
- <exclude>**/src/main/resources/archetype-resources/</exclude> <!-- Don't want our archetype to generate ASF headers -->
- <exclude>**/META-INF/spring.*</exclude> <!-- Miniscule spring marker files -->
- <exclude>**/workflowrun.json</exclude> <!-- example workflow run report -->
-
- <exclude>**/org/pingel/util/CrossProduct.java</exclude> <!-- BSD 3-Clause (see NOTICE) -->
- </excludes>
- </configuration>
+ <configuration>
+ <excludes combine.children="append">
+ <exclude>**/mimetype</exclude> <!-- really a binary file -->
+ <exclude>**/*.txt</exclude> <!-- workflow values -->
+ <exclude>**/src/main/resources/archetype-resources/</exclude> <!-- Don't want our archetype to generate ASF headers -->
+ <exclude>**/META-INF/spring.*</exclude> <!-- Miniscule spring marker files -->
+ <exclude>**/workflowrun.json</exclude> <!-- example workflow run report -->
+
+ <exclude>**/org/pingel/util/CrossProduct.java</exclude> <!-- BSD 3-Clause (see NOTICE) -->
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <links>
+ <link>https://taverna.incubator.apache.org/javadoc/taverna-language/</link>
+ <link>https://taverna.incubator.apache.org/javadoc/taverna-osgi/</link>
+ </links>
+ </configuration>
</plugin>
</plugins>
</build>