fixes #737

hawtio · Nov 12, 2013 · 331a080 · 331a080
1 parent 790bffe
commit 331a080
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 6 deletions.
diff --git a/hawtio-git/pom.xml b/hawtio-git/pom.xml
@@ -8,10 +8,31 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>hawtio-git</artifactId>
+  <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
   <description>hawtio :: hawtio-git</description>
 
   <properties>
+    <fuse.osgi.export>
+      io.hawt.git,
+      com.jcraft.jzlib;version=${jcraft-jzlib-version},
+      com.jcraft.jsch;version=${jcraft-version},
+      org.gitective*;version=${gitective-version},
+      javaewah*;version=${javaewah-version},
+    </fuse.osgi.export>
+    <fuse.osgi.import>
+<!--
+      com.jcraft.jzlib;version=${jcraft-jzlib-version},
+      com.jcraft.jsch;version=${jcraft-version},
+-->
+      org.gitective*;version=${gitective-version},
+      javaewah*;version=${javaewah-version},
+      !javax.servlet,
+      !keypairgen,
+      !signature,
+      !userauth,
+      *
+    </fuse.osgi.import>
   </properties>
 
   <dependencies>
@@ -39,17 +60,25 @@
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
       <version>${jgit-version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.gitective</groupId>
       <artifactId>gitective-core</artifactId>
-      <version>0.9.9</version>
+      <version>${gitective-version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.eclipse.jgit</groupId>
           <artifactId>org.eclipse.jgit</artifactId>
         </exclusion>
       </exclusions>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.jcraft</groupId>
+      <artifactId>jzlib</artifactId>
+      <version>${jcraft-jzlib-version}</version>
+      <scope>provided</scope>
     </dependency>
 
     <!-- Git HTTP Servlet -->
@@ -89,5 +118,43 @@
   </dependencies>
 
   <build>
+    <plugins>
+      <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>
+          <supportedProjectTypes>
+            <supportedProjectType>jar</supportedProjectType>
+            <supportedProjectType>bundle</supportedProjectType>
+            <supportedProjectType>war</supportedProjectType>
+          </supportedProjectTypes>
+          <instructions>
+            <Export-Package>${fuse.osgi.export}</Export-Package>
+            <Import-Package>${fuse.osgi.import}</Import-Package>
+
+            <!-- TODO note we're embedding hawtio-core in here as its not yet a bundle and is often included in the war -->
+            <Embed-Dependency>*;inline=true;artifactId=hawtio-core|gitective-core|jsch|jzlib|JavaEWAH|org.eclipse.jgit*</Embed-Dependency>
+            <Embed-Transitive>true</Embed-Transitive>
+
+            <Bundle-Name>${project.description}</Bundle-Name>
+            <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+
+            <Implementation-Title>HawtIO</Implementation-Title>
+            <Implementation-Version>${project.version}</Implementation-Version>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
 </project>
diff --git a/hawtio-karaf/src/main/resources/features.xml b/hawtio-karaf/src/main/resources/features.xml
@@ -31,11 +31,7 @@
       hawtio.config.cloneOnStartup=true
     </config>
 
-    <bundle>fab:mvn:com.jcraft/jsch/0.1.44-1</bundle>
-    <bundle>fab:mvn:org.gitective/gitective-core/0.9.9</bundle>
-    <bundle>mvn:org.eclipse.jgit/org.eclipse.jgit/${jgit-version}</bundle>
-    <bundle>mvn:org.eclipse.jgit/org.eclipse.jgit.http.server/${jgit-version}</bundle>
-    <bundle>fab:mvn:io.hawt/hawtio-git/${project.version}</bundle>
+    <bundle>mvn:io.hawt/hawtio-git/${project.version}</bundle>
   </feature>
 
   <feature name="hawtio-dev-mode" version="${project.version}" resolver="(obr)">

diff --git a/pom.xml b/pom.xml
@@ -83,6 +83,7 @@
     -->
     <fmc-version>${fabric-version}</fmc-version>
     <felix.gogo.version>0.10.0</felix.gogo.version>
+    <gitective-version>0.9.9</gitective-version>
 
     <!-- We are using an old guava to avoid breaking ActiveMQ in the test cases of hawtio-web -->
     <!--
@@ -98,7 +99,10 @@
     <!-- TODO until build 16 is done we need snapshot to get maven coords on stack frames -->
     <insight-log4j.version>${fabric-version}</insight-log4j.version>
     <jackson-version>2.1.4</jackson-version>
+    <javaewah-version>0.5.6</javaewah-version>
     <jaxb-version>2.1.13</jaxb-version>
+    <jcraft-version>0.1.46</jcraft-version>
+    <jcraft-jzlib-version>1.1.3</jcraft-jzlib-version>
 
     <!-- TODO lets use Jetty 7.x to avoid servlet 2.5 and 3.0 classpath clashes -->
 <!--