TAVERNA-970 Move Jena and its dependencies to top-level pom
diff --git a/pom.xml b/pom.xml
index af7942d..d597b19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -246,6 +246,34 @@
</dependency>
</dependencies>
</dependencyManagement>
+<dependencies>
+ <!-- Common dependencies on jena-osgi, which requires some
+additional dependencies to be a happy OSGi bundle -->
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-osgi</artifactId>
+ <version>${jena.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xerces</artifactId>
+ <version>${servicemix.xerces.version}</version>
+ </dependency>
+ <!-- JENA-1178 workaround: Upgrade jsonlld-java -->
+ <dependency>
+ <groupId>com.github.jsonld-java</groupId>
+ <artifactId>jsonld-java</artifactId>
+ <version>${jsonldjava.version}</version>
+ </dependency>
+ <!-- Needed by Jena -->
+ <dependency>
+ <groupId>com.github.andrewoma.dexx</groupId>
+ <artifactId>collection</artifactId>
+ <version>${dexx.collection.version}</version>
+ </dependency>
+
+</dependencies>
<modules>
<module>taverna-baclava-language</module>
diff --git a/taverna-robundle/pom.xml b/taverna-robundle/pom.xml
index be1f5f2..a6fe7d7 100644
--- a/taverna-robundle/pom.xml
+++ b/taverna-robundle/pom.xml
@@ -61,19 +61,6 @@
<version>${jena.version}</version>
</dependency>
- <!-- Needed by jena-osgi -->
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xerces</artifactId>
- <version>${servicemix.xerces.version}</version>
- </dependency>
- <!-- JENA-1178 workaround: Upgrade jsonlld-java -->
- <dependency>
- <groupId>com.github.jsonld-java</groupId>
- <artifactId>jsonld-java</artifactId>
- <version>${jsonldjava.version}</version>
- </dependency>
-
<!--
@@ -100,19 +87,6 @@
<build>
<plugins>
- <plugin>
- <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>
<artifactId>maven-jaxb2-plugin</artifactId>
diff --git a/taverna-scufl2-annotation/pom.xml b/taverna-scufl2-annotation/pom.xml
index 7c1ee19..ca6ee7a 100644
--- a/taverna-scufl2-annotation/pom.xml
+++ b/taverna-scufl2-annotation/pom.xml
@@ -47,19 +47,9 @@
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-osgi</artifactId>
- <version>${jena.version}</version>
+ <version>${jena.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xerces</artifactId>
- <version>${servicemix.xerces.version}</version>
- </dependency>
- <!-- JENA-1178 workaround: Upgrade jsonlld-java -->
- <dependency>
- <groupId>com.github.jsonld-java</groupId>
- <artifactId>jsonld-java</artifactId>
- <version>${jsonldjava.version}</version>
- </dependency>
+
</dependencies>
</project>
