From e76129ede3526ab518b55e97f1069795d22fe3af Mon Sep 17 00:00:00 2001
From: warunalakshitha <warudanu@gmail.com>
Date: Thu, 29 Sep 2016 01:12:15 +0530
Subject: [PATCH] Upgrade iot product to carbon 4.4.9 and latest component
 versions

---
 pom.xml | 89 ++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 50 insertions(+), 39 deletions(-)

diff --git a/pom.xml b/pom.xml
index 19ecdf55..14d8ca24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -748,12 +748,12 @@
                 <version>${wss4j.security.common.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.ws.commons.axiom</groupId>
+                <groupId>org.apache.ws.commons.axiom.wso2</groupId>
                 <artifactId>axiom-api</artifactId>
                 <version>${axiom-api.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.ws.commons.axiom</groupId>
+                <groupId>org.apache.ws.commons.axiom.wso2</groupId>
                 <artifactId>axiom-impl</artifactId>
                 <version>${axiom-api.version}</version>
             </dependency>
@@ -793,8 +793,8 @@
                 <version>${bcpkix-jdk15on.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.bouncycastle</groupId>
-                <artifactId>bcprov-jdk15on</artifactId>
+                <groupId>org.wso2.orbit.org.bouncycastle</groupId>
+                <artifactId>bcpkix-jdk15on</artifactId>
                 <version>${bcpkix-jdk15on.version}</version>
             </dependency>
             <dependency>
@@ -1026,7 +1026,7 @@
     <properties>
 
         <!--Carbon kernel versions-->
-        <carbon.kernel.version>4.4.3</carbon.kernel.version>
+        <carbon.kernel.version>4.4.9</carbon.kernel.version>
         <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
 
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
@@ -1035,7 +1035,7 @@
         <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
 
         <!--Jaggery -->
-        <jaggery.version>0.12.0</jaggery.version>
+        <jaggery.version>0.12.6</jaggery.version>
         <jaggery.extensions.version>1.5.2</jaggery.extensions.version>
         <jaggery.extensions.sso.version>1.5.2</jaggery.extensions.sso.version>
         <jaggery.extensions.carbon.version>1.5.2</jaggery.extensions.carbon.version>
@@ -1062,43 +1062,55 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Commons -->
-        <carbon.commons.version>4.4.9</carbon.commons.version>
+        <carbon.commons.version>4.5.4</carbon.commons.version>
 
         <!-- Carbon Deployment -->
-        <carbon.deployment.version>4.6.0</carbon.deployment.version>
+        <carbon.deployment.version>4.7.0</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.version>5.0.7</carbon.identity.version>
-        <carbon.identity.version.range>[5.0.7, 6.0.0)</carbon.identity.version.range>
+        <carbon.identity.framework.version>5.2.0</carbon.identity.framework.version>
+        <carbon.identity.framework.version.range>[5.2.0, 6.0.0)</carbon.identity.framework.version.range>
+        <identity.local.auth.basicauth.version>5.1.1</identity.local.auth.basicauth.version>
+        <identity.inbound.auth.openid.version>5.1.1</identity.inbound.auth.openid.version>
+        <identity.inbound.auth.saml.version>5.1.1</identity.inbound.auth.saml.version>
+        <identity.carbon.auth.saml2.version>5.1.2</identity.carbon.auth.saml2.version>
+        <identity.inbound.auth.oauth.version>5.1.2</identity.inbound.auth.oauth.version>
+        <identity.carbon.auth.mutual.ssl.version>5.1.1</identity.carbon.auth.mutual.ssl.version>
+        <identity.user.ws.version>5.1.2</identity.user.ws.version>
+        <identity.outbound.auth.requestpath.basicauth.version>5.1.1</identity.outbound.auth.requestpath.basicauth.version>
+        <identity.outbound.auth.requestpath.oauth.version>5.1.1</identity.outbound.auth.requestpath.oauth.version>
+        <identity.outbound.auth.samlsso.version>5.1.2</identity.outbound.auth.samlsso.version>
+
+        <!--JWT grant type extension feature-->
+        <identity.jwt.extension.version>1.0.2</identity.jwt.extension.version>
 
         <!-- Carbon Multi-tenancy -->
-        <carbon.multitenancy.version>4.5.0</carbon.multitenancy.version>
+        <carbon.multitenancy.version>4.6.0</carbon.multitenancy.version>
 
         <!-- Carbon Registry -->
-        <carbon.registry.version>4.4.8</carbon.registry.version>
-
+        <carbon.registry.version>4.5.6</carbon.registry.version>
         <!-- Carbon Governance -->
-        <carbon.governance.version>4.5.8</carbon.governance.version>
+        <carbon.governance.version>4.6.4</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>1.2.1</carbon.device.mgt.version>
-        <carbon.device.mgt.version.range>[1.1.3, 2.0.0)</carbon.device.mgt.version.range>
+        <carbon.device.mgt.version>1.2.2-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version.range>[1.1.1, 2.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>
 
         <!-- Carbon Device Management Plugins-->
-        <carbon.device.mgt.plugin.version>2.2.1</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>2.2.2-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
-        <carbon.api.mgt.version>5.0.5</carbon.api.mgt.version>
-        <orbit.version.pdfbox>1.8.10.wso2v2</orbit.version.pdfbox>
+        <carbon.api.mgt.version>6.0.5</carbon.api.mgt.version>
+        <carbon.api.mgt.version.range>(5.0.0,7.0.0]</carbon.api.mgt.version.range>
 
         <!-- Carbon Mediation -->
-        <carbon.mediation.version>4.5.1</carbon.mediation.version>
+        <carbon.mediation.version>4.6.6</carbon.mediation.version>
 
         <!-- Carbon Analytics Common (DAS) -->
-        <carbon.analytics.common.version>5.0.12-alpha</carbon.analytics.common.version>
+        <carbon.analytics.common.version>5.1.3</carbon.analytics.common.version>
 
         <!-- Tomcat -->
         <orbit.tomcat.version>7.0.59.wso2v1</orbit.tomcat.version>
@@ -1113,23 +1125,24 @@
         <axis2-transports.wso2.version>1.1.0-wso2v17</axis2-transports.wso2.version>
 
         <!--DAS-->
-        <carbon.analytics.version>1.0.6-ALPHA</carbon.analytics.version>
+        <carbon.analytics.version>1.2.8</carbon.analytics.version>
         <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
-        <carbon.dashboard.version>1.0.18</carbon.dashboard.version>
-        <shindig.version>1.0.18</shindig.version>
-        <carbon.event-processing.version>2.0.13-alpha</carbon.event-processing.version>
-        <carbon.data.version>4.3.4</carbon.data.version>
+        <carbon.dashboard.version>2.0.2</carbon.dashboard.version>
+        <shindig.version>2.0.2</shindig.version>
+        <carbon.event-processing.version>2.1.4</carbon.event-processing.version>
+        <carbon.data.version>4.3.6</carbon.data.version>
 
         <orbit.version.commons-httpclient>3.1.0.wso2v2</orbit.version.commons-httpclient>
         <wss4j.security.version>1.6.17</wss4j.security.version>
         <wss4j.security.common.version>2.0.0</wss4j.security.common.version>
-        <axiom-api.version>1.2.14</axiom-api.version>
+        <axiom-api.version>1.2.11.wso2v10</axiom-api.version>
+        <axiom.wso2.version>1.2.11.wso2v10</axiom.wso2.version>
         <log4j.version>1.2.17</log4j.version>
         <spring-web.version>3.0.5.RELEASE</spring-web.version>
         <spring-ws-security.version>2.1.0.RELEASE</spring-ws-security.version>
         <jaxws-rt.version>2.2.8</jaxws-rt.version>
         <saaj-impl.version>1.3.18</saaj-impl.version>
-        <bcpkix-jdk15on.version>1.49</bcpkix-jdk15on.version>
+        <bcpkix-jdk15on.version>1.52.0.wso2v2</bcpkix-jdk15on.version>
         <plexus-utils.version>3.0.21</plexus-utils.version>
         <commons-codec.version>1.7</commons-codec.version>
         <joda-time.version>2.2</joda-time.version>
@@ -1137,17 +1150,18 @@
         <jsr311-api.version>1.1.1</jsr311-api.version>
         <google.gson.version>2.3.1</google.gson.version>
 
+        <!-- Caramel version-->
+        <caramel.version>1.0.1</caramel.version>
+
         <!-- App manager version-->
-        <appmgt.feature.version>1.1.1</appmgt.feature.version>
-        <carbon.appmgt.version>1.1.1</carbon.appmgt.version>
+        <appmgt.feature.version>1.2.2</appmgt.feature.version>
+        <carbon.appmgt.version>1.2.2</carbon.appmgt.version>
 
         <!-- Carbon Store version-->
-        <carbon.store.version>1.4.1</carbon.store.version>
+        <carbon.store.version>1.4.2</carbon.store.version>
         <!-- Cipher tool version-->
         <cipher.tool.version>1.0.0-wso2v3</cipher.tool.version>
 
-        <httpclient.version>4.3.1.wso2v2</httpclient.version>
-
         <!--XMPP/MQTT Version-->
         <smack.wso2.version>3.0.4.wso2v1</smack.wso2.version>
         <smackx.wso2.version>3.0.4.wso2v1</smackx.wso2.version>
@@ -1160,12 +1174,9 @@
         <product.mb.version>3.1.2</product.mb.version>
         <carbon.metrics.version>1.2.0</carbon.metrics.version>
 
-        <!--JWT grant type extension feature-->
-        <identity.jwt.extension.version>1.0.2</identity.jwt.extension.version>
         <!--http client version-->
-        <httpclient.version>4.3.1.wso2v2</httpclient.version>
-        <httpclient.version.range>[4.3.1, 5.0.0)</httpclient.version.range>
-        <httpcore.version>4.3.3.wso2v1</httpcore.version>
+        <httpclient.version>4.5.2</httpclient.version>
+        <httpcore.version>4.4.1</httpcore.version>
         <!--json version-->
         <json-simple.version>1.1.wso2v1</json-simple.version>
         <json.path.version>0.9.1</json.path.version>
@@ -1174,7 +1185,7 @@
         <eclipse.paho.version>1.0.2</eclipse.paho.version>
 
         <!-- CDMF Analytics -->
-        <cdmf.analytics.version>1.0.0</cdmf.analytics.version>
+        <cdmf.analytics.version>1.0.1-SNAPSHOT</cdmf.analytics.version>
     </properties>
 
     <scm>