Merge branch 'maintenance'.
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/cd37be57 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/cd37be57 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/cd37be57 Branch: refs/heads/master Commit: cd37be575c3407839e177c657b7fa16d2385566e Parents: 96b8c3a cc39902 Author: Aleksandra Nenadic <[email protected]> Authored: Thu May 29 15:11:15 2014 +0100 Committer: Aleksandra Nenadic <[email protected]> Committed: Thu May 29 15:11:15 2014 +0100 ---------------------------------------------------------------------- .gitignore | 1 - pom.xml | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/cd37be57/.gitignore ---------------------------------------------------------------------- diff --cc .gitignore index ebe0e5b,5a3defb..6d2ce9e --- a/.gitignore +++ b/.gitignore @@@ -3,7 -3,7 +3,6 @@@ .project .settings/ catalog-v001.xml - - # ignore target files # target/ bin/ http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/cd37be57/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 8b183d7,87c9a46..8fed691 --- a/pom.xml +++ b/pom.xml @@@ -8,8 -8,8 +8,9 @@@ </parent> <groupId>net.sf.taverna.t2.activities</groupId> <artifactId>dependency-activity</artifactId> + <packaging>bundle</packaging> <name>Taverna 2 Activity with Dependencies</name> + <version>1.6-SNAPSHOT</version> <dependencies> <dependency> <groupId>net.sf.taverna.t2.core</groupId> @@@ -17,15 -17,37 +18,42 @@@ <version>${t2.core.version}</version> </dependency> <dependency> - <groupId>net.sf.taverna.t2.core</groupId> - <artifactId>workflowmodel-impl</artifactId> - <version>${t2.core.version}</version> + <groupId>uk.org.taverna.configuration</groupId> + <artifactId>taverna-app-configuration-api</artifactId> + <version>${taverna.configuration.version}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.2.2</version> </dependency> </dependencies> + <repositories> + <repository> + <releases /> + <snapshots> + <enabled>false</enabled> + </snapshots> + <id>mygrid-repository</id> + <name>myGrid Repository</name> + <url>http://www.mygrid.org.uk/maven/repository</url> + </repository> + <repository> + <releases> + <enabled>false</enabled> + </releases> + <snapshots /> + <id>mygrid-snapshot-repository</id> + <name>myGrid Snapshot Repository</name> + <url>http://www.mygrid.org.uk/maven/snapshot-repository</url> + </repository> + </repositories> + <scm> + <connection>scm:git:https://github.com/taverna/taverna-dependency-activity.git</connection> + <developerConnection>scm:git:ssh://[email protected]:taverna/taverna-dependency-activity.git</developerConnection> + <url>https://github.com/taverna/taverna-dependency-activity</url> + <tag>HEAD</tag> + </scm> + </project>
