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/16 09:23:54 UTC
[1/2] incubator-taverna-commandline git commit: newer slf4j
Repository: incubator-taverna-commandline
Updated Branches:
refs/heads/master 6c2f85d0b -> ef412324f
newer slf4j
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/2cb4b41a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/tree/2cb4b41a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/diff/2cb4b41a
Branch: refs/heads/master
Commit: 2cb4b41ae07ee4d130a3aefabb5e79f23e5f46a7
Parents: 6c2f85d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon May 16 10:08:47 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon May 16 10:08:47 2016 +0100
----------------------------------------------------------------------
pom.xml | 3 ++-
taverna-commandline-product/pom.xml | 8 --------
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/2cb4b41a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c804bab..80639f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,9 +44,10 @@
<servicemix.xerces.version>2.11.0_1</servicemix.xerces.version>
<apache.httpclient.version>4.5.2</apache.httpclient.version>
<apache.httpcore.version>4.4.4</apache.httpcore.version>
- <jackson.version>2.6.3</jackson.version>
+ <jackson.version>2.6.6</jackson.version>
<jsonldjava.version>0.8.2</jsonldjava.version>
<commons.configuration.version>1.10</commons.configuration.version>
+ <slf4j.version>1.7.20</slf4j.version>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/2cb4b41a/taverna-commandline-product/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-commandline-product/pom.xml b/taverna-commandline-product/pom.xml
index 698b24b..aba965a 100644
--- a/taverna-commandline-product/pom.xml
+++ b/taverna-commandline-product/pom.xml
@@ -28,14 +28,6 @@
<artifactId>taverna-commandline-product</artifactId>
<name>Apache Taverna Commandline Product</name>
<!--<packaging>taverna-application</packaging> Disabled due to TAVERNA-924 -->
- <packaging>jar</packaging>
- <properties>
- <!-- Must be compatible with jsonld-java and other Taverna dependencies -->
- <jackson.version>2.6.6</jackson.version>
-<!-- Must be compatible with jcl.over.slf4j -->
- <slf4j.version>1.7.12</slf4j.version>
-
- </properties>
<profiles>
<profile>
<id>developer</id>
[2/2] incubator-taverna-commandline git commit: TAVERNA-970 Jena
3.1.0 also needs dexx.collection
Posted by st...@apache.org.
TAVERNA-970 Jena 3.1.0 also needs dexx.collection
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/ef412324
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/tree/ef412324
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/diff/ef412324
Branch: refs/heads/master
Commit: ef412324f28c8f2480d1c2405a5c2c37aaad2afc
Parents: 2cb4b41
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon May 16 10:23:18 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon May 16 10:23:18 2016 +0100
----------------------------------------------------------------------
pom.xml | 1 +
taverna-commandline-product/pom.xml | 9 +++++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/ef412324/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 80639f1..3ac2c13 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,7 @@
<jsonldjava.version>0.8.2</jsonldjava.version>
<commons.configuration.version>1.10</commons.configuration.version>
<slf4j.version>1.7.20</slf4j.version>
+ <dexx.collection.version>0.6</dexx.collection.version>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-commandline/blob/ef412324/taverna-commandline-product/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-commandline-product/pom.xml b/taverna-commandline-product/pom.xml
index aba965a..b235513 100644
--- a/taverna-commandline-product/pom.xml
+++ b/taverna-commandline-product/pom.xml
@@ -454,6 +454,15 @@ Xerces OSGi bundle needed by jena-osgi
<artifactId>org.apache.servicemix.bundles.xerces</artifactId>
<version>${servicemix.xerces.version}</version>
</dependency>
+<!-- Also needed by Jena -->
+ <dependency>
+ <groupId>com.github.andrewoma.dexx</groupId>
+ <artifactId>collection</artifactId>
+ <version>${dexx.collection.version}</version>
+ </dependency>
+
+
+
<!-- slf4j implementation -->
<!-- The bundle "org.purl.wf4ever.robundle_0.3.1 " could not be resolved. Reason: Missing Constraint: Import-Package: org.slf4j; version="[1.7.0,2.0.0)"-->
<dependency>