diff --git a/v2_18_0/CDT-AE-v2_18_0.xsd b/v2_18_0/CDT-AE-v2_18_0.xsd
index aefe07f1aa90001ae4059dd085868ca3a12aa593..f3de8d5fc07f3589510f13f764198b944ed39545 100644
--- a/v2_18_0/CDT-AE-v2_18_0.xsd
+++ b/v2_18_0/CDT-AE-v2_18_0.xsd
@@ -26,16 +26,16 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v2_18_0.xsd" />
<xs:element name="AE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-CSEBase-v2_18_0.xsd b/v2_18_0/CDT-CSEBase-v2_18_0.xsd
index e347435754b25ffff7a45350f6872b0e80b2be08..9e2055529bf1e73b2d615c008dcbd3eda4c6949e 100644
--- a/v2_18_0/CDT-CSEBase-v2_18_0.xsd
+++ b/v2_18_0/CDT-CSEBase-v2_18_0.xsd
@@ -26,26 +26,26 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-role-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-token-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v2_18_0.xsd" />
<xs:element name="CSEBase" substitutionGroup="m2m:sg_resource">
<xs:complexType>
diff --git a/v2_18_0/CDT-accessControlPolicy-v2_18_0.xsd b/v2_18_0/CDT-accessControlPolicy-v2_18_0.xsd
index ea887d4779d80b94aaae20d55eb03b12fd93f24b..35fb34644032bbc2bc63fea21e1897265eb03c02 100644
--- a/v2_18_0/CDT-accessControlPolicy-v2_18_0.xsd
+++ b/v2_18_0/CDT-accessControlPolicy-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="unqualified">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd"/>
<xs:element name="accessControlPolicy" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-activeCmdhPolicy-v2_18_0.xsd b/v2_18_0/CDT-activeCmdhPolicy-v2_18_0.xsd
index e76967920e699b8798e39dd34428fe326811a340..f4e1afa388871e9b8cdf88eb3de6dfa62f3c0acb 100644
--- a/v2_18_0/CDT-activeCmdhPolicy-v2_18_0.xsd
+++ b/v2_18_0/CDT-activeCmdhPolicy-v2_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="activeCmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-allJoynApp-v2_18_0.xsd b/v2_18_0/CDT-allJoynApp-v2_18_0.xsd
index 3e2bed5150c4d992636adc951134b085f01af18c..7579d49d3621e8867598af9b09b6f5d768efae83 100644
--- a/v2_18_0/CDT-allJoynApp-v2_18_0.xsd
+++ b/v2_18_0/CDT-allJoynApp-v2_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynSvcObject-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynSvcObject-v2_18_0.xsd" />
<xs:element name="allJoynApp" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-allJoynInterface-v2_18_0.xsd b/v2_18_0/CDT-allJoynInterface-v2_18_0.xsd
index 1cdeef94fbcc51463b691b5d92c733b80b76559e..eaf0004fac31af4f02cefc0074768c42f5e009fe 100644
--- a/v2_18_0/CDT-allJoynInterface-v2_18_0.xsd
+++ b/v2_18_0/CDT-allJoynInterface-v2_18_0.xsd
@@ -26,12 +26,12 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynMethod-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynProperty-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethod-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynProperty-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
<xs:element name="allJoynInterface" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_18_0/CDT-allJoynMethod-v2_18_0.xsd b/v2_18_0/CDT-allJoynMethod-v2_18_0.xsd
index c7f322c266341c33e2b9a11ecd3646ffc0299e29..9ca7235f650d926c9605f57f24211f4360945029 100644
--- a/v2_18_0/CDT-allJoynMethod-v2_18_0.xsd
+++ b/v2_18_0/CDT-allJoynMethod-v2_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynMethodCall-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynMethodCall-v2_18_0.xsd" />
<xs:element name="allJoynMethod" substitutionGroup="m2m:sg_flexContainerResource">
diff --git a/v2_18_0/CDT-allJoynMethodCall-v2_18_0.xsd b/v2_18_0/CDT-allJoynMethodCall-v2_18_0.xsd
index 8bed5c177e2d2fa4a938fb622fe6ea3bfcad1474..09c37a4e1db0b6806e54226eaf2edb1b803a495e 100644
--- a/v2_18_0/CDT-allJoynMethodCall-v2_18_0.xsd
+++ b/v2_18_0/CDT-allJoynMethodCall-v2_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="allJoynMethodCall" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-allJoynProperty-v2_18_0.xsd b/v2_18_0/CDT-allJoynProperty-v2_18_0.xsd
index f798a37bc403810b8c9b5c562f40b03ebefb65d6..8998d2359c9a6c5ba584ea077943164c50ef64d0 100644
--- a/v2_18_0/CDT-allJoynProperty-v2_18_0.xsd
+++ b/v2_18_0/CDT-allJoynProperty-v2_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="allJoynProperty" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-allJoynSvcObject-v2_18_0.xsd b/v2_18_0/CDT-allJoynSvcObject-v2_18_0.xsd
index c07b688aa83ec73b85df221267563d169e56c8c7..2c3ad1a8ab8ca0e97a874c72a91b3e7c4f3dd123 100644
--- a/v2_18_0/CDT-allJoynSvcObject-v2_18_0.xsd
+++ b/v2_18_0/CDT-allJoynSvcObject-v2_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynInterface-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynInterface-v2_18_0.xsd" />
<xs:element name="allJoynSvcObject" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-areaNwkDeviceInfo-v2_18_0.xsd b/v2_18_0/CDT-areaNwkDeviceInfo-v2_18_0.xsd
index 715fe0bccdb70584539dfe19068c539973a8ac44..310308dd6a2627c181f9d7e5f042eb52ed6f94af 100644
--- a/v2_18_0/CDT-areaNwkDeviceInfo-v2_18_0.xsd
+++ b/v2_18_0/CDT-areaNwkDeviceInfo-v2_18_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="areaNwkDeviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-areaNwkInfo-v2_18_0.xsd b/v2_18_0/CDT-areaNwkInfo-v2_18_0.xsd
index 765472e35fc855a051782983e7fe16a394495795..0453feff206939ccbb1cc43511e1b6585e323748 100644
--- a/v2_18_0/CDT-areaNwkInfo-v2_18_0.xsd
+++ b/v2_18_0/CDT-areaNwkInfo-v2_18_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="areaNwkInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-battery-v2_18_0.xsd b/v2_18_0/CDT-battery-v2_18_0.xsd
index 8352fa273a20325a473701df8c542a677f1b7648..dd4850b40adf61b6f4d2ab6b979df762582b0105 100644
--- a/v2_18_0/CDT-battery-v2_18_0.xsd
+++ b/v2_18_0/CDT-battery-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="battery" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhBuffer-v2_18_0.xsd b/v2_18_0/CDT-cmdhBuffer-v2_18_0.xsd
index 8d3c584579968269ac649cc56284d729779a8c30..c12287cffefa4525bff595afd203a9a18b5eee52 100644
--- a/v2_18_0/CDT-cmdhBuffer-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhBuffer-v2_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhBuffer" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhDefEcValue-v2_18_0.xsd b/v2_18_0/CDT-cmdhDefEcValue-v2_18_0.xsd
index da40e96259e0a0c18bed9085de9ab9a6c417ec41..d7fb4a89e3f038192a8e469d16893bb77930d5b2 100644
--- a/v2_18_0/CDT-cmdhDefEcValue-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhDefEcValue-v2_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhDefEcValue" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhDefaults-v2_18_0.xsd b/v2_18_0/CDT-cmdhDefaults-v2_18_0.xsd
index 68da3920fa6207137e3fcf3706ea0254f8575213..37b17727ce13381d1e20fca83902e8514da734f2 100644
--- a/v2_18_0/CDT-cmdhDefaults-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhDefaults-v2_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhDefaults" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhEcDefParamValues-v2_18_0.xsd b/v2_18_0/CDT-cmdhEcDefParamValues-v2_18_0.xsd
index c604ef9afe1a58d565e8626f6b58e49a036c040a..d053c1f176be19b443f72df2db21d17e2e6afe76 100644
--- a/v2_18_0/CDT-cmdhEcDefParamValues-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhEcDefParamValues-v2_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhEcDefParamValues" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhLimits-v2_18_0.xsd b/v2_18_0/CDT-cmdhLimits-v2_18_0.xsd
index 9401b682f3b3f07dcf2e0615e90b5b39d5ea6a6f..0ac6b01422ec555961e1ad4d970584ed36a39088 100644
--- a/v2_18_0/CDT-cmdhLimits-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhLimits-v2_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhLimits" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhNetworkAccessRules-v2_18_0.xsd b/v2_18_0/CDT-cmdhNetworkAccessRules-v2_18_0.xsd
index cd3f2d7565d815a1f0aa51cef7a4b05ef69feb09..46f50c5b75481b11328cc29344d2aa99269b07cd 100644
--- a/v2_18_0/CDT-cmdhNetworkAccessRules-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhNetworkAccessRules-v2_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhNetworkAccessRules" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhNwAccessRule-v2_18_0.xsd b/v2_18_0/CDT-cmdhNwAccessRule-v2_18_0.xsd
index 5bc573b163f62df204f0776c4ef66612058fac38..21eb1d669606d5362a88529c9dc2216390424e9b 100644
--- a/v2_18_0/CDT-cmdhNwAccessRule-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhNwAccessRule-v2_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhNwAccessRule" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-cmdhPolicy-v2_18_0.xsd b/v2_18_0/CDT-cmdhPolicy-v2_18_0.xsd
index b30ec539feb731e2e61b8773b3fd1828746ca287..d6d1a7e77572c465f06a2b28c892830550db36a1 100644
--- a/v2_18_0/CDT-cmdhPolicy-v2_18_0.xsd
+++ b/v2_18_0/CDT-cmdhPolicy-v2_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="cmdhPolicy" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-commonTypes-v2_18_0.xsd b/v2_18_0/CDT-commonTypes-v2_18_0.xsd
index 7691caaf497c2e6804bd84df2c165c9997a980bf..8535ba4d835e96b59a1fcb2d74b9a81b09bb9ca3 100644
--- a/v2_18_0/CDT-commonTypes-v2_18_0.xsd
+++ b/v2_18_0/CDT-commonTypes-v2_18_0.xsd
@@ -25,7 +25,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified">
- <xs:include schemaLocation="CDT-enumerationTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-enumerationTypes-v2_18_0.xsd" />
<!--********************** -->
<!-- oneM2M Simple Types -->
diff --git a/v2_18_0/CDT-container-v2_18_0.xsd b/v2_18_0/CDT-container-v2_18_0.xsd
index f9581dc268954d469cb48cd62b477b7909649d14..ae686de98b865c4f4c851812faa9adbcd2e7a43f 100644
--- a/v2_18_0/CDT-container-v2_18_0.xsd
+++ b/v2_18_0/CDT-container-v2_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
<xs:element name="container" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_18_0/CDT-contentInstance-v2_18_0.xsd b/v2_18_0/CDT-contentInstance-v2_18_0.xsd
index a7818db359fce214f1104a9362a6ecb1f048ad12..90ce3819c18fd4c7eec4fd984d8d81791033265f 100644
--- a/v2_18_0/CDT-contentInstance-v2_18_0.xsd
+++ b/v2_18_0/CDT-contentInstance-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
<xs:element name="contentInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-delivery-v2_18_0.xsd b/v2_18_0/CDT-delivery-v2_18_0.xsd
index a4469dbb48fcc8e9845be73afe50961a7d33f289..6e55e5b4c7078f71bba3d5424ed7782280352fd3 100644
--- a/v2_18_0/CDT-delivery-v2_18_0.xsd
+++ b/v2_18_0/CDT-delivery-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="delivery" substitutionGroup="m2m:sg_regularResource">
diff --git a/v2_18_0/CDT-deviceCapability-v2_18_0.xsd b/v2_18_0/CDT-deviceCapability-v2_18_0.xsd
index c67dd181f4464415790abae33385fe7703fbadca..f4172c337161b34da632d33b86ca013d41ca7fde 100644
--- a/v2_18_0/CDT-deviceCapability-v2_18_0.xsd
+++ b/v2_18_0/CDT-deviceCapability-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" >
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="deviceCapability" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-deviceInfo-v2_18_0.xsd b/v2_18_0/CDT-deviceInfo-v2_18_0.xsd
index bbc4ffa33b7407d278ec0f32fc67d0a02693e881..771c02d46318f29c4e2a9b1af46a38fc88ccb14c 100644
--- a/v2_18_0/CDT-deviceInfo-v2_18_0.xsd
+++ b/v2_18_0/CDT-deviceInfo-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="deviceInfo" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-dynamicAuthorizationConsultation-v2_18_0.xsd b/v2_18_0/CDT-dynamicAuthorizationConsultation-v2_18_0.xsd
index f1fd8c74d00edd52ba95d16547e7e44ecdac56c0..e51682687e22aae46a14747f9e39bed028a04ff4 100644
--- a/v2_18_0/CDT-dynamicAuthorizationConsultation-v2_18_0.xsd
+++ b/v2_18_0/CDT-dynamicAuthorizationConsultation-v2_18_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="dynamicAuthorizationConsultation" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-eventConfig-v2_18_0.xsd b/v2_18_0/CDT-eventConfig-v2_18_0.xsd
index a67ef7a39f256d0620f9e88fa0b8f7104734a328..7ca6a83c4b0869c3fe037985a0698ee3549c8a71 100644
--- a/v2_18_0/CDT-eventConfig-v2_18_0.xsd
+++ b/v2_18_0/CDT-eventConfig-v2_18_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="eventConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-eventLog-v2_18_0.xsd b/v2_18_0/CDT-eventLog-v2_18_0.xsd
index ce16a9a9fa23f7a06791b3f8c752887a721e52cb..a3868a982d3756802a98a201a942a05d2191344c 100644
--- a/v2_18_0/CDT-eventLog-v2_18_0.xsd
+++ b/v2_18_0/CDT-eventLog-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="eventLog" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-execInstance-v2_18_0.xsd b/v2_18_0/CDT-execInstance-v2_18_0.xsd
index 3328892f062b2b670bf67c3cfb6b6df220b953fe..531bf633d388f9a3d414ded9abfd9750bc1a3462 100644
--- a/v2_18_0/CDT-execInstance-v2_18_0.xsd
+++ b/v2_18_0/CDT-execInstance-v2_18_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="execInstance" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-firmware-v2_18_0.xsd b/v2_18_0/CDT-firmware-v2_18_0.xsd
index a6c26ee83a56e2c59870f84a9ee69b281890d775..c340433e6d1d7008b290cd4f08b44d0fdc61aeb8 100644
--- a/v2_18_0/CDT-firmware-v2_18_0.xsd
+++ b/v2_18_0/CDT-firmware-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="firmware" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-genericInterworkingOperationInstance-v2_18_0.xsd b/v2_18_0/CDT-genericInterworkingOperationInstance-v2_18_0.xsd
index d2ab11e89e6fe66b9dd18f0bfd1d2459f5a16f28..e0a12cee07d8e77d160dca604e296c7240871702 100644
--- a/v2_18_0/CDT-genericInterworkingOperationInstance-v2_18_0.xsd
+++ b/v2_18_0/CDT-genericInterworkingOperationInstance-v2_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="genericInterworkingOperationInstance" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-genericInterworkingService-v2_18_0.xsd b/v2_18_0/CDT-genericInterworkingService-v2_18_0.xsd
index 377235f8f84c33088f3cfcb59766dc66208e19f6..a7e8cbbe1cbeff38b01c4acc1ebc13981a1e6489 100644
--- a/v2_18_0/CDT-genericInterworkingService-v2_18_0.xsd
+++ b/v2_18_0/CDT-genericInterworkingService-v2_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-genericInterworkingOperationInstance-v2_18_0.xsd" />
<xs:element name="genericInterworkingService" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-group-v2_18_0.xsd b/v2_18_0/CDT-group-v2_18_0.xsd
index 82ae4a7dd2c44844987a1babe168762e19d2de62..6f8f501ec4c910a81ada805ad92f6ae67db27fdb 100644
--- a/v2_18_0/CDT-group-v2_18_0.xsd
+++ b/v2_18_0/CDT-group-v2_18_0.xsd
@@ -29,9 +29,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="unqualified"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd"/>
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd"/>
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd"/>
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd"/>
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd"/>
<xs:element name="group" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-locationPolicy-v2_18_0.xsd b/v2_18_0/CDT-locationPolicy-v2_18_0.xsd
index b7f6db0f89f6e46dc49f65e1dd50593fb513b4af..c7f16b352d59d29af9d06ae4d93ec5f5aa658f10 100644
--- a/v2_18_0/CDT-locationPolicy-v2_18_0.xsd
+++ b/v2_18_0/CDT-locationPolicy-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="locationPolicy" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-m2mServiceSubscriptionProfile-v2_18_0.xsd b/v2_18_0/CDT-m2mServiceSubscriptionProfile-v2_18_0.xsd
index 61eca0c308e39bd7e82f5302146ec2016a943197..46e58a1a2d42320f372c284e430c58e4cbbf5ee7 100644
--- a/v2_18_0/CDT-m2mServiceSubscriptionProfile-v2_18_0.xsd
+++ b/v2_18_0/CDT-m2mServiceSubscriptionProfile-v2_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_18_0.xsd" />
<xs:element name="m2mServiceSubscriptionProfile" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-memory-v2_18_0.xsd b/v2_18_0/CDT-memory-v2_18_0.xsd
index 099b9f042de3571c71f9c4e2edccc978153a1ddd..700c660ed0b37ae5c335e03bca105820bd53c3bc 100644
--- a/v2_18_0/CDT-memory-v2_18_0.xsd
+++ b/v2_18_0/CDT-memory-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" attributeFormDefault="unqualified"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="memory" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-mgmtCmd-v2_18_0.xsd b/v2_18_0/CDT-mgmtCmd-v2_18_0.xsd
index fc07ab213fa35f3dd382a629d56a359cd64c674d..654415922d3d832ee23840e3c97803b144235cc0 100644
--- a/v2_18_0/CDT-mgmtCmd-v2_18_0.xsd
+++ b/v2_18_0/CDT-mgmtCmd-v2_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_18_0.xsd" />
<xs:element name="mgmtCmd" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-node-v2_18_0.xsd b/v2_18_0/CDT-node-v2_18_0.xsd
index 583a0c040c609606377a76f424db601e1d8fafaf..be5d9527767822eaa65945eaf4cb66c0a318cb27 100644
--- a/v2_18_0/CDT-node-v2_18_0.xsd
+++ b/v2_18_0/CDT-node-v2_18_0.xsd
@@ -27,22 +27,22 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-trafficPattern-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-trafficPattern-v2_18_0.xsd" />
<xs:element name="node" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-notification-v2_18_0.xsd b/v2_18_0/CDT-notification-v2_18_0.xsd
index c98e9812f065cd7271f1f6df6ae455d23ee026ad..67e4ed281a5f0acb70d026da34df74d331f40156 100644
--- a/v2_18_0/CDT-notification-v2_18_0.xsd
+++ b/v2_18_0/CDT-notification-v2_18_0.xsd
@@ -24,8 +24,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
targetNamespace="http://www.onem2m.org/xml/protocols"
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd"/>
- <xs:include schemaLocation="CDT-responsePrimitive-v2_17_0.xsd"/>
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd"/>
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_18_0.xsd"/>
<xs:element name="notification" type="m2m:notification" />
diff --git a/v2_18_0/CDT-notificationTargetMgmtPolicyRef-v2_18_0.xsd b/v2_18_0/CDT-notificationTargetMgmtPolicyRef-v2_18_0.xsd
index af6ebac26c29f589f853c3815dd564ca05584e7f..624f964c32d09cb73673eed618519b373d17bd92 100644
--- a/v2_18_0/CDT-notificationTargetMgmtPolicyRef-v2_18_0.xsd
+++ b/v2_18_0/CDT-notificationTargetMgmtPolicyRef-v2_18_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="notificationTargetMgmtPolicyRef" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-notificationTargetPolicy-v2_18_0.xsd b/v2_18_0/CDT-notificationTargetPolicy-v2_18_0.xsd
index 0834488d293057eef3514263ff4791f057052935..755b34340f835068a60d5d3fc1a3f1bd3055113c 100644
--- a/v2_18_0/CDT-notificationTargetPolicy-v2_18_0.xsd
+++ b/v2_18_0/CDT-notificationTargetPolicy-v2_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-policyDeletionRules-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-policyDeletionRules-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="notificationTargetPolicy" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-policyDeletionRules-v2_18_0.xsd b/v2_18_0/CDT-policyDeletionRules-v2_18_0.xsd
index 78d7b4144e2eed7c77229143de3e7304c6e46a4f..fe58a380aa7052b1af90a30c20a3c884692b1f32 100644
--- a/v2_18_0/CDT-policyDeletionRules-v2_18_0.xsd
+++ b/v2_18_0/CDT-policyDeletionRules-v2_18_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="policyDeletionRules" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-pollingChannel-v2_18_0.xsd b/v2_18_0/CDT-pollingChannel-v2_18_0.xsd
index d9180d46087b540f31011ad39cb48e801cb0a9e5..b7b0c50f101890f0076fd49898096eedcafb75ca 100644
--- a/v2_18_0/CDT-pollingChannel-v2_18_0.xsd
+++ b/v2_18_0/CDT-pollingChannel-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="pollingChannel" substitutionGroup="m2m:sg_subordinateResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-reboot-v2_18_0.xsd b/v2_18_0/CDT-reboot-v2_18_0.xsd
index ebbe7b2fb2224f766a5b92f10815926a6345a3fa..27ce9623eb049c9a3401e3dc029247149fce21c9 100644
--- a/v2_18_0/CDT-reboot-v2_18_0.xsd
+++ b/v2_18_0/CDT-reboot-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="reboot" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-remoteCSE-v2_18_0.xsd b/v2_18_0/CDT-remoteCSE-v2_18_0.xsd
index 66504620865465cf87e6c6b9a7ab9021c211fd95..8a028ecb2366316a16c370b8cacc0fac4d321580 100644
--- a/v2_18_0/CDT-remoteCSE-v2_18_0.xsd
+++ b/v2_18_0/CDT-remoteCSE-v2_18_0.xsd
@@ -26,17 +26,17 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_18_0.xsd" />
<xs:element name="remoteCSE" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-request-v2_18_0.xsd b/v2_18_0/CDT-request-v2_18_0.xsd
index 197531f9975becabe31c74defbc49655fc4a2363..a9f9781abbbc19ce3e203bc406e662a1014884c7 100644
--- a/v2_18_0/CDT-request-v2_18_0.xsd
+++ b/v2_18_0/CDT-request-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="request" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-requestPrimitive-v2_18_0.xsd b/v2_18_0/CDT-requestPrimitive-v2_18_0.xsd
index c0fe1b1b6acf584dbd10be92695b576b47ebcfb3..dda8cfad6bb15fa4166ffadfaf9578b483c1b702 100644
--- a/v2_18_0/CDT-requestPrimitive-v2_18_0.xsd
+++ b/v2_18_0/CDT-requestPrimitive-v2_18_0.xsd
@@ -28,7 +28,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="requestPrimitive" >
<xs:complexType>
diff --git a/v2_18_0/CDT-responsePrimitive-v2_18_0.xsd b/v2_18_0/CDT-responsePrimitive-v2_18_0.xsd
index 0d746e907a88b2ce893a1c3d5fb0e22949fdd5f5..e8527c179a410137718d43b7af5987103fd1e136 100644
--- a/v2_18_0/CDT-responsePrimitive-v2_18_0.xsd
+++ b/v2_18_0/CDT-responsePrimitive-v2_18_0.xsd
@@ -28,55 +28,55 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-accessControlPolicy-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-AE-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-areaNwkInfo-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-battery-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhBuffer-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefaults-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhLimits-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-cmdhPolicy-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-container-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-contentInstance-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-CSEBase-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-delivery-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-deviceCapability-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-deviceInfo-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-eventLog-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-execInstance-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-firmware-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-group-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-locationPolicy-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-memory-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-mgmtCmd-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-node-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-notification-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-pollingChannel-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-reboot-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-remoteCSE-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-request-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-requestPrimitive-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-responsePrimitive-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-software-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-statsCollect-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-statsConfig-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeries-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeriesInstance-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-role-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-token-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-accessControlPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-activeCmdhPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-AE-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkDeviceInfo-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-areaNwkInfo-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-battery-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhBuffer-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefaults-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhDefEcValue-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhEcDefParamValues-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhLimits-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNetworkAccessRules-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhNwAccessRule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-cmdhPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-container-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-contentInstance-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-CSEBase-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-delivery-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceCapability-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-deviceInfo-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-eventLog-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-execInstance-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-firmware-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-group-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-locationPolicy-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-m2mServiceSubscriptionProfile-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-memory-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-mgmtCmd-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-node-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-notification-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-pollingChannel-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-reboot-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-remoteCSE-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-request-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-requestPrimitive-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-responsePrimitive-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedAppRule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-serviceSubscribedNode-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-software-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-statsCollect-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-statsConfig-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeries-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-role-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-token-v2_18_0.xsd" />
<xs:element name="responsePrimitive" >
<xs:complexType>
diff --git a/v2_18_0/CDT-role-v2_18_0.xsd b/v2_18_0/CDT-role-v2_18_0.xsd
index 99fdd38895c5a1be4331ec16d1ec17fac246cee9..4337f6cb078b5778535ca1f657881a4032606994 100644
--- a/v2_18_0/CDT-role-v2_18_0.xsd
+++ b/v2_18_0/CDT-role-v2_18_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="role" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-schedule-v2_18_0.xsd b/v2_18_0/CDT-schedule-v2_18_0.xsd
index 1547668d91220e1200210a1d2648d77eaf625a0e..3a8c1fa736b8b92c96c66e35a3f80508e6b831c1 100644
--- a/v2_18_0/CDT-schedule-v2_18_0.xsd
+++ b/v2_18_0/CDT-schedule-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="schedule" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-semanticDescriptor-v2_18_0.xsd b/v2_18_0/CDT-semanticDescriptor-v2_18_0.xsd
index b2841353ca3b0893583f41c78619d1547992c1d7..f54ba5dacd02fbfb3f32d80b43932b8da8162d13 100644
--- a/v2_18_0/CDT-semanticDescriptor-v2_18_0.xsd
+++ b/v2_18_0/CDT-semanticDescriptor-v2_18_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="semanticDescriptor" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-serviceSubscribedAppRule-v2_18_0.xsd b/v2_18_0/CDT-serviceSubscribedAppRule-v2_18_0.xsd
index 983a67825e63e36e51506a21ee93b7ad42c60178..c2d71ba53c134b86fc45e482b70a99f5744fc9be 100644
--- a/v2_18_0/CDT-serviceSubscribedAppRule-v2_18_0.xsd
+++ b/v2_18_0/CDT-serviceSubscribedAppRule-v2_18_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="serviceSubscribedAppRule" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-serviceSubscribedNode-v2_18_0.xsd b/v2_18_0/CDT-serviceSubscribedNode-v2_18_0.xsd
index e5d17e6c2d36c9008474bafb32da5909f043b67b..171ce8e90c30a8679458673e8c4974f92a9b863b 100644
--- a/v2_18_0/CDT-serviceSubscribedNode-v2_18_0.xsd
+++ b/v2_18_0/CDT-serviceSubscribedNode-v2_18_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="serviceSubscribedNode" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-software-v2_18_0.xsd b/v2_18_0/CDT-software-v2_18_0.xsd
index db867e8a1b5e46d4f762b2724df7705e4fae06fa..ea48bbb80e87385c9cef58daa85be9c0c2ba26e7 100644
--- a/v2_18_0/CDT-software-v2_18_0.xsd
+++ b/v2_18_0/CDT-software-v2_18_0.xsd
@@ -27,8 +27,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="software" substitutionGroup="m2m:sg_mgmtResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-statsCollect-v2_18_0.xsd b/v2_18_0/CDT-statsCollect-v2_18_0.xsd
index e13978567d51517e281e0e6bb7374103e3c9fecf..6aa03579f47c20e1e30ad2b26fb19ffe15843c08 100644
--- a/v2_18_0/CDT-statsCollect-v2_18_0.xsd
+++ b/v2_18_0/CDT-statsCollect-v2_18_0.xsd
@@ -26,8 +26,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="statsCollect" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-statsConfig-v2_18_0.xsd b/v2_18_0/CDT-statsConfig-v2_18_0.xsd
index 76dc566d0c135e9983204ef345138afef5dbe771..3083b691e0658e2c1ad69c171c0748d00bd0ea63 100644
--- a/v2_18_0/CDT-statsConfig-v2_18_0.xsd
+++ b/v2_18_0/CDT-statsConfig-v2_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-eventConfig-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-eventConfig-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="statsConfig" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-subscription-v2_18_0.xsd b/v2_18_0/CDT-subscription-v2_18_0.xsd
index 9a21922b36cf7fc4419491a9ba25287ee5beb909..d00b4bfcbf077bb6c95da916747bb5aac870ca6d 100644
--- a/v2_18_0/CDT-subscription-v2_18_0.xsd
+++ b/v2_18_0/CDT-subscription-v2_18_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.onem2m.org/xml/protocols"
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-notificationTargetMgmtPolicyRef-v2_18_0.xsd" />
<xs:element name="subscription" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-svcFwWrapper-v2_18_0.xsd b/v2_18_0/CDT-svcFwWrapper-v2_18_0.xsd
index 8d337f40b016eef17e8330a37031566004be619f..36f6dd70ab21ced889401e821576754f01d0d51a 100644
--- a/v2_18_0/CDT-svcFwWrapper-v2_18_0.xsd
+++ b/v2_18_0/CDT-svcFwWrapper-v2_18_0.xsd
@@ -26,9 +26,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="svcFwWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-svcObjWrapper-v2_18_0.xsd b/v2_18_0/CDT-svcObjWrapper-v2_18_0.xsd
index f1322e8d9a60926bb5e02223a17d3e869dfce5cd..23b785a697e2056aeeff2b08f14281adce7b8cb4 100644
--- a/v2_18_0/CDT-svcObjWrapper-v2_18_0.xsd
+++ b/v2_18_0/CDT-svcObjWrapper-v2_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-allJoynApp-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-allJoynApp-v2_18_0.xsd" />
<xs:element name="svcObjWrapper" substitutionGroup="m2m:sg_flexContainerResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-timeSeries-v2_18_0.xsd b/v2_18_0/CDT-timeSeries-v2_18_0.xsd
index 39cd6d5b4c2aae306cf313fd93483340a94370ef..6b2f3c4c27d5d7133fb75296f60eb9dfd85526d3 100644
--- a/v2_18_0/CDT-timeSeries-v2_18_0.xsd
+++ b/v2_18_0/CDT-timeSeries-v2_18_0.xsd
@@ -26,10 +26,10 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-timeSeriesInstance-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-semanticDescriptor-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-timeSeriesInstance-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-semanticDescriptor-v2_18_0.xsd" />
<xs:element name="timeSeries" substitutionGroup="m2m:sg_announceableResource">
diff --git a/v2_18_0/CDT-timeSeriesInstance-v2_18_0.xsd b/v2_18_0/CDT-timeSeriesInstance-v2_18_0.xsd
index 42c47de7be72eced0873e62c28d797d261fb87f9..11469693896403ebaec2e937e9266c878de37864 100644
--- a/v2_18_0/CDT-timeSeriesInstance-v2_18_0.xsd
+++ b/v2_18_0/CDT-timeSeriesInstance-v2_18_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
<xs:element name="timeSeriesInstance" substitutionGroup="m2m:sg_announceableSubordinateResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-token-v2_18_0.xsd b/v2_18_0/CDT-token-v2_18_0.xsd
index 113999f82e7c89527ad9888a557a11f2ca899217..188146fa5d9fc75f1858c1e53dcfe7b76dbb8d09 100644
--- a/v2_18_0/CDT-token-v2_18_0.xsd
+++ b/v2_18_0/CDT-token-v2_18_0.xsd
@@ -26,7 +26,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
<xs:schema targetNamespace="http://www.onem2m.org/xml/protocols" xmlns:m2m="http://www.onem2m.org/xml/protocols"
elementFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
<xs:element name="token" substitutionGroup="m2m:sg_regularResource">
<xs:complexType>
diff --git a/v2_18_0/CDT-trafficPattern-v2_18_0.xsd b/v2_18_0/CDT-trafficPattern-v2_18_0.xsd
index ae20f926402312f243564e56988911392b1b0651..9877e7ebdfad519baa18fd7f7cb527748e5fba13 100644
--- a/v2_18_0/CDT-trafficPattern-v2_18_0.xsd
+++ b/v2_18_0/CDT-trafficPattern-v2_18_0.xsd
@@ -27,9 +27,9 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
xmlns:m2m="http://www.onem2m.org/xml/protocols" elementFormDefault="unqualified"
attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="CDT-commonTypes-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-subscription-v2_17_0.xsd" />
- <xs:include schemaLocation="CDT-schedule-v2_17_0.xsd" />
+ <xs:include schemaLocation="CDT-commonTypes-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-subscription-v2_18_0.xsd" />
+ <xs:include schemaLocation="CDT-schedule-v2_18_0.xsd" />
<xs:element name="trafficPattern" substitutionGroup="m2m:sg_announceableResource">
<xs:complexType>