Merge commit 'refs/pull/140/head' of github.com:apache/jena

This closes apache#140.
gshkb · May 10, 2016 · b6822b2 · b6822b2
2 parents 7590f64 + 0ec0ef2
commit b6822b2
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/apache-jena-osgi/jena-osgi/pom.xml b/apache-jena-osgi/jena-osgi/pom.xml
@@ -109,6 +109,20 @@
       <version>3.1.1-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
+   <!-- xerces is needed - but this is marked as optional as some
+        OSGi frameworks like Karaf will include their own
+        xerces in their boot delegation.
+
+        See also pull request #134
+        https://github.com/apache/jena/pull/134#issuecomment-209474708
+   -->
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xerces</artifactId>
+        <version>2.11.0_1</version>
+        <optional>true</optional>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.jena</groupId>
       <artifactId>jena-shaded-guava</artifactId>