Changes for LTS 202210.01 Patch (#27 )

* Changes for LTS 202210.01 Patch Co-authored-by: Soren Ptak <skptak@amazon.com>
Updating submodules (#26 )
2022-11-17 16:16:33 -08:00 · 2022-10-14 13:53:21 -07:00 · 2022-10-14 11:54:00 -07:00 · 2022-10-14 11:53:30 -07:00 · 2022-10-14 11:53:13 -07:00 · 2022-10-14 11:44:27 -07:00
19 changed files with 104 additions and 73 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -40,3 +40,15 @@
 	path = aws/ota-for-aws-iot-embedded-sdk
 	branch = main
 	url = https://github.com/aws/ota-for-aws-iot-embedded-sdk.git
+[submodule "aws/fleet-provisioning-for-aws-iot-embedded-sdk"]
+	path = aws/fleet-provisioning-for-aws-iot-embedded-sdk
+	url = https://github.com/aws/Fleet-Provisioning-for-AWS-IoT-embedded-sdk.git
+[submodule "FreeRTOS/coreSNTP"]
+	path = FreeRTOS/coreSNTP
+	url = https://github.com/FreeRTOS/coreSNTP
+[submodule "aws/sigv4-for-aws-iot-embedded-sdk"]
+	path = aws/sigv4-for-aws-iot-embedded-sdk
+	url = https://github.com/aws/SigV4-for-AWS-IoT-embedded-sdk.git
+[submodule "FreeRTOS/FreeRTOS-Cellular-Interface"]
+	path = FreeRTOS/FreeRTOS-Cellular-Interface
+	url = https://github.com/FreeRTOS/FreeRTOS-Cellular-Interface.git
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,37 +1,25 @@
-# ChangeLog for FreeRTOS 202012-LTS
+# ChangeLog for FreeRTOS 202210-LTS

-## 202012.05-LTS (September 2022)
+## 202210.01-LTS (November 2022)
 Update the following libraries in the Long Term Support (LTS) patch release:
-* [FreeRTOS-Kernel V10.4.3 LTS Patch 3](https://github.com/FreeRTOS/FreeRTOS-Kernel/tree/V10.4.3-LTS-Patch-3)
+ * [FreeRTOS-Kernel V10.5.1](https://github.com/FreeRTOS/FreeRTOS-Kernel/blob/V10.5.1/History.txt)
+ * [coreMQTT v2.1.1](https://github.com/FreeRTOS/coreMQTT/blob/v2.1.1/CHANGELOG.md)

-## 202012.04-LTS (February 2022)
-Update the following libraries in the Long Term Support (LTS) patch release:
-* [FreeRTOS-Plus-TCP V2.3.2 LTS Patch 2](https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/tree/V2.3.2-LTS-Patch-2)
-
-## 202012.03-LTS (November 2021)
-Update the following libraries in the Long Term Support (LTS) patch release:
-* [FreeRTOS-Kernel V10.4.3 LTS Patch 2](https://github.com/FreeRTOS/FreeRTOS-Kernel/tree/V10.4.3-LTS-Patch-2)
-
-## 202012.02-LTS (September 2021)
-Update the following libraries in the Long Term Support (LTS) patch release:
-* [FreeRTOS-Kernel V10.4.3 LTS Patch 1](https://github.com/FreeRTOS/FreeRTOS-Kernel/tree/V10.4.3-LTS-Patch-1)
-* [FreeRTOS-Plus-TCP v2.3.2 LTS Patch 1](https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/tree/V2.3.2-LTS-Patch-1)
-
-## 202012.01-LTS (March 2021)
-
-Add the following libraries to the Long Term Support (LTS) release:
-* [AWS IoT Device Defender v1.1.0](https://github.com/aws/Device-Defender-for-AWS-IoT-embedded-sdk/tree/v1.1.0)
-* [AWS IoT Jobs v1.1.0](https://github.com/aws/Jobs-for-AWS-IoT-embedded-sdk/tree/v1.1.0)
-* [AWS IoT Over-the-air Update v3.0.0](https://github.com/aws/ota-for-aws-iot-embedded-sdk/tree/v3.0.0)
-
-## 202012.00-LTS (December 2020)
+## 202210.00-LTS (October 2022)

 Long Term Support (LTS) release of the following libraries:
-* [FreeRTOS-Kernel V10.4.3](https://github.com/FreeRTOS/FreeRTOS-Kernel/tree/V10.4.3)
-* [FreeRTOS-Plus-TCP v2.3.2](https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/tree/V2.3.2)
-* [coreMQTT v1.1.0](https://github.com/FreeRTOS/coreMQTT/tree/v1.1.0)
-* [coreHTTP v2.0.0](https://github.com/FreeRTOS/coreHTTP/tree/v2.0.0)
-* [corePKCS11 v3.0.0](https://github.com/FreeRTOS/corePKCS11/tree/v3.0.0)
-* [coreJSON v3.0.0](https://github.com/FreeRTOS/coreJSON/tree/v3.0.0)
-* [backoffAlgorithm v1.0.0](https://github.com/FreeRTOS/backoffAlgorithm/tree/v1.0.0)
-* [AWS IoT Device Shadow v1.0.2](https://github.com/aws/Device-Shadow-for-AWS-IoT-embedded-sdk/tree/v1.0.2)
+* [FreeRTOS-Kernel V10.5.0](https://github.com/FreeRTOS/FreeRTOS-Kernel/tree/V10.5.0)
+* [FreeRTOS-Plus-TCP V3.1.0](https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/tree/V3.1.0)
+* [coreMQTT v2.1.0](https://github.com/FreeRTOS/coreMQTT/tree/v2.1.0)
+* [coreHTTP v3.0.0](https://github.com/FreeRTOS/coreHTTP/tree/v3.0.0)
+* [corePKCS11 v3.5.0](https://github.com/FreeRTOS/corePKCS11/tree/v3.5.0)
+* [coreJSON v3.2.0](https://github.com/FreeRTOS/coreJSON/tree/v3.2.0)
+* [coreSNTP v1.2.0](https://github.com/FreeRTOS/coreSNTP/tree/v1.2.0)
+* [Cellular Interface v1.3.0](https://github.com/FreeRTOS/FreeRTOS-Cellular-Interface/tree/v1.3.0)
+* [SigV4 v1.2.0](https://github.com/aws/SigV4-for-AWS-IoT-embedded-sdk/tree/v1.2.0)
+* [backoffAlgorithm v1.3.0](https://github.com/FreeRTOS/backoffAlgorithm/tree/v1.3.0)
+* [AWS IoT Device Shadow v1.3.0](https://github.com/aws/Device-Shadow-for-AWS-IoT-embedded-sdk/tree/v1.3.0)
+* [AWS IoT Device Defender v1.3.0](https://github.com/aws/Device-Defender-for-AWS-IoT-embedded-sdk/tree/v1.3.0)
+* [AWS IoT Jobs v1.3.0](https://github.com/aws/Jobs-for-AWS-IoT-embedded-sdk/tree/v1.3.0)
+* [AWS IoT Fleet Provisioning v1.1.0](https://github.com/aws/Fleet-Provisioning-for-AWS-IoT-embedded-sdk/tree/v1.1.0)
+* [AWS IoT Over-the-air Update v3.4.0](https://github.com/aws/ota-for-aws-iot-embedded-sdk/tree/v3.4.0)
--- a/FreeRTOS/FreeRTOS-Cellular-Interface
+++ b/FreeRTOS/FreeRTOS-Cellular-Interface
@ -0,0 +1 @@
+Subproject commit 0c6eae034079360dca9839438cc4b12b6100d976
--- a/FreeRTOS/FreeRTOS-Kernel
+++ b/FreeRTOS/FreeRTOS-Kernel
@ -1 +1 @@
-Subproject commit 0437c8257aaeed4ecf0c50d2e1c7e8e48c4b799e
+Subproject commit def7d2df2b0506d3d249334974f51e427c17a41c
--- a/FreeRTOS/FreeRTOS-Plus-TCP
+++ b/FreeRTOS/FreeRTOS-Plus-TCP
@ -1 +1 @@
-Subproject commit 80bbfdf028b69a8e9c173830e3afdb1a2908a8fb
+Subproject commit 0bf460c935ca59cf0423ef0ac3505f13961c2e9e
--- a/FreeRTOS/backoffAlgorithm
+++ b/FreeRTOS/backoffAlgorithm
@ -1 +1 @@
-Subproject commit a70291444c556bc3392bf9b7b60626b93b120319
+Subproject commit 8818bed40e57215fda8efa4b7fd33f7ae2c80d65
--- a/FreeRTOS/coreHTTP
+++ b/FreeRTOS/coreHTTP
@ -1 +1 @@
-Subproject commit b349f89e67f5feef51438dc09ed89959dedc18d5
+Subproject commit 2949950412ffc88201c15a3a9ce4ecf71f4e1045
--- a/FreeRTOS/coreJSON
+++ b/FreeRTOS/coreJSON
@ -1 +1 @@
-Subproject commit 26fe707548fc4e975c453aa4475ae056bb70247b
+Subproject commit 5b31f4c37a034911a4992fd415f8177a75014946
--- a/FreeRTOS/coreMQTT
+++ b/FreeRTOS/coreMQTT
@ -1 +1 @@
-Subproject commit ff9830a338b6a759c5574f991b02d6f99abadc42
+Subproject commit 6d5641b8a2f410470134d9bfe8ee71e3d83a565e
--- a/FreeRTOS/corePKCS11
+++ b/FreeRTOS/corePKCS11
@ -1 +1 @@
-Subproject commit cc4129e5c44430e94dec5b82bacc4ce1491c61ac
+Subproject commit 781f5774948fa8e6427be544b1bf1ad512ae9e90
--- a/FreeRTOS/coreSNTP
+++ b/FreeRTOS/coreSNTP
@ -0,0 +1 @@
+Subproject commit 32d2168d504e4a7b135ec890e601cc66efc32bd5
--- a/README.md
+++ b/README.md
@ -5,25 +5,33 @@ AWS also offers FreeRTOS Extended Maintenance Plan (EMP) that provides you with

 ## FreeRTOS/FreeRTOS Long Term Support

-Libraries in this GitHub branch (also listed below) are part of the [FreeRTOS 202012.05 LTS](https://github.com/FreeRTOS/FreeRTOS-LTS/tree/202012-LTS) patch release. Learn more at https://freertos.org/lts-libraries.html.
+Libraries in this GitHub branch (also listed below) are part of the [FreeRTOS 202210-LTS](https://github.com/FreeRTOS/FreeRTOS-LTS/tree/202210-LTS) release. Learn more at https://freertos.org/lts-libraries.html.

 | Library                     | Version             | LTS Until  | LTS Repo URL                                                                |
 |-------------------------    |---------------------|------------|---------------------------------------------------------------------------  |
-| FreeRTOS Kernel             | 10.4.3-LTS-Patch-3  | 03/31/2023 | https://github.com/FreeRTOS/FreeRTOS-Kernel/tree/V10.4.3-LTS-Patch-3        |
-| FreeRTOS-Plus-TCP           | 2.3.2-LTS-Patch-2   | 03/31/2023 | https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/tree/V2.3.2-LTS-Patch-2       |
-| coreMQTT                    | 1.1.0               | 03/31/2023 | https://github.com/FreeRTOS/coreMQTT/tree/v1.1.0                            |
-| coreHTTP                    | 2.0.0               | 03/31/2023 | https://github.com/FreeRTOS/coreHTTP/tree/v2.0.0                            |
-| corePKCS11                  | 3.0.0               | 03/31/2023 | https://github.com/FreeRTOS/corePKCS11/tree/v3.0.0                          |
-| coreJSON                    | 3.0.0               | 03/31/2023 | https://github.com/FreeRTOS/coreJSON/tree/v3.0.0                            |
-| backoffAlgorithm            | 1.0.0               | 03/31/2023 | https://github.com/FreeRTOS/backoffAlgorithm/tree/v1.0.0                    |
-| AWS IoT Device Shadow       | 1.0.2               | 03/31/2023 | https://github.com/aws/Device-Shadow-for-AWS-IoT-embedded-sdk/tree/v1.0.2   |
-| AWS IoT Device Defender     | 1.1.0               | 03/31/2023 | https://github.com/aws/Device-Defender-for-AWS-IoT-embedded-sdk/tree/v1.1.0 |
-| AWS IoT Jobs                | 1.1.0               | 03/31/2023 | https://github.com/aws/Jobs-for-AWS-IoT-embedded-sdk/tree/v1.1.0            |
-| AWS IoT Over-the-air Update | 3.0.0               | 03/31/2023 | https://github.com/aws/ota-for-aws-iot-embedded-sdk/tree/v3.0.0             |
+| FreeRTOS Kernel             | 10.5.1              | 10/31/2024 | https://github.com/FreeRTOS/FreeRTOS-Kernel/tree/V10.5.1                        |
+| FreeRTOS-Plus-TCP           | 3.1.0               | 10/31/2024 | https://github.com/FreeRTOS/FreeRTOS-Plus-TCP/tree/V3.1.0                       |
+| coreMQTT                    | 2.1.1               | 10/31/2024 | https://github.com/FreeRTOS/coreMQTT/tree/v2.1.1                                |
+| coreHTTP                    | 3.0.0               | 10/31/2024 | https://github.com/FreeRTOS/coreHTTP/tree/v3.0.0                                |
+| corePKCS11                  | 3.5.0               | 10/31/2024 | https://github.com/FreeRTOS/corePKCS11/tree/v3.5.0                              |
+| coreJSON                    | 3.2.0               | 10/31/2024 | https://github.com/FreeRTOS/coreJSON/tree/v3.2.0                                |
+| coreSNTP                    | 1.2.0               | 10/31/2024 | https://github.com/FreeRTOS/coreSNTP/tree/v1.2.0                                |
+| Cellular Interface          | 1.3.0               | 10/31/2024 | https://github.com/FreeRTOS/FreeRTOS-Cellular-Interface/tree/v1.3.0             |
+| backoffAlgorithm            | 1.3.0               | 10/31/2024 | https://github.com/FreeRTOS/backoffAlgorithm/tree/v1.3.0                        |
+| SigV4                       | 1.2.0               | 10/31/2024 | https://github.com/aws/SigV4-for-AWS-IoT-embedded-sdk/tree/v1.2.0               |
+| AWS IoT Device Shadow       | 1.3.0               | 10/31/2024 | https://github.com/aws/Device-Shadow-for-AWS-IoT-embedded-sdk/tree/v1.3.0       |
+| AWS IoT Device Defender     | 1.3.0               | 10/31/2024 | https://github.com/aws/Device-Defender-for-AWS-IoT-embedded-sdk/tree/v1.3.0     |
+| AWS IoT Jobs                | 1.3.0               | 10/31/2024 | https://github.com/aws/Jobs-for-AWS-IoT-embedded-sdk/tree/v1.3.0                |
+| AWS IoT Fleet Provisioning  | 1.1.0               | 10/31/2024 | https://github.com/aws/Fleet-Provisioning-for-AWS-IoT-embedded-sdk/tree/v1.1.0  |
+| AWS IoT Over-the-air Update | 3.4.0               | 10/31/2024 | https://github.com/aws/ota-for-aws-iot-embedded-sdk/tree/v3.4.0                 |
+
+## Upgrading to FreeRTOS 202210-LTS from a previous version of FreeRTOS LTS
+
+Refer to https://freertos.org/lts-libraries.html on how to upgrade to FreeRTOS 202210 LTS

 ## FreeRTOS LTS Versioning and Patches

-FreeRTOS LTS releases use a date-based versioning scheme (YYYYMM) followed by a patch sequential number (.XX). For example, FreeRTOS 202012.02 LTS means the second patch to the December-2020 FreeRTOS LTS release. You can review the [CHANGELOG](./CHANGELOG.md) and subscribe to [GitHub notifications](https://docs.github.com/en/free-pro-team@latest/github/managing-subscriptions-and-notifications-on-github/about-notifications) to receive information on patches or other updates to this repository.   
+FreeRTOS LTS releases use a date-based versioning scheme (YYYYMM) followed by a patch sequential number (.XX). For example, FreeRTOS 202210.01 LTS means the first patch to the October-2022 FreeRTOS LTS release. You can review the [CHANGELOG](./CHANGELOG.md) and subscribe to [GitHub notifications](https://docs.github.com/en/free-pro-team@latest/github/managing-subscriptions-and-notifications-on-github/about-notifications) to receive information on patches or other updates to this repository.   

 ## Security

@ -32,4 +40,3 @@ See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more inform
 ## License

 This library is licensed under the MIT License. See the [LICENSE](LICENSE.md) file.
-
--- a/aws/device-defender-for-aws-iot-embedded-sdk
+++ b/aws/device-defender-for-aws-iot-embedded-sdk
@ -1 +1 @@
-Subproject commit 548b4688b26d16d0e6134d7d93dcbae103994e40
+Subproject commit 989670043d46dc104477957cdc0ce263218dae0a
--- a/aws/device-shadow-for-aws-iot-embedded-sdk
+++ b/aws/device-shadow-for-aws-iot-embedded-sdk
@ -1 +1 @@
-Subproject commit 508ce43a2257be5d38bfd2a778607fa921cb2dac
+Subproject commit 250821f043d2d080547270b43f01d53c7d52640a
--- a/aws/fleet-provisioning-for-aws-iot-embedded-sdk
+++ b/aws/fleet-provisioning-for-aws-iot-embedded-sdk
@ -0,0 +1 @@
+Subproject commit fca2f6d4a87136a62604ccc5868196496b9c1980
--- a/aws/jobs-for-aws-iot-embedded-sdk
+++ b/aws/jobs-for-aws-iot-embedded-sdk
@ -1 +1 @@
-Subproject commit 19788445bca7f8f85167c83ac12379d3d1022295
+Subproject commit e56c6f8f3a525b895ecbde0dfdde51e959c3e90a
--- a/aws/ota-for-aws-iot-embedded-sdk
+++ b/aws/ota-for-aws-iot-embedded-sdk
@ -1 +1 @@
-Subproject commit 666241d0f643b07d5146a3715b649d80f8135e0b
+Subproject commit f9760892ba152f2c9104d08192ea5ffbbf9fa8ea
--- a/aws/sigv4-for-aws-iot-embedded-sdk
+++ b/aws/sigv4-for-aws-iot-embedded-sdk
@ -0,0 +1 @@
+Subproject commit cbfad41556de904fc94a6f960bad295929688ef4
--- a/manifest.yml
+++ b/manifest.yml
@ -1,60 +1,80 @@
 name : "FreeRTOS-LTS"
-version: "202012.05-LTS"
+version: "202210.00-LTS"
 description: |-
  "Hub Repo for FreeRTOS Long Term Support kernel and libraries"
 dependencies:
  - name: "FreeRTOS-Kernel"
-    version: "V10.4.3-LTS-Patch-3"
+    version: "V10.5.1"
    repository:
      type: "git"
      url: "https://github.com/FreeRTOS/FreeRTOS-Kernel.git"
  - name: "FreeRTOS-Plus-TCP"
-    version: "V2.3.2-LTS-Patch-2"
+    version: "V3.1.0"
    repository:
      type: "git"
      url: "https://github.com/FreeRTOS/FreeRTOS-Plus-TCP.git"
  - name: "coreJSON"
-    version: "V3.0.0"
+    version: "V3.2.0"
    repository:
      type: "git"
      url: "https://github.com/FreeRTOS/coreJSON.git"
  - name: "coreHTTP"
-    version: "v2.0.0"
+    version: "v3.0.0"
    repository:
      type: "git"
      url: "https://github.com/FreeRTOS/coreHTTP.git"
  - name: "coreMQTT"
-    version: "v1.1.0"
+    version: "v2.1.1"
    repository:
      type: "git"
      url: "https://github.com/FreeRTOS/coreMQTT.git"
  - name: "corePKCS11"
-    version: "v3.0.0"
+    version: "v3.5.0"
    repository:
      type: "git"
      url: "https://github.com/FreeRTOS/corePKCS11.git"
+  - name: "coreSNTP"
+    version: "v1.2.0"
+    repository:
+      type: "git"
+      url: "https://github.com/FreeRTOS/coreSNTP.git"
+  - name: "Cellular Interface"
+    version: "v1.3.0"
+    repository:
+      type: "git"
+      url: "https://github.com/FreeRTOS/FreeRTOS-Cellular-Interface.git"
+  - name: "SigV4"
+    version: "v1.2.0"
+    repository:
+      type: "git"
+      url: "https://github.com/aws/SigV4-for-AWS-IoT-embedded-sdk.git"
+  - name: "backoffAlgorithm"
+    version: "v1.3.0"
+    repository:
+      type: "git"
+      url: "https://github.com/FreeRTOS/backoffAlgorithm.git"
  - name: "device-shadow"
-    version: "v1.0.2"
+    version: "v1.3.0"
    repository:
      type: "git"
      url: "https://github.com/aws/Device-Shadow-for-AWS-IoT-embedded-sdk.git"
-  - name: "backoffAlgorithm"
-    version: "v1.0.0"
-    repository:
-      type: "git"
-      url: "https://github.com/FreeRTOS/backoffAlgorithm"
  - name: "device-defender"
-    version: "v1.1.0"
+    version: "v1.3.0"
    repository:
      type: "git"
      url: "https://github.com/aws/Device-Defender-for-AWS-IoT-embedded-sdk.git"
  - name: "jobs"
-    version: "v1.1.0"
+    version: "v1.3.0"
    repository:
      type: "git"
      url: "https://github.com/aws/Jobs-for-AWS-IoT-embedded-sdk.git"
+  - name: "fleet-provisioning"
+    version: "v1.1.0"
+    repository:
+      type: "git"
+      url: "https://github.com/aws/Fleet-Provisioning-for-AWS-IoT-embedded-sdk.git"
  - name: "ota"
-    version: "v3.0.0"
+    version: "v3.4.0"
    repository:
      type: "git"
      url: "https://github.com/aws/ota-for-AWS-IoT-embedded-sdk.git"
Author	SHA1	Message	Date
Soren Ptak	d873a3ed51	Changes for LTS 202210.01 Patch (#27 ) * Changes for LTS 202210.01 Patch Co-authored-by: Soren Ptak <skptak@amazon.com>	2022-11-17 16:16:33 -08:00
Soren Ptak	1e6e92f51e	Updating submodules (#26 )	2022-10-14 13:53:21 -07:00
jasonpcarroll	795f5ab649	Update README.md (#23 )	2022-10-14 11:54:00 -07:00
jasonpcarroll	aaa64755d4	Update manifest.yml (#24 )	2022-10-14 11:53:30 -07:00
jasonpcarroll	2855c08d3b	Update CHANGELOG.md (#25 )	2022-10-14 11:53:13 -07:00
jasonpcarroll	e4a2224e16	Update manifest.yml file for LTS 2.0 (#21 ) * Update CHANGELOG.md and README.md for LTS 2.0. * Update manifest.yml for LTS 2.0. Co-authored-by: Jason Carroll <czjaso@amazon.com>	2022-10-14 11:44:27 -07:00
Soren Ptak	7c78114b5e	Update submodules for LTS 2.0. (#22 )	2022-10-14 11:44:05 -07:00
jasonpcarroll	c13962d197	Update CHANGELOG.md and README.md for LTS 2.0. (#19 ) Co-authored-by: Jason Carroll <czjaso@amazon.com>	2022-10-13 18:09:04 -07:00
Soren Ptak	1ebd24387c	Merge pull request #18 from Skptak/202210-LTS Update Main To 202012-LTS	2022-10-04 14:09:41 -07:00
Soren Ptak	92c255945f	Using 202012-LTS As the starting point for this branch	2022-10-04 20:56:47 +00:00
Soren Ptak	7e3cee0ae6	3 years of support, not 2	2022-09-22 19:04:43 +00:00
Soren Ptak	768a68d7cd	Merge branch 'main' into 202209-LTS	2022-09-21 10:53:29 -07:00
Soren Ptak	21264d7875	Updating the version in the README and manifest files for LTS 2.0	2022-09-21 17:50:43 +00:00
Cobus van Eeden	6b8fd2c50c	Update README.md	2020-12-15 08:04:20 -08:00
				`@ -0,0 +1 @@`
				`Subproject commit 0c6eae034079360dca9839438cc4b12b6100d976`
				`@ -0,0 +1 @@`
				`Subproject commit 32d2168d504e4a7b135ec890e601cc66efc32bd5`
				`@ -0,0 +1 @@`
				`Subproject commit fca2f6d4a87136a62604ccc5868196496b9c1980`
				`@ -0,0 +1 @@`
				`Subproject commit cbfad41556de904fc94a6f960bad295929688ef4`