Merge branch 'master' into feature/operation-template

iot-core/pom.xml

@@ -375,6 +375,12 @@
                                 </featureArtifactDef>
                                 <!-- End of Notification Logger Feature-->
 
+                                <!-- Operation Template Mgt Feature-->
+                                <featureArtifactDef>
+                                    io.entgra.device.mgt.core:io.entgra.device.mgt.core.operation.template.feature:${io.entgra.device.mgt.core.version}
+                                </featureArtifactDef>
+                                <!-- End of Operation Template Mgt Feature-->
+
                                 <!-- APIM analytics extension feature-->
                                 <featureArtifactDef>
                                     io.entgra.device.mgt.core:io.entgra.device.mgt.core.apimgt.analytics.extension.feature:${io.entgra.device.mgt.core.version}
@@ -386,6 +392,7 @@
                                     io.entgra.device.mgt.core:io.entgra.device.mgt.core.tenant.mgt.server.feature:${io.entgra.device.mgt.core.version}
                                 </featureArtifactDef>
                                 <!-- End of Tenant Management Feature -->
+
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -558,6 +565,12 @@
                                     <version>${io.entgra.device.mgt.core.version}</version>
                                 </feature>
 
+                                <!--Operation Template mgt-->
+                                <feature>
+                                    <id>io.entgra.device.mgt.core.operation.template.feature.group</id>
+                                    <version>${io.entgra.device.mgt.core.version}</version>
+                                </feature>
+
                                 <!--APIM Analytics extension-->
                                 <feature>
                                     <id>io.entgra.device.mgt.core.apimgt.analytics.extension.feature.group</id>