Merge pull request #275 from GPrathap/master

added a bundleDef :net.minidev:json-smart

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json

@@ -4,6 +4,8 @@
   "apiContext" : "api",
   "httpsURL" : "%https.ip%",
   "httpURL" : "%http.ip%",
+  "wssURL" : "%https.ip%",
+  "wsURL" : "%http.ip%",
   "enrollmentDir": "/emm-web-agent/enrollment",
   "iOSConfigRoot" : "%https.ip%/ios-enrollment/",
   "iOSAPIRoot" : "%https.ip%/ios/",

features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml

@@ -102,6 +102,9 @@
                                 <bundleDef>
                                     org.wso2.orbit.com.nimbusds:nimbus-jose-jwt:${nimbus.orbit.version}
                                 </bundleDef>
+                                <bundleDef>
+                                    net.minidev:json-smart:${json.smart.version}
+                                </bundleDef>
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}

pom.xml

@@ -1821,6 +1821,7 @@
         <nimbus.orbit.version>2.26.1.wso2v3</nimbus.orbit.version>
 
         <commons-json.version>2.0.0.wso2v1</commons-json.version>
+        <json.smart.version>1.3</json.smart.version>
         <google.gson.version>2.3.1</google.gson.version>
         <jsr311.version>1.1.1</jsr311.version>
         <commons.logging.version>1.2</commons.logging.version>