Bug 7926: exclude OSGi bundles from features

We need to avoid having OSGi core bundles pulled in by features (they
cause bundle refreshes which break Pax Exam tests). This patch marks
the OSGi bundles as provided, and excludes them from generated
features.

Change-Id: I66f519e4d498f956cb3fa087d98d30a64b3316f4
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 79e9f4842c8ccc05321e0dc8d65f41ea36887e54..78f581dda645144a0d821693c46506865f37d45a 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -931,7 +931,7 @@
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.compendium</artifactId>
-        <version>5.0.0</version>
+        <version>${osgi.core.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>

diff --git a/single-feature-parent/pom.xml b/single-feature-parent/pom.xml
index 4443b3905d247470b0b2a0efeb05169da3a2ef23..b9298c2ffcd77e24c0884ec3c12b8d9c8c2c1720 100644 (file)
--- a/single-feature-parent/pom.xml
+++ b/single-feature-parent/pom.xml
@@ -84,6 +84,10 @@
                         <excludedArtifactId>org.apache.karaf.jaas.modules</excludedArtifactId>
                         <excludedArtifactId>org.apache.karaf.shell.console</excludedArtifactId>
                         <excludedArtifactId>org.apache.karaf.shell.core</excludedArtifactId>
+                        <!-- OSGi -->
+                        <excludedArtifactId>org.osgi.compendium</excludedArtifactId>
+                        <excludedArtifactId>org.osgi.core</excludedArtifactId>
+                        <excludedArtifactId>org.osgi.enterprise</excludedArtifactId>
                     </excludedArtifactIds>
                 </configuration>
             </plugin>