You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2016/05/10 08:14:40 UTC
[1/2] jena git commit: Optional xerces bundle dependency
Repository: jena
Updated Branches:
refs/heads/master 7590f643f -> b6822b241
Optional xerces bundle dependency
See also https://github.com/apache/jena/pull/134#issuecomment-209474708
of why this should be optional
Related to #134
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0ec0ef25
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0ec0ef25
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0ec0ef25
Branch: refs/heads/master
Commit: 0ec0ef25f942efc451faa4e2a43bd253328f420b
Parents: 773f80b
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon May 9 13:38:31 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon May 9 13:48:13 2016 +0100
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi/pom.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0ec0ef25/apache-jena-osgi/jena-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi/pom.xml b/apache-jena-osgi/jena-osgi/pom.xml
index cb4e229..4517bf5 100644
--- 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>
[2/2] jena git commit: Merge commit 'refs/pull/140/head' of
github.com:apache/jena
Posted by an...@apache.org.
Merge commit 'refs/pull/140/head' of github.com:apache/jena
This closes #140.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b6822b24
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b6822b24
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b6822b24
Branch: refs/heads/master
Commit: b6822b241e48d1d7da8443df5c8a771e4593efdd
Parents: 7590f64 0ec0ef2
Author: Andy Seaborne <an...@apache.org>
Authored: Tue May 10 09:10:50 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue May 10 09:14:20 2016 +0100
----------------------------------------------------------------------
apache-jena-osgi/jena-osgi/pom.xml | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------