You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ja...@apache.org on 2013/10/11 10:59:14 UTC
svn commit: r1531234 - in /felix/trunk/useradmin:
itest/src/test/java/org/apache/felix/useradmin/itest/BaseIntegrationTest.java
useradmin/pom.xml
Author: jawi
Date: Fri Oct 11 08:59:14 2013
New Revision: 1531234
URL: http://svn.apache.org/r1531234
Log:
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.
Modified:
felix/trunk/useradmin/itest/src/test/java/org/apache/felix/useradmin/itest/BaseIntegrationTest.java
felix/trunk/useradmin/useradmin/pom.xml
Modified: felix/trunk/useradmin/itest/src/test/java/org/apache/felix/useradmin/itest/BaseIntegrationTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/useradmin/itest/src/test/java/org/apache/felix/useradmin/itest/BaseIntegrationTest.java?rev=1531234&r1=1531233&r2=1531234&view=diff
==============================================================================
--- felix/trunk/useradmin/itest/src/test/java/org/apache/felix/useradmin/itest/BaseIntegrationTest.java (original)
+++ felix/trunk/useradmin/itest/src/test/java/org/apache/felix/useradmin/itest/BaseIntegrationTest.java Fri Oct 11 08:59:14 2013
@@ -78,9 +78,6 @@ public abstract class BaseIntegrationTes
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),
Modified: felix/trunk/useradmin/useradmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/useradmin/useradmin/pom.xml?rev=1531234&r1=1531233&r2=1531234&view=diff
==============================================================================
--- felix/trunk/useradmin/useradmin/pom.xml (original)
+++ felix/trunk/useradmin/useradmin/pom.xml Fri Oct 11 08:59:14 2013
@@ -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>