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 2017/01/13 15:37:18 UTC

[1/2] incubator-taverna-workbench-product git commit: Deps for org.apache.taverna.workbench

Repository: incubator-taverna-workbench-product
Updated Branches:
  refs/heads/master 9337025e3 -> b44503353


Deps for org.apache.taverna.workbench


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/a2df6468
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/a2df6468
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/a2df6468

Branch: refs/heads/master
Commit: a2df64680b3863e1624abdab011afa57a038924e
Parents: 9337025
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Nov 2 17:47:04 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Nov 2 17:47:04 2016 +0000

----------------------------------------------------------------------
 pom.xml | 535 +++++++++++++++++++++++------------------------------------
 1 file changed, 209 insertions(+), 326 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/a2df6468/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 773554e..974ff9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,20 @@
 <?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.
+-->
 <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>
@@ -10,7 +26,16 @@
 	<groupId>org.apache.taverna.workbench</groupId>
 	<artifactId>apache-taverna-workbench-product</artifactId>
 	<name>Taverna Workbench [Developer]</name>
-	<packaging>taverna-application</packaging>
+	<packaging>jar</packaging>
+
+    <properties>
+        <taverna.language.version>0.16.0-incubating-SNAPSHOT</taverna.language.version>
+        <taverna.osgi.version>0.2.1-incubating</taverna.osgi.version>
+        <taverna.engine.version>3.1.0-incubating</taverna.engine.version>
+        <taverna.commonactivities.version>2.1.0-incubating</taverna.commonactivities.version>
+        <taverna.workbench.version>3.1.0-incubating-SNAPSHOT</taverna.workbench.version>            
+    </properties>
+
 	<profiles>
 		<profile>
 			<id>dev</id>
@@ -94,7 +119,9 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.4</version>
+<!-- 
+ 				<version>2.4</version>
+ -->
 				<executions>
 					<execution>
 						<phase>package</phase>
@@ -108,7 +135,7 @@
 						<descriptor>${assembly.descriptor}</descriptor>
 					</descriptors>
 					<archiverConfig>
-						<directoryMode>493</directoryMode> <!-- 493(dec) = 755(oct) -->
+						<directoryMode>493</directoryMode> <!-- 493(dec) = 755(oct) = rwxr-xr-x -->
 						<defaultDirectoryMode>493</defaultDirectoryMode>
 					</archiverConfig>
 				</configuration>
@@ -134,9 +161,9 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.apache.taverna.maven.plugins</groupId>
+				<groupId>org.apache.taverna.osgi</groupId>
 				<artifactId>taverna-maven-plugin</artifactId>
-				<version>${taverna.osgi.verion}</version>
+				<version>${taverna.osgi.version}</version>
 				<extensions>true</extensions>
 				<configuration>
 					<buildNumber>${buildNumber}</buildNumber>
@@ -180,14 +207,12 @@
 							<pluginExecutions>
 								<pluginExecution>
 									<pluginExecutionFilter>
-										<groupId>
-											net.sf.taverna.t2.maven.plugins
-										</groupId>
+										<groupId>org.apache.taverna.osgi</groupId>
 										<artifactId>
 											taverna-maven-plugin
 										</artifactId>
 										<versionRange>
-											[0.3.1-SNAPSHOT,)
+											[0.2.1-incubating,)
 										</versionRange>
 										<goals>
 											<goal>
@@ -303,14 +328,14 @@
 
 		<!-- OSGi Compendium Services -->
 		<dependency>
-			<groupId>uk.org.taverna.osgi.services</groupId>
+			<groupId>org.apache.taverna.osgi</groupId>
 			<artifactId>xml-parser-service</artifactId>
