From 43c13ff7fbc1e17583692d40c684ec40eb3e62d7 Mon Sep 17 00:00:00 2001
From: susinda <susinda@wso2.com>
Date: Tue, 15 Nov 2016 19:14:20 +0530
Subject: [PATCH 1/3] MQTT profile commented, apim.integration.feature added to
 base profile, apim-integration.xml copy logic added

---
 .../core/distribution/src/assembly/bin.xml    |  8 +++++++
 modules/core/p2-profile-gen/pom.xml           | 22 +++++++++----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 5ce94fe8..61a172ea 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -1228,5 +1228,13 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+        <!-- Copying apim-integration.xml -->
+        <file>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/apim-integration.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <destName>apim-integration.xml</destName>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
     </files>
 </assembly>
diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index 06900f48..fb6d4094 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -206,6 +206,9 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.apimgt:org.wso2.carbon.forum.server.feature:${carbon.api.mgt.version}
                                 </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.apim.integration.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
                                 <!-- End of API Management Features -->
 
                                 <!-- Carbon Commons Features -->
@@ -844,6 +847,10 @@
                                     <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.apim.integration.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -941,6 +948,8 @@
                                     <id>org.wso2.carbon.forum.server.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
                                 </feature>
+                                
+                      
                                 <!-- End of API Management Features -->
 
                                 <!-- Carbon Analytics Common Features -->
@@ -1401,7 +1410,7 @@
                             </features>
                         </configuration>
                     </execution>
-                    <!--MQTT profile-->
+                    <!--MQTT profile>
                     <execution>
                         <id>4-p2-profile-generation</id>
                         <phase>package</phase>
@@ -1417,13 +1426,10 @@
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
-                                <!-- IoTServer Features -->
                                 <feature>
                                     <id>org.wso2.iot.core.styles.feature.group</id>
                                     <version>${product.iot.version}</version>
                                 </feature>
-                                <!-- End of IoTServer Features -->
-                                <!-- App management features-->
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.core.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
@@ -1448,7 +1454,6 @@
                                     <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
-                                <!-- End of app management features-->
                                 <feature>
                                     <id>org.wso2.carbon.logging.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -1497,7 +1502,6 @@
                                     <id>org.wso2.carbon.registry.ws.feature.group</id>
                                     <version>${carbon.registry.version}</version>
                                 </feature>
-                                <!--required for context.xml-->
                                 <feature>
                                     <id>org.wso2.carbon.webapp.mgt.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
@@ -1522,9 +1526,6 @@
                                     <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <!--end required for context.xml-->
-
-                                <!-- Features required for axis2.xml-->
                                 <feature>
                                     <id>org.apache.synapse.wso2.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
@@ -1557,7 +1558,6 @@
                                     <id>org.wso2.carbon.mediation.admin.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
                                 </feature>
-                                <!-- End of Mediation Features -->
                                 <feature>
                                     <id>org.wso2.carbon.tenant.common.feature.group</id>
                                     <version>${carbon.multitenancy.version}</version>
@@ -1592,7 +1592,7 @@
                                 </feature>
                             </features>
                         </configuration>
-                    </execution>
+                    </execution-->
                     <!--Http Gateway Profile-->
                     <execution>
                         <id>5-p2-profile-generation</id>

From 359eabde494ea18852456858bc8f3fff62bc9549 Mon Sep 17 00:00:00 2001
From: susinda <susinda@wso2.com>
Date: Wed, 16 Nov 2016 10:53:04 +0530
Subject: [PATCH 2/3] reverting commit 'MQTT profile commented,
 apim.integration.feature added'

---
 .../core/distribution/src/assembly/bin.xml    |  8 -------
 modules/core/p2-profile-gen/pom.xml           | 22 +++++++++----------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules/core/distribution/src/assembly/bin.xml
index 61a172ea..5ce94fe8 100644
--- a/modules/core/distribution/src/assembly/bin.xml
+++ b/modules/core/distribution/src/assembly/bin.xml
@@ -1228,13 +1228,5 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
-        <!-- Copying apim-integration.xml -->
-        <file>
-            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/apim-integration.xml</source>
-            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
-            <destName>apim-integration.xml</destName>
-            <filtered>true</filtered>
-            <fileMode>644</fileMode>
-        </file>
     </files>
 </assembly>
