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/06/10 10:56:20 UTC
incubator-taverna-language git commit: Use jena-osgi rather than
jena-arq
Repository: incubator-taverna-language
Updated Branches:
refs/heads/master b1a77b353 -> 66c5f2f59
Use jena-osgi rather than jena-arq
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/66c5f2f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/66c5f2f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/66c5f2f5
Branch: refs/heads/master
Commit: 66c5f2f598a52e695a78bc8aca2487b8e0a892c8
Parents: b1a77b3
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Wed Jun 10 09:55:02 2015 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Wed Jun 10 09:55:02 2015 +0100
----------------------------------------------------------------------
taverna-databundle/pom.xml | 2 +-
taverna-robundle/pom.xml | 12 +++++-------
taverna-scufl2-annotation/pom.xml | 2 +-
taverna-scufl2-examples/pom.xml | 2 +-
4 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/66c5f2f5/taverna-databundle/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-databundle/pom.xml b/taverna-databundle/pom.xml
index 5d5e7b6..f56a4e0 100644
--- a/taverna-databundle/pom.xml
+++ b/taverna-databundle/pom.xml
@@ -28,7 +28,7 @@
<dependencies>
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
+ <artifactId>jena-osgi</artifactId>
<version>${jena.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/66c5f2f5/taverna-robundle/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-robundle/pom.xml b/taverna-robundle/pom.xml
index 15568ef..410948a 100644
--- a/taverna-robundle/pom.xml
+++ b/taverna-robundle/pom.xml
@@ -50,12 +50,14 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>com.github.jsonld-java</groupId>
<artifactId>jsonld-java</artifactId>
<version>${jsonld.version}</version>
<scope>test</scope>
</dependency>
+ -->
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
@@ -63,14 +65,8 @@
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
+ <artifactId>jena-osgi</artifactId>
<version>${jena.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>httpclient</artifactId>
- <groupId>org.apache.httpcomponents</groupId>
- </exclusion>
- </exclusions>
</dependency>
<!--
<dependency>
@@ -100,12 +96,14 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
+ <!--
<configuration>
<instructions>
<Embed-Dependency>*;groupId=com.github.jsonld-java</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
</instructions>
</configuration>
+ -->
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/66c5f2f5/taverna-scufl2-annotation/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-annotation/pom.xml b/taverna-scufl2-annotation/pom.xml
index 7fdc1f8..f35f214 100644
--- a/taverna-scufl2-annotation/pom.xml
+++ b/taverna-scufl2-annotation/pom.xml
@@ -45,7 +45,7 @@
</dependency>
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
+ <artifactId>jena-osgi</artifactId>
<version>${jena.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/66c5f2f5/taverna-scufl2-examples/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-scufl2-examples/pom.xml b/taverna-scufl2-examples/pom.xml
index f3e12f0..71b4fdc 100644
--- a/taverna-scufl2-examples/pom.xml
+++ b/taverna-scufl2-examples/pom.xml
@@ -55,7 +55,7 @@
<dependency>
<groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId>
+ <artifactId>jena-osgi</artifactId>
<version>${jena.version}</version>
</dependency>