jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [2/3] jena git commit: Remove xerxes feature, add dependency flags
Date Sat, 09 Jun 2018 15:33:07 GMT
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 <acoburn@apache.org>
Authored: Fri Jun 8 09:31:42 2018 -0400
Committer: Aaron Coburn <acoburn@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>
             <!--


Mime
View raw message