-			<version>0.1.1</version>
+			<version>${taverna.osgi.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.osgi.services</groupId>
+			<groupId>org.apache.taverna.osgi</groupId>
 			<artifactId>xml-transformer-service</artifactId>
-			<version>0.1.1</version>
+			<version>${taverna.osgi.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
@@ -325,412 +350,270 @@
 
 		<!-- Taverna Activities -->
 		<dependency>
-			<groupId>net.sf.taverna.t2.activities</groupId>
-			<artifactId>apiconsumer-activity</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.activities</groupId>
-			<artifactId>beanshell-activity</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.activities</groupId>
-			<artifactId>biomart-activity</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.activities</groupId>
-			<artifactId>dataflow-activity</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
-		</dependency>
-		<!-- <dependency> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>external-tool-activity</artifactId>
-			<version>2.0.1-SNAPSHOT</version> </dependency> -->
-		<dependency>
-			<groupId>net.sf.taverna.t2.activities</groupId>
-			<artifactId>localworker-activity</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.activities</groupId>
-			<artifactId>rest-activity</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.activities</groupId>
-			<artifactId>rshell-activity</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.activities</groupId>
-			<artifactId>soaplab-activity</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.activities</groupId>
-			<artifactId>spreadsheet-import-activity</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.activities</groupId>
-			<artifactId>stringconstant-activity</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.activities</groupId>
-			<artifactId>wsdl-activity</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.activities</groupId>
-			<artifactId>xpath-activity</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
+			<groupId>org.apache.taverna.language</groupId>
+			<artifactId>taverna-scufl2-api</artifactId>
+			<version>${taverna.language.version}</version>
 		</dependency>
 
-		<!-- Taverna Activities UI -->
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-activities</groupId>
-			<artifactId>apiconsumer-activity-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-activities</groupId>
-			<artifactId>beanshell-activity-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-activities</groupId>
-			<artifactId>biomart-activity-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-activities</groupId>
-			<artifactId>dataflow-activity-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-activities</groupId>
-			<artifactId>localworker-activity-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-activities</groupId>
-			<artifactId>rest-activity-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-activities</groupId>
-			<artifactId>rshell-activity-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-selection-api</artifactId>
+			<version>${taverna.workbench.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-activities</groupId>
-			<artifactId>spreadsheet-import-activity-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.engine</groupId>
+			<artifactId>taverna-observer</artifactId>
+			<version>${taverna.engine.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-activities</groupId>
-			<artifactId>soaplab-activity-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-activities</groupId>
-			<artifactId>stringconstant-activity-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-activities</groupId>
-			<artifactId>wsdl-activity-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-activities</groupId>
-			<artifactId>unrecognized-activity-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-activities</groupId>
-			<artifactId>xpath-activity-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-edits-api</artifactId>
+			<version>${taverna.workbench.version}</version>
 		</dependency>
 
-		<!-- Taverna Workbench -->
-		<dependency>
-			<groupId>uk.org.taverna.workbench</groupId>
-			<artifactId>taverna-workbench</artifactId>
-			<version>0.1.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
-			<artifactId>workbench-impl</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
-			<artifactId>activity-palette-impl</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.osgi</groupId>
+			<artifactId>taverna-plugin-api</artifactId>
+			<version>${taverna.osgi.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
-			<artifactId>configuration-impl</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.osgi</groupId>
+			<artifactId>taverna-configuration-api</artifactId>
+			<version>${taverna.osgi.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
-			<artifactId>edits-impl</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<version>1.4.0.RELEASE</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
-			<artifactId>file-impl</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
-			<artifactId>menu-impl</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
-			<artifactId>renderers-impl</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
-			<artifactId>selection-impl</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
-			<artifactId>httpproxy-config</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
-			<artifactId>plugin-manager</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-impl</groupId>
-			<artifactId>update-manager</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-beans</artifactId>
+			<version>4.3.1.RELEASE</version>
 		</dependency>
-		<!-- <dependency> <groupId>net.sf.taverna.t2.ui-impl</groupId> <artifactId>report-impl</artifactId>
-			<version>2.0-SNAPSHOT</version> </dependency> -->
 
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
-			<artifactId>perspective-design</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
-			<artifactId>perspective-results</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
-			<artifactId>contextual-views</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
-			<artifactId>credential-manager-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.osgi</groupId>
+			<artifactId>taverna-app-configuration-api</artifactId>
+			<version>${taverna.osgi.version}</version>
 		</dependency>
+
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
-			<artifactId>data-management-config-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-file-api</artifactId>
+			<version>${taverna.workbench.version}</version>
 		</dependency>
+
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-components</groupId>
-			<artifactId>run-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-menu-api</artifactId>
+			<version>${taverna.workbench.version}</version>
 		</dependency>
 
 		<dependency>
-			<!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>loop-ui</artifactId>
-				<version>2.0-SNAPSHOT</version> </dependency> -->
-			<groupId>net.sf.taverna.t2.ui-exts</groupId>
-			<artifactId>menu-items</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-configuration-ui-api</artifactId>
+			<version>${taverna.workbench.version}</version>
 		</dependency>
+
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-exts</groupId>
-			<artifactId>parallelize-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-helper-api</artifactId>
+			<version>${taverna.workbench.version}</version>
 		</dependency>
-		<!-- <dependency> <groupId>net.sf.taverna.t2.ui-exts</groupId> <artifactId>renderers-exts</artifactId>
-			<version>2.0-SNAPSHOT</version> </dependency> -->
+
 		<dependency>
-			<groupId>net.sf.taverna.t2.ui-exts</groupId>
-			<artifactId>retry-ui</artifactId>
-			<version>2.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-ui</artifactId>
+			<version>${taverna.workbench.version}</version>
 		</dependency>
 
 
-		<!-- Taverna Platform -->
+
 		<dependency>
-			<groupId>uk.org.taverna.platform</groupId>
-			<artifactId>taverna-capability-impl</artifactId>
-			<version>0.1.3-SNAPSHOT</version>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>${commons.io.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.platform</groupId>
-			<artifactId>taverna-run-impl</artifactId>
-			<version>0.1.3-SNAPSHOT</version>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>${log4j.version}</version>
 		</dependency>
+
 		<dependency>
-			<groupId>uk.org.taverna.platform</groupId>
-			<artifactId>taverna-execution-impl</artifactId>
-			<version>0.1.3-SNAPSHOT</version>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.platform</groupId>
-			<artifactId>taverna-execution-local</artifactId>
-			<version>0.1.3-SNAPSHOT</version>
+			<groupId>org.simplericity.macify</groupId>
+			<artifactId>macify</artifactId>
+			<version>${macify.version}</version>
 		</dependency>
 
-		<!-- Taverna Commons -->
+		<!-- Implementation, used by WorkbenchTest directly rather than through 
+			Spring -->
+
 		<dependency>
-			<groupId>uk.org.taverna.configuration</groupId>
-			<artifactId>taverna-configuration-impl</artifactId>
-			<version>0.1.1-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-credential-manager-ui</artifactId>
+			<version>${taverna.workbench.version}</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.configuration</groupId>
-			<artifactId>taverna-app-configuration-impl</artifactId>
-			<version>0.1.1-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-credential-manager-ui</artifactId>
+			<version>${taverna.workbench.version}</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.configuration</groupId>
-			<artifactId>taverna-database-configuration-impl</artifactId>
-			<version>0.1.1-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-perspective-design</artifactId>
+			<version>${taverna.workbench.version}</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.commons</groupId>
-			<artifactId>taverna-download-impl</artifactId>
-			<version>0.1.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-perspective-results</artifactId>
+			<version>${taverna.workbench.version}</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.commons</groupId>
-			<artifactId>taverna-plugin-impl</artifactId>
-			<version>0.1.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-edits-impl</artifactId>
+			<version>${taverna.workbench.version}</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.commons</groupId>
-			<artifactId>taverna-services-impl</artifactId>
-			<version>0.1.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-file-impl</artifactId>
+			<version>${taverna.workbench.version}</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.commons</groupId>
-			<artifactId>taverna-update-impl</artifactId>
-			<version>0.1.0-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-menu-impl</artifactId>
+			<version>${taverna.workbench.version}</version>
+			
 		</dependency>
-
-		<!-- Scufl2 -->
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
-			<artifactId>scufl2-api</artifactId>
-			<version>0.13.1</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-selection-impl</artifactId>
+			<version>${taverna.workbench.version}</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
-			<artifactId>scufl2-rdfxml</artifactId>
-			<version>0.13.1</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-credential-manager-impl</artifactId>
+			<version>${taverna.engine.version}</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
-			<artifactId>scufl2-t2flow</artifactId>
-			<version>0.13.2-SNAPSHOT</version>
+			<groupId>org.apache.taverna.osgi</groupId>
+			<artifactId>taverna-app-configuration-impl</artifactId>
+			<version>${taverna.osgi.version}</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
-			<artifactId>scufl2-validation-structural</artifactId>
-			<version>0.13.1</version>
+			<groupId>org.apache.taverna.osgi</groupId>
+			<artifactId>taverna-configuration-impl</artifactId>
+			<version>${taverna.osgi.version}</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>uk.org.taverna.scufl2</groupId>
-			<artifactId>scufl2-validation-correctness</artifactId>
-			<version>0.13.1</version>
+			<groupId>org.apache.taverna.engine</groupId>
+			<artifactId>taverna-capability-impl</artifactId>
+			<version>${taverna.engine.version}</version>
+			
 		</dependency>
 
-		<!-- Data bundle -->
+
 		<dependency>
-			<groupId>uk.org.taverna.databundle</groupId>
-			<artifactId>databundle</artifactId>
-			<version>0.2.1</version>
+			<groupId>org.apache.taverna.engine</groupId>
+			<artifactId>taverna-execution-local</artifactId>
+			<version>${taverna.engine.version}</version>
+			
 		</dependency>
-		<!-- HTTP client needed by Data Bundle -->
 		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient-osgi</artifactId>
-			<version>4.2.5</version>
+			<groupId>org.apache.taverna.engine</groupId>
+			<artifactId>taverna-reference-impl</artifactId>
+			<version>${taverna.engine.version}</version>
+			
 		</dependency>
+
 		<dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpcore-osgi</artifactId>
-			<version>4.2.5</version>
+			<groupId>org.apache.taverna.engine</groupId>
+			<artifactId>taverna-workflowmodel-extensions</artifactId>
+			<version>${taverna.engine.version}</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>org.apache.jena</groupId>
-			<artifactId>jena-osgi</artifactId>
-      <version>${jena.version}</version>
-		</dependency>
-		<!-- slf4j implementation -->
+			<groupId>org.apache.taverna.engine</groupId>
+			<artifactId>taverna-dataflow-activity</artifactId>
+			<version>${taverna.engine.version}</version>
+			
+		</dependency>				
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.7.5</version>
-		</dependency>
+			<groupId>org.apache.taverna.engine</groupId>
+			<artifactId>taverna-stringconstant-activity</artifactId>
+			<version>${taverna.engine.version}</version>
+			
+		</dependency>				
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.5</version>
+			<groupId>org.apache.taverna.commonactivities</groupId>
+			<artifactId>taverna-beanshell-activity</artifactId>
+			<version>${taverna.commonactivities.version}</version>
+			
 		</dependency>
 
-		<!-- Taverna Security -->
 		<dependency>
-			<groupId>net.sf.taverna.t2.security</groupId>
-			<artifactId>credential-manager-impl</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
+			<groupId>org.apache.taverna.engine</groupId>
+			<artifactId>taverna-services-impl</artifactId>
+			<version>${taverna.engine.version}</version>
+			
 		</dependency>
 
-		<!-- Taverna Workflow Engine -->
 		<dependency>
-			<groupId>net.sf.taverna.t2.core</groupId>
-			<artifactId>workflowmodel-impl</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
+			<groupId>org.apache.taverna.engine</groupId>
+			<artifactId>taverna-run-impl</artifactId>
+			<version>${taverna.engine.version}</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.core</groupId>
-			<artifactId>workflowmodel-core-extensions</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
-		</dependency>
+			<groupId>org.apache.taverna.engine</groupId>
+			<artifactId>taverna-execution-impl</artifactId>
+			<version>${taverna.engine.version}</version>
+			
+		</dependency>				
 		<dependency>
-			<groupId>net.sf.taverna.t2.core</groupId>
-			<artifactId>reference-impl</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-contextual-views-impl</artifactId>
+			<version>${taverna.workbench.version}</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.core</groupId>
-			<artifactId>reference-core-extensions</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-activity-palette-impl</artifactId>
+			<version>${taverna.workbench.version}</version>
+			
 		</dependency>
-
-		<!-- Taverna Provenance -->
 		<dependency>
-			<groupId>net.sf.taverna.t2.core</groupId>
-			<artifactId>provenance-derby</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-configuration-ui-impl</artifactId>
+			<version>${taverna.workbench.version}</version>
+			
 		</dependency>
 		<dependency>
-			<groupId>net.sf.taverna.t2.core</groupId>
-			<artifactId>provenance-mysql</artifactId>
-			<version>2.0.1-SNAPSHOT</version>
+			<groupId>org.apache.taverna.workbench</groupId>
+			<artifactId>taverna-renderers-impl</artifactId>
+			<version>${taverna.workbench.version}</version>
+			
 		</dependency>
 
+
 	</dependencies>
   <scm>
     <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product.git</connection>


[2/2] incubator-taverna-workbench-product git commit: Updated copyright to 2017

Posted by st...@apache.org.
Updated copyright to 2017


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/commit/b4450335
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/tree/b4450335
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/diff/b4450335

Branch: refs/heads/master
Commit: b44503353e003ca071cb5cdf524639e259549bed
Parents: a2df646
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Fri Jan 13 15:37:15 2017 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Fri Jan 13 15:37:15 2017 +0000

----------------------------------------------------------------------
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench-product/blob/b4450335/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 744dd78..3cba479 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache Taverna Workbench product
-Copyright 2014-2016 The Apache Software Foundation
+Copyright 2014-2017 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).