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/01/19 15:30:28 UTC
incubator-taverna-common-activities git commit: Localized dependency
versions
Repository: incubator-taverna-common-activities
Updated Branches:
refs/heads/master 64ca37050 -> 44cd91267
Localized dependency versions
.. that are only used in common-activities
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/44cd9126
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/tree/44cd9126
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/diff/44cd9126
Branch: refs/heads/master
Commit: 44cd912673507bfc289455cedc4d6a2baebc2600
Parents: 64ca370
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Tue Jan 19 14:29:40 2016 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Tue Jan 19 14:29:40 2016 +0000
----------------------------------------------------------------------
pom.xml | 18 +++++++++++++++++-
taverna-interaction-activity/pom.xml | 4 ++--
taverna-wsdl-activity/pom.xml | 6 +++---
taverna-wsdl-generic/pom.xml | 6 +++---
4 files changed, 25 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/44cd9126/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index beb5110..c8318db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,10 +12,26 @@
<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-SNAPSHOT</taverna.osgi.version>
<taverna.engine.version>3.1.0-incubating-SNAPSHOT</taverna.engine.version>
- <wss4j.version>1.6.18</wss4j.version>
+
+ <!-- Third-party dependency versios -->
+ <abdera.version>1.1.3</abdera.version>
+ <bsh.version>2.0b5</bsh.version>
+ <javax.wsdl.version>1.6.1</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>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/44cd9126/taverna-interaction-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-interaction-activity/pom.xml b/taverna-interaction-activity/pom.xml
index b32410c..6277017 100644
--- a/taverna-interaction-activity/pom.xml
+++ b/taverna-interaction-activity/pom.xml
@@ -82,13 +82,13 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <version>${servletapi.version}</version>
</dependency>
<dependency>
<groupId>net.sf.webdav-servlet</groupId>
<artifactId>webdav-servlet</artifactId>
- <version>2.0</version>
+ <version>${webdavservlet.version}</version>
</dependency>
<!-- The abdera artifacts are bundles -->
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/44cd9126/taverna-wsdl-activity/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-wsdl-activity/pom.xml b/taverna-wsdl-activity/pom.xml
index d92b618..d3181aa 100644
--- a/taverna-wsdl-activity/pom.xml
+++ b/taverna-wsdl-activity/pom.xml
@@ -74,8 +74,8 @@
<dependency>
<groupId>org.apache.ws.security</groupId>
<artifactId>wss4j</artifactId>
- <version>${wss4j.version}</version>
- <!-- NOTE: wss4j 1.6 removes org.apache.ws.axis.security.WSDoAllSender
+ <version>${wss4j.version}</version>
+ <!-- NOTE: wss4j 1.6 removes org.apache.ws.axis.security.WSDoAllSender
Do we still need this? I can't see how it's used.. -->
</dependency>
<dependency>
@@ -92,7 +92,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.2.2</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-common-activities/blob/44cd9126/taverna-wsdl-generic/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-wsdl-generic/pom.xml b/taverna-wsdl-generic/pom.xml
index 5a0288c..a56cc96 100644
--- a/taverna-wsdl-generic/pom.xml
+++ b/taverna-wsdl-generic/pom.xml
@@ -7,7 +7,7 @@
<artifactId>taverna-common-activities</artifactId>
<version>2.1.0-incubating-SNAPSHOT</version>
</parent>
-
+
<artifactId>taverna-wsdl-generic</artifactId>
<!--
<version>2.1.1-incubating-SNAPSHOT</version>
@@ -78,12 +78,12 @@
<dependency>
<groupId>org.apache.woden</groupId>
<artifactId>woden-core</artifactId>
- <version>1.0M10</version>
+ <version>${woden.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema-core</artifactId>
- <version>2.2.1</version>
+ <version>${xmlschema.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.security</groupId>