diff --git a/felix-gogo-runtime.spec b/felix-gogo-runtime.spec
index dca7e1a..ad5309a 100644
--- a/felix-gogo-runtime.spec
+++ b/felix-gogo-runtime.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package felix-gogo-runtime
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %global bundle  org.apache.felix.gogo.runtime
 Name:           felix-gogo-runtime
-Version:        1.1.0
+Version:        1.1.6
 Release:        0
 Summary:        Apache Felix Gogo command line shell for OSGi
 License:        Apache-2.0
@@ -28,7 +28,8 @@ Source0:        http://archive.apache.org/dist/felix/%{bundle}-%{version}-source
 Source1:        %{bundle}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
+BuildRequires:  osgi-annotation
 BuildRequires:  osgi-compendium
 BuildRequires:  osgi-core
 BuildArch:      noarch
@@ -48,12 +49,22 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{bundle}-%{version}
 cp %{SOURCE1} build.xml
 
-%pom_remove_parent
-%pom_xpath_inject pom:project "<groupId>org.apache.felix</groupId>"
+# Use compendium dep
+%pom_remove_dep :org.osgi.namespace.service
+%pom_remove_dep :org.osgi.service.component.annotations
+%pom_remove_dep :org.osgi.service.event
+%pom_xpath_inject "pom:dependencies" "
+<dependency>
+<groupId>org.osgi</groupId>
+<artifactId>osgi.cmpn</artifactId>
+</dependency>"
+
+%pom_change_dep junit: :::test
+%pom_change_dep org.mockito: :::test
 
 %build
 mkdir -p lib
-build-jar-repository -s lib osgi-core osgi-compendium
+build-jar-repository -s lib osgi-annotation osgi-core osgi-compendium
 %{ant} jar javadoc
 
 %install
@@ -63,7 +74,7 @@ install -m 644 target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}/felix/%{b
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}/felix
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom
 %add_maven_depmap felix/%{bundle}.pom felix/%{bundle}.jar
 
 # javadoc
diff --git a/org.apache.felix.gogo.runtime-1.1.0-source-release.tar.gz b/org.apache.felix.gogo.runtime-1.1.0-source-release.tar.gz
deleted file mode 100644
index 518e340..0000000
--- a/org.apache.felix.gogo.runtime-1.1.0-source-release.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d629b24ba1cfa3f7fae2d1028c36261c108d96c7286437fe745540f4e29d78b4
-size 113996
diff --git a/org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz b/org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz
new file mode 100644
index 0000000..b6ce8b9
--- /dev/null
+++ b/org.apache.felix.gogo.runtime-1.1.6-source-release.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d84b5945df650a1bf4f171328d7ef90052a16f7a9f9c6413def4294bb87b780d
+size 117060
diff --git a/org.apache.felix.gogo.runtime-build.xml b/org.apache.felix.gogo.runtime-build.xml
index c74ea74..e7d69a2 100644
--- a/org.apache.felix.gogo.runtime-build.xml
+++ b/org.apache.felix.gogo.runtime-build.xml
@@ -8,9 +8,10 @@
 
   <property name="project.groupId" value="org.apache.felix"/>
   <property name="project.artifactId" value="org.apache.felix.gogo.runtime"/>
-  <property name="project.version" value="1.1.0"/>
+  <property name="project.version" value="1.1.6"/>
   
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -51,6 +52,7 @@
            debug="true" 
            optimize="false" 
            deprecation="true" 
+           release="${compiler.release}" 
            target="${compiler.target}" 
            verbose="false" 
            fork="false" 
@@ -112,13 +114,14 @@
 		<attribute name="Bundle-SymbolicName" value="${project.artifactId}"/>
 		<attribute name="Bundle-Vendor" value="The Apache Software Foundation"/>
 		<attribute name="Bundle-Version" value="${project.version}"/>
