This is an automated email from the ASF dual-hosted git repository.
acoburn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jena.git
The following commit(s) were added to refs/heads/master by this push:
new af96ff9 JENA-1833: Add jena-commonsrdf to jena-osgi
af96ff9 is described below
commit af96ff9a7e3b60ba8cae9e7dd8a6ae23ffbbdb9a
Author: Aaron Coburn <[email protected]>
AuthorDate: Mon Feb 3 16:48:17 2020 -0500
JENA-1833: Add jena-commonsrdf to jena-osgi
This adds the commonsrdf project to the jena-osgi bundle
---
.../jena-osgi-features/src/main/resources/features.xml | 1 +
apache-jena-osgi/jena-osgi/pom.xml | 15 ++++++++++++++-
jena-extras/jena-commonsrdf/pom.xml | 2 --
pom.xml | 7 +++++++
4 files changed, 22 insertions(+), 3 deletions(-)
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 d5fb6d4..ab8c317 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
@@ -34,6 +34,7 @@
<bundle
dependency="true">mvn:org.apache.commons/commons-compress/${ver.commons-compress}</bundle>
<bundle
dependency="true">mvn:org.apache.commons/commons-csv/${ver.commonscsv}</bundle>
<bundle
dependency="true">mvn:org.apache.commons/commons-lang3/${ver.commonslang3}</bundle>
+ <bundle
dependency="true">mvn:org.apache.commons/commons-rdf-api/${ver.commonsrdf}</bundle>
<bundle
dependency="true">mvn:commons-codec/commons-codec/${ver.commons-codec}</bundle>
<bundle
dependency="true">mvn:commons-io/commons-io/${ver.commonsio}</bundle>
<bundle
dependency="true">mvn:org.apache.thrift/libthrift/${ver.libthrift}</bundle>
diff --git a/apache-jena-osgi/jena-osgi/pom.xml
b/apache-jena-osgi/jena-osgi/pom.xml
index 55c7ee7..1af0892 100644
--- a/apache-jena-osgi/jena-osgi/pom.xml
+++ b/apache-jena-osgi/jena-osgi/pom.xml
@@ -123,7 +123,14 @@
<version>3.15.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-commonsrdf</artifactId>
+ <version>3.15.0-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-tdb</artifactId>
@@ -233,6 +240,10 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-rdf-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>5.0.0</version>
@@ -271,6 +282,8 @@
-->
<Private-Package>org.apache.jena.ext.*</Private-Package>
<Bundle-Activator>org.apache.jena.osgi.Activator</Bundle-Activator>
+ <Provide-Capability>osgi.serviceloader;
osgi.serviceloader=org.apache.commons.rdf.api.RDF</Provide-Capability>
+ <Require-Capability>osgi.extender;
filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability>
</instructions>
</configuration>
</plugin>
diff --git a/jena-extras/jena-commonsrdf/pom.xml
b/jena-extras/jena-commonsrdf/pom.xml
index 9d8dd30..bc033b6 100644
--- a/jena-extras/jena-commonsrdf/pom.xml
+++ b/jena-extras/jena-commonsrdf/pom.xml
@@ -38,7 +38,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <ver.commonsrdf>0.5.0</ver.commonsrdf>
<automatic.module.name>org.apache.jena.commonsrdf</automatic.module.name>
</properties>
@@ -53,7 +52,6 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-rdf-api</artifactId>
- <version>${ver.commonsrdf}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index ea69167..67a3416 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,7 @@
<ver.commonsio>2.6</ver.commonsio>
<ver.commonscli>1.4</ver.commonscli>
<ver.commonslang3>3.9</ver.commonslang3>
+ <ver.commonsrdf>0.5.0</ver.commonsrdf>
<ver.commonscsv>1.7</ver.commonscsv>
<ver.commons-codec>1.14</ver.commons-codec>
<ver.commons-compress>1.19</ver.commons-compress>
@@ -575,6 +576,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-rdf-api</artifactId>
+ <version>${ver.commonsrdf}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.xenei</groupId>
<artifactId>junit-contracts</artifactId>
<version>${ver.contract.tests}</version>
