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:47 UTC

[1/2] incubator-taverna-common-activities git commit: tab -> spaces

Repository: incubator-taverna-common-activities
Updated Branches:
  refs/heads/master e78c3ee24 -> 386cf4862


tab -> spaces


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/4dee9aee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/4dee9aee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/4dee9aee

Branch: refs/heads/master
Commit: 4dee9aee5449071e1d5f44ae4bdfe68c21b88c20
Parents: e78c3ee
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon May 9 15:00:06 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon May 9 15:00:06 2016 +0100

----------------------------------------------------------------------
 pom.xml | 146 +++++++++++++++++++++++++++++------------------------------
 1 file changed, 73 insertions(+), 73 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/4dee9aee/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a42d071..aa358ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,80 +18,80 @@
 
 -->
 <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.commonactivities</groupId>
-	<artifactId>apache-taverna-common-activities</artifactId>
-	<version>2.1.0-incubating-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>Apache Taverna Common Activities</name>
-	<properties>
+    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.commonactivities</groupId>
+    <artifactId>apache-taverna-common-activities</artifactId>
+    <version>2.1.0-incubating-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>Apache Taverna Common Activities</name>
+    <properties>
 
-		<!-- Taverna dependency versions -->
-		<taverna.language.version>0.15.0-incubating</taverna.language.version>
-		<taverna.osgi.version>0.2.1-incubating</taverna.osgi.version>
-		<taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version>
+        <!-- Taverna dependency versions -->
+        <taverna.language.version>0.15.0-incubating</taverna.language.version>
+        <taverna.osgi.version>0.2.1-incubating</taverna.osgi.version>
+        <taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version>
 
-		<!-- Third-party dependency versios -->
-		<abdera.version>1.1.3</abdera.version>
-		<bsh.version>2.0b6</bsh.version>
-		<servicemix.javax.wsdl.version>1.6.3_1</servicemix.javax.wsdl.version>
-		<javacsv.version>2.0</javacsv.version>
-		<jsch.version>1.0.6.RELEASE</jsch.version>
-		<odfdom.version>0.7</odfdom.version>
-		<!-- <odfdom.version>0.8.8-incubating</odfdom.version> -->
-		<santuario.xmlsec.version>1.5.7</santuario.xmlsec.version>
-		<xmlschema.version>2.2.1</xmlschema.version>
-		<velocity.version>1.7</velocity.version>
-		<webdavservlet.version>2.0</webdavservlet.version>
-		<woden.version>1.0M10</woden.version>
-		<wss4j.version>1.6.18</wss4j.version>
-	</properties>
-	<modules>
-		<module>taverna-beanshell-activity</module>
-		<module>taverna-external-tool-activity</module>
-		<module>taverna-interaction-activity</module>
-		<module>taverna-rest-activity</module>
-		<module>taverna-spreadsheet-import-activity</module>
-		<module>taverna-wsdl-activity</module>
-		<module>taverna-wsdl-generic</module>
-		<module>taverna-xpath-activity</module>
-	</modules>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.rat</groupId>
-				<artifactId>apache-rat-plugin</artifactId>
-				<configuration>
-					<excludes combine.children="append">
-						<exclude>**/src/main/resources/META-INF/soap-encoding.xsd</exclude> <!-- W3C Software License (See NOTICE) -->
-						<exclude>**/src/test/resources/test-spreadsheet*</exclude> <!--  Our own test spreadsheets -->
-						<exclude>**/src/main/resources/json2.js</exclude><!-- public domain -->
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>	
-	<scm>
-		<connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</connection>
-		<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</developerConnection>
-		<url>https://github.com/apache/incubator-taverna-common-activities</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>
+        <!-- Third-party dependency versios -->
+        <abdera.version>1.1.3</abdera.version>
+        <bsh.version>2.0b6</bsh.version>
+        <servicemix.javax.wsdl.version>1.6.3_1</servicemix.javax.wsdl.version>
+        <javacsv.version>2.0</javacsv.version>
+        <jsch.version>1.0.6.RELEASE</jsch.version>
+        <odfdom.version>0.7</odfdom.version>
+        <!-- <odfdom.version>0.8.8-incubating</odfdom.version> -->
+        <santuario.xmlsec.version>1.5.7</santuario.xmlsec.version>
+        <xmlschema.version>2.2.1</xmlschema.version>
+        <velocity.version>1.7</velocity.version>
+        <webdavservlet.version>2.0</webdavservlet.version>
+        <woden.version>1.0M10</woden.version>
+        <wss4j.version>1.6.18</wss4j.version>
+    </properties>
+    <modules>
+        <module>taverna-beanshell-activity</module>
+        <module>taverna-external-tool-activity</module>
+        <module>taverna-interaction-activity</module>
+        <module>taverna-rest-activity</module>
+        <module>taverna-spreadsheet-import-activity</module>
+        <module>taverna-wsdl-activity</module>
+        <module>taverna-wsdl-generic</module>
+        <module>taverna-xpath-activity</module>
+    </modules>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <excludes combine.children="append">
+                        <exclude>**/src/main/resources/META-INF/soap-encoding.xsd</exclude> <!-- W3C Software License (See NOTICE) -->
+                        <exclude>**/src/test/resources/test-spreadsheet*</exclude> <!--  Our own test spreadsheets -->
+                        <exclude>**/src/main/resources/json2.js</exclude><!-- public domain -->
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>    
+    <scm>
+        <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</connection>
+        <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities.git</developerConnection>
+        <url>https://github.com/apache/incubator-taverna-common-activities</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>
 
 </project>


[2/2] incubator-taverna-common-activities git commit: javadoc crossreferences

Posted by st...@apache.org.
javadoc crossreferences


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/commit/386cf486
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/386cf486
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/386cf486

Branch: refs/heads/master
Commit: 386cf486222ba614882b3ed577ff0db5ec9e99cb
Parents: 4dee9ae
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon May 9 15:01:05 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon May 9 15:01:05 2016 +0100

----------------------------------------------------------------------
 pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/386cf486/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index aa358ef..3d29968 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,16 @@
                     </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>
+                        <link>https://taverna.incubator.apache.org/javadoc/taverna-engine/</link>
+                    </links>
+                </configuration>
+            </plugin>
         </plugins>
     </build>    
     <scm>