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 2018/06/09 15:33:06 UTC
[1/3] jena git commit: Update OSGi imports
Repository: jena
Updated Branches:
refs/heads/master 30d093414 -> 1abeea488
Update OSGi imports
Resolves: JENA-1557
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/443d5697
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/443d5697
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/443d5697
Branch: refs/heads/master
Commit: 443d5697fc22c90172833695ec0bd01252e80a54
Parents: 2934c55
Author: Aaron Coburn <ac...@apache.org>
Authored: Wed Jun 6 12:33:47 2018 -0400
Committer: Aaron Coburn <ac...@apache.org>
Committed: Wed Jun 6 12:33:47 2018 -0400
----------------------------------------------------------------------
.../src/main/resources/features.xml | 5 ++++-
apache-jena-osgi/jena-osgi/pom.xml | 14 +++++++++++++-
2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/443d5697/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 a95270f..fd05e15 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
@@ -33,11 +33,14 @@
<bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${ver.jackson}</bundle>
<bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${ver.httpcore-osgi}</bundle>
<bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${ver.httpclient-osgi}</bundle>
+ <bundle>mvn:org.apache.commons/commons-compress/${ver.commons-compress}</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>
+ <bundle>mvn:org.apache.thrift/libthrift/${ver.libthrift}</bundle>
+ <!-- Guava 24.1 is required by jsonld-java -->
+ <bundle>mvn:com.google.guava/guava/24.1-jre</bundle>
</feature>
<feature name="xerces" version="2.11.0">
http://git-wip-us.apache.org/repos/asf/jena/blob/443d5697/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 4d4719c..c58983a 100644
--- a/apache-jena-osgi/jena-osgi/pom.xml
+++ b/apache-jena-osgi/jena-osgi/pom.xml
@@ -251,7 +251,19 @@
<Export-Package>org.apache.jena.*,!org.apache.jena.ext.*</Export-Package>
<Embed-Dependency>artifactId=jena*;inline=true</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
- <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.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.checkerframework.checker.*,
+ !org.apache.jena.ext.*,
+ sun.misc;resolution:=optional,
+ com.google.errorprone.annotations.*;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.jena.ext.*,sun.misc;resolution:=optional,*</Import-Package>
-->
[2/3] jena git commit: Remove xerxes feature, add dependency flags
Posted by an...@apache.org.
Remove xerxes feature, add dependency flags
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/19185607
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/19185607
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/19185607
Branch: refs/heads/master
Commit: 1918560781ff76032e2523b55aa6f046bf5dda92
Parents: 443d569
Author: Aaron Coburn <ac...@apache.org>
Authored: Fri Jun 8 09:31:42 2018 -0400
Committer: Aaron Coburn <ac...@apache.org>
Committed: Fri Jun 8 09:59:20 2018 -0400
----------------------------------------------------------------------
.../src/main/resources/features.xml | 35 ++++++++------------
apache-jena-osgi/jena-osgi/pom.xml | 4 +--
2 files changed, 16 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/19185607/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 fd05e15..857cfd6 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
@@ -21,31 +21,24 @@
<feature name="jena" version="${project.version}">
<bundle>mvn:org.apache.jena/jena-osgi/${project.version}</bundle>
<feature version="${project.version}">jena_osgi_dependencies</feature>
- <!-- This is normally exposed by Apache Karaf via root classloader -->
- <!--<feature version="2.11.0">xerces</feature>-->
</feature>
<feature name="jena_osgi_dependencies" version="${project.version}">
- <bundle>mvn:com.github.andrewoma.dexx/collection/${ver.dexxcollection}</bundle>
- <bundle>mvn:com.github.jsonld-java/jsonld-java/${ver.jsonldjava}</bundle>
- <bundle>mvn:com.fasterxml.jackson.core/jackson-core/${ver.jackson}</bundle>
- <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${ver.jackson}</bundle>
- <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${ver.jackson}</bundle>
- <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${ver.httpcore-osgi}</bundle>
- <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${ver.httpclient-osgi}</bundle>
- <bundle>mvn:org.apache.commons/commons-compress/${ver.commons-compress}</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>
+ <bundle dependency="true">mvn:com.github.andrewoma.dexx/collection/${ver.dexxcollection}</bundle>
+ <bundle dependency="true">mvn:com.github.jsonld-java/jsonld-java/${ver.jsonldjava}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${ver.jackson}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${ver.jackson}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${ver.jackson}</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpcore-osgi/${ver.httpcore-osgi}</bundle>
+ <bundle dependency="true">mvn:org.apache.httpcomponents/httpclient-osgi/${ver.httpclient-osgi}</bundle>
+ <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: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>
<!-- Guava 24.1 is required by jsonld-java -->
- <bundle>mvn:com.google.guava/guava/24.1-jre</bundle>
- </feature>
-
- <feature name="xerces" version="2.11.0">
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/2.11.0_1</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/1.2_5</bundle>
+ <bundle dependency="true">mvn:com.google.guava/guava/24.1-jre</bundle>
</feature>
</features>
http://git-wip-us.apache.org/repos/asf/jena/blob/19185607/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 c58983a..949026e 100644
--- a/apache-jena-osgi/jena-osgi/pom.xml
+++ b/apache-jena-osgi/jena-osgi/pom.xml
@@ -258,10 +258,10 @@
!com.ibm.uvm.tools,
!com.sun.jdmk.comm,
!org.apache.log,
- !org.checkerframework.checker.*,
!org.apache.jena.ext.*,
+ !org.checkerframework.checker.*,
+ !com.google.errorprone.annotations.*,
sun.misc;resolution:=optional,
- com.google.errorprone.annotations.*;resolution:=optional,
*
</Import-Package>
<!--
[3/3] jena git commit: JENA-1557: Merge commit 'refs/pull/428/head'
of https://github.com/apache/jena
Posted by an...@apache.org.
JENA-1557: Merge commit 'refs/pull/428/head' of https://github.com/apache/jena
This closes #428.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1abeea48
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1abeea48
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1abeea48
Branch: refs/heads/master
Commit: 1abeea488810e72723b7a9956e75a94cb55b1223
Parents: 30d0934 1918560
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jun 9 16:28:47 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jun 9 16:28:47 2018 +0100
----------------------------------------------------------------------
.../src/main/resources/features.xml | 34 +++++++++-----------
apache-jena-osgi/jena-osgi/pom.xml | 14 +++++++-
2 files changed, 28 insertions(+), 20 deletions(-)
----------------------------------------------------------------------