54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
From 0dbf23a1e17d88b06bd6a7b39d686f1efe6179a6 Mon Sep 17 00:00:00 2001
|
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
|
Date: Mon, 30 Apr 2012 20:25:01 +0200
|
|
Subject: [PATCH 1/2] Unbundle libraries
|
|
|
|
---
|
|
pom.xml | 16 ++++------------
|
|
1 file changed, 4 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index 745b6f7..a111f55 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -69,13 +69,6 @@
|
|
<groupId>net.sf.kxml</groupId>
|
|
<artifactId>kxml2</artifactId>
|
|
<version>2.3.0</version>
|
|
- <optional>true</optional>
|
|
- <exclusions>
|
|
- <exclusion>
|
|
- <groupId>xmlpull</groupId>
|
|
- <artifactId>xmlpull</artifactId>
|
|
- </exclusion>
|
|
- </exclusions>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.osgi</groupId>
|
|
@@ -123,18 +116,16 @@
|
|
org.osgi.service.repository,
|
|
org.apache.felix.bundlerepository;version="2.1"
|
|
</Export-Package>
|
|
- <Private-Package>
|
|
- org.kxml2.io,
|
|
- org.xmlpull.v1,
|
|
- org.apache.felix.bundlerepository.impl.*,
|
|
- org.apache.felix.utils.*
|
|
- </Private-Package>
|
|
<!-- The org.osgi.service.repository;resolution:=mandatory seems strange below, but otherwise the maven-bundle-plugin
|
|
will make that import optional, which we don't want... -->
|
|
<!-- The version range on org.osgi.service.repository is required as we are a provider of the 1.0.0 API. -->
|
|
<Import-Package>
|
|
!javax.xml.parsers,
|
|
!org.xml.sax,
|
|
+ org.kxml2.io;resolution=mandatory,
|
|
+ org.xmlpull.v1;resolution=mandatory,
|
|
+ org.apache.felix.utils.*;resolution=mandatory,
|
|
+ org.apache.felix.bundlerepository.impl.*;resolution:=mandatory,
|
|
org.osgi.service.repository;resolution:=mandatory;version="[1.0,1.1)",
|
|
org.osgi.service.log;resolution:=optional,
|
|
org.osgi.service.obr;resolution:=optional,
|
|
--
|
|
2.9.3
|
|
|