Fix #611

hawtio · Oct 3, 2013 · 64672b4 · 64672b4
1 parent fbdbc47
commit 64672b4
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/hawtio-karaf/src/main/resources/features.xml b/hawtio-karaf/src/main/resources/features.xml
@@ -13,7 +13,7 @@
 
   <feature name="hawtio-maven-indexer" version="${project.version}" resolver="(obr)">
     <details>Installs the hawtio maven indexer service as a separate bundle</details>
-    <bundle>fab:mvn:io.hawt/hawtio-maven-indexer/${project.version}</bundle>
+    <bundle>mvn:io.hawt/hawtio-maven-indexer/${project.version}</bundle>
   </feature>
 
   <feature name="hawtio-git" version="${project.version}" resolver="(obr)">

diff --git a/hawtio-maven-indexer/pom.xml b/hawtio-maven-indexer/pom.xml
@@ -10,8 +10,14 @@
   <artifactId>hawtio-maven-indexer</artifactId>
   <name>${project.artifactId}</name>
   <description>hawtio :: hawtio-maven-indexer</description>
+  <packaging>bundle</packaging>
 
   <properties>
+    <fuse.osgi.export>
+    </fuse.osgi.export>
+    <fuse.osgi.import>
+      *;resolution:=optional
+    </fuse.osgi.import>
   </properties>
 
   <dependencies>
@@ -20,6 +26,7 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <version>${slf4j-version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>io.hawt</groupId>
@@ -87,6 +94,37 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>${maven-bundle-plugin-version}</version>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <instructions>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Transitive>true</Embed-Transitive>
+            <Bundle-ClassPath>.</Bundle-ClassPath>
+            <Bundle-Name>${project.description}</Bundle-Name>
+            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+            <Import-Package>${fuse.osgi.import}</Import-Package>
+            <Export-Package>${fuse.osgi.export}</Export-Package>
+            <Implementation-Title>hawtio</Implementation-Title>
+            <Implementation-Version>${project.version}</Implementation-Version>
+          </instructions>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>