-		<attribute name="Export-Package" value="org.apache.felix.gogo.runtime.activator;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.felix.gogo.runtime,org.apache.felix.service.command,org.apache.felix.service.threadio,org.osgi.framework&quot;,org.apache.felix.gogo.runtime.threadio;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.felix.service.threadio&quot;,org.apache.felix.gogo.runtime;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.felix.service.command,org.apache.felix.service.threadio,org.osgi.framework&quot;,org.apache.felix.service.command;version=&quot;1.0.0&quot;,org.apache.felix.service.threadio;version=&quot;1.0.0&quot;"/>
-		<attribute name="Import-Package" value="java.io,java.lang,java.lang.annotation,java.lang.invoke,java.lang.reflect,java.math,java.net,java.nio,java.nio.channels,java.nio.channels.spi,java.nio.file,java.nio.file.attribute,java.util,java.util.concurrent,java.util.concurrent.atomic,java.util.function,java.util.logging,java.util.regex,org.apache.felix.gogo.runtime.threadio;version=&quot;[1.1,2)&quot;,org.apache.felix.gogo.runtime;version=&quot;[1.1,2)&quot;,org.apache.felix.service.command;version=&quot;[1.0,2)&quot;,org.apache.felix.service.threadio;version=&quot;[1.0,2)&quot;,org.osgi.framework;version=&quot;[1.9,2)&quot;,org.osgi.service.event;resolution:=optional;version=&quot;[1.4,2)&quot;,org.osgi.util.tracker;version=&quot;[1.5,2)&quot;"/>
+		<attribute name="Export-Package" value="org.apache.felix.gogo.runtime.activator;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.felix.gogo.runtime,org.apache.felix.service.command,org.apache.felix.service.threadio,org.osgi.framework&quot;,org.apache.felix.gogo.runtime.threadio;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.felix.service.threadio&quot;,org.apache.felix.gogo.runtime;version=&quot;${project.version}&quot;;uses:=&quot;org.apache.felix.service.command,org.apache.felix.service.threadio,org.osgi.framework&quot;,org.apache.felix.service.command.annotations;version=&quot;1.0.0&quot;,org.apache.felix.service.command;version=&quot;1.0.0&quot;,org.apache.felix.service.threadio;version=&quot;1.0.0&quot;"/>
+		<attribute name="Import-Package" value="java.io,java.lang,java.lang.annotation,java.lang.reflect,java.math,java.net,java.nio,java.nio.channels,java.nio.channels.spi,java.nio.file,java.nio.file.attribute,java.util,java.util.concurrent,java.util.concurrent.atomic,java.util.logging,java.util.regex,org.apache.felix.gogo.runtime.threadio;version=&quot;[1.1,2)&quot;,org.apache.felix.service.command;version=&quot;[1.0,2)&quot;,org.apache.felix.service.threadio;version=&quot;[1.0,2)&quot;,org.osgi.framework;version=&quot;[1.10,2)&quot;,org.osgi.service.event;resolution:=optional;version=&quot;[1.4,2)&quot;,org.osgi.util.tracker;version=&quot;[1.5,2)&quot;"/>
+		<attribute name="Manifest-Version" value="1.0"/>
+		<attribute name="Provide-Capability" value="org.apache.felix.gogo;org.apache.felix.gogo=&quot;runtime.implementation&quot;;version:Version=&quot;1.0.0&quot;,osgi.service;objectClass=&quot;org.apache.felix.service.command.CommandProcessor&quot;,osgi.service;objectClass=&quot;org.apache.felix.service.threadio.ThreadIO&quot;"/>
 		<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
 		<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
 		<attribute name="JavaPackages-Version" value="${project.version}"/>
-		<attribute name="Provide-Capability" value="org.apache.felix.gogo;org.apache.felix.gogo=&quot;runtime.implementation&quot;;version:Version=&quot;1.0.0&quot;,osgi.service;effective:=active;objectClass=&quot;org.apache.felix.service.command.CommandProcessor&quot;,osgi.service;effective:=active;objectClass=&quot;org.apache.felix.service.threadio.ThreadIO&quot;"/>
-		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
+		<attribute name="Require-Capability" value="org.apache.felix.gogo;filter:=&quot;(&amp;(org.apache.felix.gogo=shell.implementation)(version>=1.0.0)(!(version>=2.0.0)))&quot;;effective:=active,osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=1.8))&quot;"/>
       </manifest>
     </jar>
   </target>