Fix #603

hawtio · Oct 1, 2013 · ec66bc7 · ec66bc7
1 parent c260c0f
commit ec66bc7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/hawtio-karaf-terminal/pom.xml b/hawtio-karaf-terminal/pom.xml
@@ -63,10 +63,11 @@
       <scope>provided</scope>
     </dependency>
 
+
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.console</artifactId>
-      <version>${karaf-version}</version>
+      <version>2.3.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -138,7 +139,7 @@
 
             <Import-Package>
               org.osgi.service.blueprint,
-              org.apache.felix.service.command,
+              org.apache.felix.service.command;resolution:=optional,
               javax.servlet,
               javax.servlet.http,
               org.ops4j.pax.web.service,

diff --git a/hawtio-karaf/src/main/resources/features.xml b/hawtio-karaf/src/main/resources/features.xml
@@ -54,6 +54,7 @@
 
   <feature name="hawtio-karaf-terminal" version="${project.version}" resolver="(obr)">
     <details>A terminal plugin for hawtio when installed in Karaf</details>
+    <bundle>mvn:jline/jline/${jline.version}</bundle>
     <bundle>mvn:io.hawt/hawtio-karaf-terminal/${project.version}/war</bundle>
   </feature>
 

diff --git a/pom.xml b/pom.xml
@@ -82,7 +82,7 @@
     <fabric-version>99-master-SNAPSHOT</fabric-version>
     -->
     <fmc-version>${fabric-version}</fmc-version>
-    <felix.gogo.version>0.11.0.${perfectus-build}</felix.gogo.version>
+    <felix.gogo.version>0.10.0</felix.gogo.version>
 
     <!-- We are using an old guava to avoid breaking ActiveMQ in the test cases of hawtio-web -->
     <!--