Exclude httpcore dependencies (duplicate). Do not embed jackson (available as bundle)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/13380bf0 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/13380bf0 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/13380bf0 Branch: refs/heads/master Commit: 13380bf0ef290e1acf3f2d61d70f834d9bf6ecf9 Parents: cc01f80 Author: Stian Soiland-Reyes <[email protected]> Authored: Fri Oct 31 23:22:26 2014 +0000 Committer: Stian Soiland-Reyes <[email protected]> Committed: Mon Jan 12 01:19:15 2015 +0000 ---------------------------------------------------------------------- jena-osgi/pom.xml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/13380bf0/jena-osgi/pom.xml ---------------------------------------------------------------------- diff --git a/jena-osgi/pom.xml b/jena-osgi/pom.xml index b26b651..24a46b9 100644 --- a/jena-osgi/pom.xml +++ b/jena-osgi/pom.xml @@ -151,11 +151,11 @@ <exclusions> <exclusion> <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore-osgi</artifactId> + <artifactId>httpcore</artifactId> </exclusion> <exclusion> <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore-osgi-nio</artifactId> + <artifactId>httpcore-nio</artifactId> </exclusion> </exclusions> </dependency> @@ -167,6 +167,21 @@ bundle), drop <scope>provided so that we can use it as a real dependency --> </dependency> + <!-- + but until jsonld-java 0.5.1, we'll need to depend on jackson-databind and jackson-core ourselves + as bundles: + --> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${ver.jackson}</version> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${ver.jackson}</version> + </dependency> + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-csv</artifactId> @@ -181,7 +196,7 @@ <configuration> <instructions> <Export-Package>com.hp.hpl.jena.*,org.apache.jena.*</Export-Package> - <Embed-Dependency>*;scope=provided;groupId=!org.apache.httpcomponents;groupId=!org.apache.commons.csv;groupId=!org.apache.thrift;artifactId=!commons-lang3</Embed-Dependency> + <Embed-Dependency>*;scope=provided;groupId=!org.apache.httpcomponents;groupId=!org.apache.commons.csv;groupId=!org.apache.thrift;artifactId=!commons-lang3,groupId=!com.fasterxml.jackson.core</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>
