From 46ba4e16760ba90470527c0bb7f9ba7ed9a30235 Mon Sep 17 00:00:00 2001
From: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>
Date: Mon, 6 Feb 2023 13:29:17 +0100
Subject: [PATCH] SDS-2020-0369R03-sspResourceID

---
 DCFG-MAFClientRegCfg.xsd       | 4 ++--
 DCFG-MEFClientRegCfg.xsd       | 4 ++--
 DCFG-OAuth2.xsd                | 4 ++--
 DCFG-authenticationProfile.xsd | 4 ++--
 DCFG-commonTypes.xsd           | 4 ++--
 DCFG-dataCollection.xsd        | 4 ++--
 DCFG-myCertFileCred.xsd        | 4 ++--
 DCFG-registration.xsd          | 6 ++++--
 DCFG-trustAnchorCred.xsd       | 4 ++--
 DCFG-wifiClient.xsd            | 4 ++--
 10 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/DCFG-MAFClientRegCfg.xsd b/DCFG-MAFClientRegCfg.xsd
index 616a628..c58e09f 100644
--- a/DCFG-MAFClientRegCfg.xsd
+++ b/DCFG-MAFClientRegCfg.xsd
@@ -23,9 +23,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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-MEFClientRegCfg.xsd b/DCFG-MEFClientRegCfg.xsd
index d8e7e46..2b19256 100644
--- a/DCFG-MEFClientRegCfg.xsd
+++ b/DCFG-MEFClientRegCfg.xsd
@@ -23,9 +23,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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-OAuth2.xsd b/DCFG-OAuth2.xsd
index 1fbc2ac..af4e306 100644
--- a/DCFG-OAuth2.xsd
+++ b/DCFG-OAuth2.xsd
@@ -22,9 +22,9 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI
 oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
 
 -->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-authenticationProfile.xsd b/DCFG-authenticationProfile.xsd
index 129d6af..e67e25e 100644
--- a/DCFG-authenticationProfile.xsd
+++ b/DCFG-authenticationProfile.xsd
@@ -22,9 +22,9 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI
 oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
 
 -->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-commonTypes.xsd b/DCFG-commonTypes.xsd
index 27438b3..7b94c83 100644
--- a/DCFG-commonTypes.xsd
+++ b/DCFG-commonTypes.xsd
@@ -23,8 +23,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 <xs:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1"
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified">
 
 	<!-- <xs:include schemaLocation="CDT-enumerationTypes" />  -->
diff --git a/DCFG-dataCollection.xsd b/DCFG-dataCollection.xsd
index 7ade30e..5ddb24f 100644
--- a/DCFG-dataCollection.xsd
+++ b/DCFG-dataCollection.xsd
@@ -23,9 +23,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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
 	
diff --git a/DCFG-myCertFileCred.xsd b/DCFG-myCertFileCred.xsd
index 2416cdd..7354fcf 100644
--- a/DCFG-myCertFileCred.xsd
+++ b/DCFG-myCertFileCred.xsd
@@ -23,8 +23,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
-	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
diff --git a/DCFG-registration.xsd b/DCFG-registration.xsd
index 6974210..0bb2fb9 100644
--- a/DCFG-registration.xsd
+++ b/DCFG-registration.xsd
@@ -23,8 +23,8 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 
 -->
 
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
-	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
+	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	elementFormDefault="unqualified" attributeFormDefault="unqualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	
 	<xs:import namespace="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" schemaLocation="CDT-subscription.xsd" />
@@ -45,6 +45,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="appID" type="m2m:ID" minOccurs="0"/>					
 						<xs:element name="externalID" type="m2m:externalID" minOccurs="0"/>
 						<xs:element name="triggerRecipientID" type="m2m:triggerRecipientID" minOccurs="0"/>				
+						<xs:element name="M2M-Sub-ID" type="m2m:ID" minOccurs="0"/>
 						
 						<!-- Instantiations of this [registration] resource type shall include mgmntLink's to
 	                         the following children:
@@ -76,6 +77,7 @@ oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PR
 						<xs:element name="appID" type="m2m:ID" minOccurs="0"/>					
 						<xs:element name="externalID" type="m2m:externalID" minOccurs="0"/>
 						<xs:element name="triggerRecipientID" type="m2m:triggerRecipientID" minOccurs="0"/>				
+						<xs:element name="M2M-Sub-ID" type="m2m:ID" minOccurs="0"/>
 						
 						<!-- Instantiations of this [registration] resource type shall include mgmntLink's to
 	                         the following children:
diff --git a/DCFG-trustAnchorCred.xsd b/DCFG-trustAnchorCred.xsd
index 848c793..e66edcf 100644
--- a/DCFG-trustAnchorCred.xsd
+++ b/DCFG-trustAnchorCred.xsd
@@ -23,9 +23,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="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0"  
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1"
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0"
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
diff --git a/DCFG-wifiClient.xsd b/DCFG-wifiClient.xsd
index 3c8cb4e..d7744c9 100644
--- a/DCFG-wifiClient.xsd
+++ b/DCFG-wifiClient.xsd
@@ -22,9 +22,9 @@ ANY CLAIM, AND IN NO EVENT SHALL oneM2M BE LIABLE FOR LOST PROFITS OR OTHER INCI
 oneM2M EXPRESSLY ADVISES ANY AND ALL USE OF OR RELIANCE UPON THIS INFORMATION PROVIDED IN THIS DOCUMENT IS AT THE RISK OF THE USER.
 
 -->
-<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+<xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:m2m="https://git.onem2m.org/XMLSchemas/ts-0004/tree/4.0.0" 
-	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.1.1" 
+	xmlns:dcfg="https://git.onem2m.org/XMLSchemas/ts-0022/tree/4.2.0" 
 	xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:sec="https://git.onem2m.org/XMLSchemas/ts-0003/tree/4.0.0"
 	elementFormDefault="unqualified" attributeFormDefault="unqualified">
-- 
GitLab