diff --git a/modules/core/p2-profile-gen/pom.xml b/modules/core/p2-profile-gen/pom.xml
index fb6d4094..06900f48 100644
--- a/modules/core/p2-profile-gen/pom.xml
+++ b/modules/core/p2-profile-gen/pom.xml
@@ -206,9 +206,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.apimgt:org.wso2.carbon.forum.server.feature:${carbon.api.mgt.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.apim.integration.feature:${carbon.device.mgt.version}
-                                </featureArtifactDef>
                                 <!-- End of API Management Features -->
 
                                 <!-- Carbon Commons Features -->
@@ -847,10 +844,6 @@
                                     <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.apimgt.apim.integration.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -948,8 +941,6 @@
                                     <id>org.wso2.carbon.forum.server.feature.group</id>
                                     <version>${carbon.api.mgt.version}</version>
                                 </feature>
-                                
-                      
                                 <!-- End of API Management Features -->
 
                                 <!-- Carbon Analytics Common Features -->
@@ -1410,7 +1401,7 @@
                             </features>
                         </configuration>
                     </execution>
-                    <!--MQTT profile>
+                    <!--MQTT profile-->
                     <execution>
                         <id>4-p2-profile-generation</id>
                         <phase>package</phase>
@@ -1426,10 +1417,13 @@
                             </destination>
                             <deleteOldProfileFiles>true</deleteOldProfileFiles>
                             <features>
+                                <!-- IoTServer Features -->
                                 <feature>
                                     <id>org.wso2.iot.core.styles.feature.group</id>
                                     <version>${product.iot.version}</version>
                                 </feature>
+                                <!-- End of IoTServer Features -->
+                                <!-- App management features-->
                                 <feature>
                                     <id>org.wso2.carbon.appmgt.core.feature.group</id>
                                     <version>${appmgt.feature.version}</version>
@@ -1454,6 +1448,7 @@
                                     <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+                                <!-- End of app management features-->
                                 <feature>
                                     <id>org.wso2.carbon.logging.mgt.feature.group</id>
                                     <version>${carbon.commons.version}</version>
@@ -1502,6 +1497,7 @@
                                     <id>org.wso2.carbon.registry.ws.feature.group</id>
                                     <version>${carbon.registry.version}</version>
                                 </feature>
+                                <!--required for context.xml-->
                                 <feature>
                                     <id>org.wso2.carbon.webapp.mgt.feature.group</id>
                                     <version>${carbon.deployment.version}</version>
@@ -1526,6 +1522,9 @@
                                     <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
+                                <!--end required for context.xml-->
+
+                                <!-- Features required for axis2.xml-->
                                 <feature>
                                     <id>org.apache.synapse.wso2.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
@@ -1558,6 +1557,7 @@
                                     <id>org.wso2.carbon.mediation.admin.feature.group</id>
                                     <version>${carbon.mediation.version}</version>
                                 </feature>
+                                <!-- End of Mediation Features -->
                                 <feature>
                                     <id>org.wso2.carbon.tenant.common.feature.group</id>
                                     <version>${carbon.multitenancy.version}</version>
@@ -1592,7 +1592,7 @@
                                 </feature>
                             </features>
                         </configuration>
-                    </execution-->
+                    </execution>
                     <!--Http Gateway Profile-->
                     <execution>
                         <id>5-p2-profile-generation</id>

From 669ab894f9c9e3645343e5d52c2ee8e7d516d243 Mon Sep 17 00:00:00 2001
From: charitha <charitha.ws@gmail.com>
Date: Wed, 16 Nov 2016 13:33:26 +0530
Subject: [PATCH 3/3] Update component versions for IoTS-1.0.0 release

---
 .../distribution/src/resources/samples/samples-deployer.xml | 2 +-
 pom.xml                                                     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/distribution/src/resources/samples/samples-deployer.xml b/modules/distribution/src/resources/samples/samples-deployer.xml
index 34d22b31..c06d4e47 100644
--- a/modules/distribution/src/resources/samples/samples-deployer.xml
+++ b/modules/distribution/src/resources/samples/samples-deployer.xml
@@ -206,6 +206,6 @@
         </repository>
     </repositories>
     <properties>
-        <carbon.device.mgt.plugin.version>2.2.6-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.0-SNAPSHOT</carbon.device.mgt.plugin.version>
     </properties>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6269fb20..e9527e27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1542,14 +1542,14 @@
         <carbon.governance.version>4.6.4</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.2.7-SNAPSHOT</carbon.device.mgt.version>
-        <carbon.device.mgt.version.range>[1.1.1, 2.0.0)</carbon.device.mgt.version.range>
+        <carbon.device.mgt.version>2.0.0-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>1.0.0-SNAPSHOT</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-        <carbon.device.mgt.plugin.version>2.2.6-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.0-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.0.5</carbon.api.mgt.version>