Merge branch 'master' into unmanaged-install-9211

components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/pom.xml

@@ -79,7 +79,8 @@
                             io.entgra.device.mgt.core.device.mgt.extensions.license.mgt.registry,
                             javax.net.ssl,
                             org.wso2.carbon.core.util,
-                            okhttp3
+                            okhttp3,
+                            com.google.common.cache.*
                         </Import-Package>
                         <Export-Package>
                             !io.entgra.device.mgt.core.operation.template.internal,
@@ -300,6 +301,8 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
+            <version>${guava.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>

components/operation-template-mgt/io.entgra.device.mgt.core.operation.template/src/main/java/io/entgra/device/mgt/core/operation/template/internal/OperationTemplateMgtServiceComponent.java

@@ -31,7 +31,7 @@ import org.osgi.service.component.ComponentContext;
 import org.wso2.carbon.ndatasource.core.DataSourceService;
 
 /**
- * @scr.component name="io.entgra.device.mgt.operation.template.internal.OperationTemplateMgtServiceComponent" immediate="true"
+ * @scr.component name="io.entgra.device.mgt.core.operation.template.internal.OperationTemplateMgtServiceComponent" immediate="true"
  * immediate="true"
  * @scr.reference name="org.wso2.carbon.ndatasource"
  * interface="org.wso2.carbon.ndatasource.core.DataSourceService"