FELIX-4279, FELIX-4280:
- ensure the org.osgi.service.useradmin package is exported by our
implementation as well;
- ensure the correct import dependencies are used, without hard
dependencies on other optional services (such as EventAdmin);
- stripped the itests from all redundant bundles to verify this.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1531234 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/useradmin/itest/src/test/java/org/apache/felix/useradmin/itest/BaseIntegrationTest.java b/useradmin/itest/src/test/java/org/apache/felix/useradmin/itest/BaseIntegrationTest.java
index a2dd198..4f6746f 100644
--- a/useradmin/itest/src/test/java/org/apache/felix/useradmin/itest/BaseIntegrationTest.java
+++ b/useradmin/itest/src/test/java/org/apache/felix/useradmin/itest/BaseIntegrationTest.java
@@ -78,9 +78,6 @@
url("link:classpath:META-INF/links/org.ops4j.pax.swissbox.framework.link").startLevel(START_LEVEL_SYSTEM_BUNDLES),
url("link:classpath:META-INF/links/org.apache.geronimo.specs.atinject.link").startLevel(START_LEVEL_SYSTEM_BUNDLES),
-// mavenBundle("org.osgi", "org.osgi.core").version("4.2.0").startLevel(START_LEVEL_SYSTEM_BUNDLES),
- mavenBundle("org.osgi", "org.osgi.compendium").version("4.2.0").startLevel(START_LEVEL_SYSTEM_BUNDLES),
- mavenBundle("org.apache.felix", "org.apache.felix.log").version("1.0.1").startLevel(START_LEVEL_SYSTEM_BUNDLES),
mavenBundle("org.apache.felix", ORG_APACHE_FELIX_USERADMIN).versionAsInProject().startLevel(START_LEVEL_SYSTEM_BUNDLES),
mavenBundle("org.apache.felix", ORG_APACHE_FELIX_USERADMIN_FILESTORE).versionAsInProject().startLevel(START_LEVEL_SYSTEM_BUNDLES),
diff --git a/useradmin/useradmin/pom.xml b/useradmin/useradmin/pom.xml
index d8bfa68..554d2e8 100644
--- a/useradmin/useradmin/pom.xml
+++ b/useradmin/useradmin/pom.xml
@@ -72,10 +72,13 @@
</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Import-Package>
- org.osgi.service.useradmin; version="[1.1,1.2)",
- *
+ org.osgi.framework;version="[1.5,2.0)",
+ org.osgi.service.useradmin; version="[1.1,1.2)",
+ org.osgi.service.event; version="[1.0,2)"; resolution:=optional,
+ *
</Import-Package>
<Export-Package>
+ org.osgi.service.useradmin; version="1.1",
${project.artifactId}; version="1.0.0"
</Export-Package>
<Private-Package>