FELIX-1711 use official OSGi libraries as dependencies, control
imported and exported package versions (to be able to work with
R4.0 Framework and Configuration Admin). Remove own copy of the
ComponentConstants, add 4.1 new start/stop methods to MockBundle
(for unit tests only)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@822622 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/pom.xml b/scr/pom.xml
index b4487f5..b204490 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -38,14 +38,14 @@
</scm>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.0</version>
+ <version>4.1.0</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.0.0</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -107,16 +107,29 @@
</Bundle-Activator>
<Export-Package>
org.apache.felix.scr;version=${pom.version},
- org.osgi.service.component;version=1.0;-split-package:=merge-first
+ org.osgi.service.component
</Export-Package>
<Private-Package>
org.apache.felix.scr.impl.*,
org.osgi.util.tracker
</Private-Package>
<Import-Package>
- org.osgi.service.cm;
+ <!--
+ The Felix Shell support is optional
+ -->
org.apache.felix.shell; resolution:=optional,
- *
+
+ <!--
+ Framework version 1.3 (from R4.0) is enough,
+ the Bundle.getBundleContext method is guarded
+ -->
+ org.osgi.framework;version=1.3,
+
+ <!--
+ Configuration Admin is optional and if it is
+ present, version 1.2 (from R4.0) is enough
+ -->
+ org.osgi.service.cm;version=1.2;resolution:=optional
</Import-Package>
<DynamicImport-Package>
org.osgi.service.log