diff --git a/etc/sample-post-authentication-handler/pom.xml b/etc/sample-post-authentication-handler/pom.xml
index fea479583..1cf4eb3e8 100644
--- a/etc/sample-post-authentication-handler/pom.xml
+++ b/etc/sample-post-authentication-handler/pom.xml
@@ -78,7 +78,7 @@
                             javax.servlet.http,
                             org.apache.commons.logging,
                             org.osgi.framework,
-                            org.osgi.service.component,
+                            org.osgi.service.component.*;version="${osgi.service.component.imp.pkg.version.range}",
                             org.wso2.carbon.identity.application.authentication.framework.config,
                             org.wso2.carbon.identity.application.authentication.framework.config.model,
                             org.wso2.carbon.identity.application.authentication.framework.context,
diff --git a/pom.xml b/pom.xml
index 057465a5a..edd065101 100644
--- a/pom.xml
+++ b/pom.xml
@@ -857,7 +857,7 @@
         <identity.framework.version>7.0.110</identity.framework.version>
         <maven.compiler.plugin.version>3.6.1</maven.compiler.plugin.version>
         <maven.scr.plugin.version>1.22.0</maven.scr.plugin.version>
-        <maven.bundle.plugin.version>3.2.0</maven.bundle.plugin.version>
+        <maven.bundle.plugin.version>2.4.0</maven.bundle.plugin.version>
         <maven.buildnumber.plugin.version>1.4</maven.buildnumber.plugin.version>
         <http.client.version>4.5.13</http.client.version>
         <http.core.version>4.4.8</http.core.version>