Prefer OSGi bundles, incl. jsonld-java 0.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/43bf72fc Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/43bf72fc Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/43bf72fc Branch: refs/heads/master Commit: 43bf72fcd426bdfe2d6a033c279b4edd0c653d31 Parents: 8a6b282 Author: Stian Soiland-Reyes <[email protected]> Authored: Wed Oct 29 01:44:36 2014 +0000 Committer: Stian Soiland-Reyes <[email protected]> Committed: Mon Jan 12 01:19:14 2015 +0000 ---------------------------------------------------------------------- jena-bundle/pom.xml | 76 ++++++++++++++++++++++++++++++++++++++++++++---- jena-parent/pom.xml | 8 +++++ 2 files changed, 78 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/43bf72fc/jena-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/jena-bundle/pom.xml b/jena-bundle/pom.xml index 0651766..9e167a1 100644 --- a/jena-bundle/pom.xml +++ b/jena-bundle/pom.xml @@ -54,6 +54,29 @@ <artifactId>jena-arq</artifactId> <version>${ver.jena}</version> <scope>provided</scope> + <exclusions> + <!-- These are all embedded within httpclient-osgi --> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-cache</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>fluent-hc</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -95,13 +118,54 @@ <!-- OSGi versions of Jena dependencies --> <dependency> <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient-osgi</artifactId> - <version>${ver.httpclient}</version> + <artifactId>httpclient-osgi</artifactId> + <version>${ver.httpclient}</version> + <exclusions> + <!-- These are all embedded within httpclient-osgi --> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-cache</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>fluent-hc</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore-osgi</artifactId> - <version>${ver.httpcore}</version> + <artifactId>httpcore-osgi</artifactId> + <version>${ver.httpcore}</version> + <exclusions> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore-osgi</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore-osgi-nio</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.github.jsonld-java</groupId> + <artifactId>jsonld-java</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-csv</artifactId> </dependency> </dependencies> @@ -112,8 +176,8 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Export-Package>com.hp.hpl.jena.*,org.apache.jena.*,org.openjena.riot.*</Export-Package> - <Embed-Dependency>*;scope=provided;groupId=!org.apache.httpcomponents</Embed-Dependency> + <Export-Package>com.hp.hpl.jena.*,org.apache.jena.*</Export-Package> + <Embed-Dependency>*;scope=provided;groupId=!org.apache.httpcomponents;groupId=!com.github.jsonld-java;groupId=!org.apache.commons.csv;groupId=!org.apache.thrift;artifactId=!commons-lang3</Embed-Dependency> <Embed-Transitive>true</Embed-Transitive> <Import-Package>!sun.io,!org.apache.avalon.framework.logger,!com.ibm.uvm.tools,!com.sun.jdmk.comm,!org.apache.log,*</Import-Package> </instructions> http://git-wip-us.apache.org/repos/asf/jena/blob/43bf72fc/jena-parent/pom.xml ---------------------------------------------------------------------- diff --git a/jena-parent/pom.xml b/jena-parent/pom.xml index b5ab62c..9e25137 100644 --- a/jena-parent/pom.xml +++ b/jena-parent/pom.xml @@ -51,6 +51,8 @@ <ver.junit>4.11</ver.junit> <ver.xerces>2.11.0</ver.xerces> <ver.jsonldjava>0.5.1</ver.jsonldjava> + <ver.commons-fileupload>1.3.1</ver.commons-fileupload> + <ver.commons-csv>1.0</ver.commons-csv> <!-- These are connected because solr4j depends on httpclient as well --> <ver.httpclient>4.2.6</ver.httpclient> @@ -165,6 +167,12 @@ </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-csv</artifactId> + <version>${ver.commons-csv}</version> + </dependency> + + <dependency> <groupId>com.github.jsonld-java</groupId> <artifactId>jsonld-java</artifactId> <version>${ver.jsonldjava}</version>
