You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by aj...@apache.org on 2018/03/18 12:08:16 UTC
jena git commit: JENA-1508 Update OSGi provisioning features
Repository: jena
Updated Branches:
refs/heads/master b1e89b2fd -> 9512887d6
JENA-1508 Update OSGi provisioning features
This marks the com.google.errorprone.annotations.concurrent package
as optional. It also adds the (currently missing) commons-codec dependency
to the features.xml file.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9512887d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9512887d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9512887d
Branch: refs/heads/master
Commit: 9512887d6c3d2d5a76573bf60dd8a21226ae4581
Parents: b1e89b2
Author: Aaron Coburn <ac...@apache.org>
Authored: Fri Mar 16 15:34:48 2018 -0400
Committer: Aaron Coburn <ac...@apache.org>
Committed: Fri Mar 16 15:34:48 2018 -0400
----------------------------------------------------------------------
.../jena-osgi-features/src/main/resources/features.xml | 1 +
apache-jena-osgi/jena-osgi/pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9512887d/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml b/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
index f36694d..a95270f 100644
--- a/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
+++ b/apache-jena-osgi/jena-osgi-features/src/main/resources/features.xml
@@ -35,6 +35,7 @@
<bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${ver.httpclient-osgi}</bundle>
<bundle>mvn:org.apache.commons/commons-csv/${ver.commonscsv}</bundle>
<bundle>mvn:org.apache.commons/commons-lang3/${ver.commonslang3}</bundle>
+ <bundle>mvn:commons-codec/commons-codec/${ver.commons-codec}</bundle>
<bundle>mvn:commons-io/commons-io/${ver.commonsio}</bundle>
<bundle>mvn:org.apache.thrift/libthrift/${ver.libthrift}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/jena/blob/9512887d/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 8951762..683e761 100644
--- a/apache-jena-osgi/jena-osgi/pom.xml
+++ b/apache-jena-osgi/jena-osgi/pom.xml
@@ -261,7 +261,7 @@
-->
<Embed-Transitive>true</Embed-Transitive>
<!-- Do not embed but import Xerces classes via OSGi -->
- <Import-Package>org.osgi.framework.*,org.apache.xml.*,org.apache.xerces.*;version="2.11.0",!sun.io,!org.apache.avalon.framework.logger,!com.ibm.uvm.tools,!com.sun.jdmk.comm,!org.apache.log,!org.apache.jena.ext.*,sun.misc;resolution:=optional,*</Import-Package>
+ <Import-Package>org.osgi.framework.*,org.apache.xml.*,org.apache.xerces.*;version="2.11.0",!sun.io,!org.apache.avalon.framework.logger,!com.ibm.uvm.tools,!com.sun.jdmk.comm,!org.apache.log,!org.apache.jena.ext.*,sun.misc;resolution:=optional,com.google.errorprone.annotations.concurrent;resolution:=optional,*</Import-Package>
<!--
<Import-Package>org.osgi.framework.*,!sun.io,!org.apache.avalon.framework.logger,!com.ibm.uvm.tools,!com.sun.jdmk.comm,!org.apache.log,!org.apache.xml.*,!org.apache.xerces.*,!org.apache.jena.ext.*,sun.misc;resolution:=optional,*</Import-Package>
-->