community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wso2/product-iots

Browse Source
This commit is contained in:
geethkokila 2018-02-27 14:36:15 +05:30
commit 6606f944a3
2 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
modules/integration/tests-integration/src/test/resources/jmeter-scripts/AppManagerTest.jmx
View File

@ -962,6 +962,13 @@ vars.put(&quot;encoded&quot;, encoded);</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp> <boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">visibility</stringProp> <stringProp name="Argument.name">visibility</stringProp>
</elementProp> </elementProp>
<elementProp name="tags" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">false</boolProp>
<stringProp name="Argument.value"></stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">tags</stringProp>
</elementProp>
</collectionProp> </collectionProp>
</elementProp> </elementProp>
<stringProp name="HTTPSampler.domain">${server}</stringProp> <stringProp name="HTTPSampler.domain">${server}</stringProp>
@ -1622,6 +1629,13 @@ vars.put(&quot;encoded&quot;, encoded);</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp> <boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">visibility</stringProp> <stringProp name="Argument.name">visibility</stringProp>
</elementProp> </elementProp>
<elementProp name="tags" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">false</boolProp>
<stringProp name="Argument.value"></stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">tags</stringProp>
</elementProp>
</collectionProp> </collectionProp>
</elementProp> </elementProp>
<stringProp name="HTTPSampler.domain">${server}</stringProp> <stringProp name="HTTPSampler.domain">${server}</stringProp>
@ -1961,6 +1975,13 @@ vars.put(&quot;encoded&quot;, encoded);</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp> <boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">visibility</stringProp> <stringProp name="Argument.name">visibility</stringProp>
</elementProp> </elementProp>
<elementProp name="tags" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">false</boolProp>
<stringProp name="Argument.value"></stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">tags</stringProp>
</elementProp>
</collectionProp> </collectionProp>
</elementProp> </elementProp>
<stringProp name="HTTPSampler.domain">${server}</stringProp> <stringProp name="HTTPSampler.domain">${server}</stringProp>
@ -2248,6 +2269,13 @@ vars.put(&quot;encoded&quot;, encoded);</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp> <boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">visibility</stringProp> <stringProp name="Argument.name">visibility</stringProp>
</elementProp> </elementProp>
<elementProp name="tags" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">false</boolProp>
<stringProp name="Argument.value"></stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">tags</stringProp>
</elementProp>
</collectionProp> </collectionProp>
</elementProp> </elementProp>
<stringProp name="HTTPSampler.domain">${server}</stringProp> <stringProp name="HTTPSampler.domain">${server}</stringProp>
@ -3258,6 +3286,13 @@ vars.put(&quot;encoded&quot;, encoded);</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp> <boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">visibility</stringProp> <stringProp name="Argument.name">visibility</stringProp>
</elementProp> </elementProp>
<elementProp name="tags" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">false</boolProp>
<stringProp name="Argument.value"></stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">tags</stringProp>
</elementProp>
</collectionProp> </collectionProp>
</elementProp> </elementProp>
<stringProp name="HTTPSampler.domain">${server}</stringProp> <stringProp name="HTTPSampler.domain">${server}</stringProp>
@ -3918,6 +3953,13 @@ vars.put(&quot;encoded&quot;, encoded);</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp> <boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">visibility</stringProp> <stringProp name="Argument.name">visibility</stringProp>
</elementProp> </elementProp>
<elementProp name="tags" elementType="HTTPArgument">
<boolProp name="HTTPArgument.always_encode">false</boolProp>
<stringProp name="Argument.value"></stringProp>
<stringProp name="Argument.metadata">=</stringProp>
<boolProp name="HTTPArgument.use_equals">true</boolProp>
<stringProp name="Argument.name">tags</stringProp>
</elementProp>
</collectionProp> </collectionProp>
</elementProp> </elementProp>
<stringProp name="HTTPSampler.domain">${server}</stringProp> <stringProp name="HTTPSampler.domain">${server}</stringProp>
@ -4212,4 +4254,4 @@ vars.put(&quot;encoded&quot;, encoded);</stringProp>
</WorkBench> </WorkBench>
<hashTree/> <hashTree/>
</hashTree> </hashTree>
</jmeterTestPlan> </jmeterTestPlan>

6
pom.xml
View File

@ -1534,14 +1534,14 @@
<carbon.governance.version>4.7.8</carbon.governance.version> <carbon.governance.version>4.7.8</carbon.governance.version>
<!-- Carbon Device Management--> <!-- Carbon Device Management-->
<carbon.device.mgt.version>3.0.220</carbon.device.mgt.version> <carbon.device.mgt.version>3.0.231</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<product.iot.version>${project.version}</product.iot.version> <product.iot.version>${project.version}</product.iot.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>4.0.125</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>4.0.131</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.1.109</carbon.api.mgt.version> <carbon.api.mgt.version>6.1.109</carbon.api.mgt.version>
@ -1646,7 +1646,7 @@
<caramel.version>1.0.1</caramel.version> <caramel.version>1.0.1</caramel.version>
<!-- App manager version--> <!-- App manager version-->
<appmgt.feature.version>1.2.43</appmgt.feature.version> <appmgt.feature.version>1.2.51</appmgt.feature.version>
<!-- Carbon Store version--> <!-- Carbon Store version-->
<carbon.store.version>1.5.1</carbon.store.version> <carbon.store.version>1.5.1</carbon.store.version>