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 2015/02/17 12:37:51 UTC
[36/50] [abbrv] incubator-taverna-commandline git commit: using
Apache Taverna dependencies
using Apache Taverna dependencies
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/commit/f6985f0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/tree/f6985f0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/diff/f6985f0c
Branch: refs/heads/master
Commit: f6985f0c1c2149170b6900583df5f8ce439f4948
Parents: 9a15408
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Sun Dec 28 02:26:45 2014 -0600
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Sun Dec 28 02:26:45 2014 -0600
----------------------------------------------------------------------
pom.xml | 4 ++-
taverna-commandline-api/pom.xml | 2 +-
taverna-commandline-common/pom.xml | 52 +++++++++++++++----------------
taverna-commandline-launcher/pom.xml | 18 +++++------
taverna-commandline-product/pom.xml | 2 +-
taverna-commandline-tests/pom.xml | 34 +++++---------------
6 files changed, 47 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/f6985f0c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7b5a7b3..0045712 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
<artifactId>taverna-commandline</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Taverna Engine and Platform</name>
+ <name>Apache Taverna Command Line</name>
<properties>
<taverna.language.version>0.15.0-incubating-SNAPSHOT</taverna.language.version>
<taverna.osgi.version>0.2.0-incubating-SNAPSHOT</taverna.osgi.version>
@@ -21,7 +21,9 @@
<module>taverna-commandline-common</module>
<module>taverna-commandline-launcher</module>
<module>taverna-commandline-product</module>
+ <!--
<module>taverna-commandline-tests</module>
+ -->
</modules>
<repositories>
<repository>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/f6985f0c/taverna-commandline-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-commandline-api/pom.xml b/taverna-commandline-api/pom.xml
index 36f73a6..ab49d38 100644
--- a/taverna-commandline-api/pom.xml
+++ b/taverna-commandline-api/pom.xml
@@ -8,5 +8,5 @@
</parent>
<packaging>bundle</packaging>
<artifactId>taverna-commandline-api</artifactId>
- <name>Apache Taverna Command Line API</name>
+ <name>Apache Taverna Commandline API</name>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/f6985f0c/taverna-commandline-common/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-commandline-common/pom.xml b/taverna-commandline-common/pom.xml
index 4230b99..ee2ffce 100644
--- a/taverna-commandline-common/pom.xml
+++ b/taverna-commandline-common/pom.xml
@@ -11,59 +11,59 @@
<name>Apache Taverna Commandline Common</name>
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.taverna-commandline</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-commandline-api</artifactId>
- <version>${project.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.platform</groupId>
+ <groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-run-api</artifactId>
- <version>${platform.version}</version>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-database-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-api</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-api</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-validation</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-validation</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-validation-structural</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-validation-structural</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-validation-correctness</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-validation-correctness</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.databundle</groupId>
- <artifactId>databundle</artifactId>
- <version>${taverna.databundle.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-databundle</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
<!--
<dependency>
- <groupId>net.sf.taverna.t2.core</groupId>
+ <groupId>org.apache.taverna.engine</groupId>
<artifactId>provenanceconnector</artifactId>
- <version>${t2.core.provenanceconnector.version}</version>
+ <version>${taverna.engine.version}</version>
</dependency>
-->
<dependency>
- <groupId>net.sf.taverna.t2.security</groupId>
- <artifactId>credential-manager</artifactId>
- <version>${t2.security.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-credential-manager</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/f6985f0c/taverna-commandline-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-commandline-launcher/pom.xml b/taverna-commandline-launcher/pom.xml
index 340c70a..5aad907 100644
--- a/taverna-commandline-launcher/pom.xml
+++ b/taverna-commandline-launcher/pom.xml
@@ -7,7 +7,7 @@
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>taverna-commandline-launcher</artifactId>
- <name>Apache Taverna Command Line Launcher</name>
+ <name>Apache Taverna Commandline Launcher</name>
<build>
<plugins>
<plugin>
@@ -29,19 +29,19 @@
</build>
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.taverna-commandline</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>taverna-commandline-api</artifactId>
- <version>${t2.taverna-commandline.version}</version>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.osgi</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>osgi-launcher</artifactId>
- <version>${osgi.launcher.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-impl</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
@@ -51,8 +51,8 @@
</dependency>
<dependency>
<groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.log4j</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/f6985f0c/taverna-commandline-product/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-commandline-product/pom.xml b/taverna-commandline-product/pom.xml
index 3518d1a..e563167 100644
--- a/taverna-commandline-product/pom.xml
+++ b/taverna-commandline-product/pom.xml
@@ -8,7 +8,7 @@
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>taverna-command-line-product</artifactId>
- <name>Apache Taverna Command Line Product</name>
+ <name>Apache Taverna Commandline Product</name>
<packaging>taverna-application</packaging>
<profiles>
<profile>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/f6985f0c/taverna-commandline-tests/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-commandline-tests/pom.xml b/taverna-commandline-tests/pom.xml
index 26789fe..e28c4a0 100644
--- a/taverna-commandline-tests/pom.xml
+++ b/taverna-commandline-tests/pom.xml
@@ -7,7 +7,7 @@
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>taverna-command-line-tests</artifactId>
- <name>Apache Taverna Command Line Tests</name>
+ <name>Apache Taverna Commandline Tests</name>
<build>
<plugins>
<plugin>
@@ -24,15 +24,15 @@
</build>
<dependencies>
<dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-t2flow</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-t2flow</artifactId>
+ <version>${taverna.language.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>uk.org.taverna.scufl2</groupId>
- <artifactId>scufl2-rdfxml</artifactId>
- <version>${scufl2.version}</version>
+ <groupId>org.apache.taverna.language</groupId>
+ <artifactId>taverna-scufl2-rdfxml</artifactId>
+ <version>${taverna.language.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -68,24 +68,4 @@
<scope>test</scope>
</dependency> -->
</dependencies>
- <repositories>
- <repository>
- <id>mygrid-repository</id>
- <name>myGrid Repository</name>
- <url>http://www.mygrid.org.uk/maven/repository</url>
- <releases />
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>mygrid-snapshot-repository</id>
- <name>myGrid Snapshot Repository</name>
- <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- </repository>
- </repositories>
</project>