Merge branch 'main' into cbmc-v6

AniruddhaKanhere · web-flow · commit 622aa944e0c0 · 2024-09-04T15:58:36.000-07:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,7 +45,7 @@ jobs:
   tag-commit:
     if: ${{ ( github.event.inputs.delete_existing_tag_release == 'true' && success() )  || ( github.event.inputs.delete_existing_tag_release == 'false' && always() ) }}
     needs: clean-existing-tag-and-release
-    name: Tag commit
+    name: Generate SBOM and tag commit
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
@@ -54,7 +54,20 @@ jobs:
           ref: ${{ github.event.inputs.commit_id }}
       - name: Configure git identity
         run: |
-            git config --global user.name "Release Workflow"
+          git config --global user.name ${{ github.actor }}
+          git config --global user.email ${{ github.actor }}@users.noreply.github.com
+      - name: create a new branch that references commit id
+        run: git checkout -b ${{ github.event.inputs.version_number }} ${{ github.event.inputs.commit_id }}
+      - name: Generate SBOM
+        uses: FreeRTOS/CI-CD-Github-Actions/sbom-generator@main
+        with:
+          repo_path: ./
+          source_path: ./source
+      - name: commit SBOM file
+        run: |
+          git add .
+          git commit -m 'Update SBOM'
+          git push -u origin ${{ github.event.inputs.version_number }}
       - name: Tag Commit and Push to remote
         run: |
           git tag ${{ github.event.inputs.version_number }} -a -m "coreMQTT-Agent Library ${{ github.event.inputs.version_number }}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog for coreMQTT Agent Library
 
+## v1.3.0 (August 2024)
+
+### Changes
+ - [#114](https://github.com/FreeRTOS/coreMQTT-Agent/pull/114) Update CMock submodule pointer to latest version v2.5.3.
+ - [#111](https://github.com/FreeRTOS/coreMQTT-Agent/pull/111) Update coreMQTT-Agent to work with the coreMQTT v2.3.1.
+ - [#110](https://github.com/FreeRTOS/coreMQTT-Agent/pull/110) Fix MISRA violation.
+ - [#109](https://github.com/FreeRTOS/coreMQTT-Agent/pull/109) Update CMakeList optionally build UT/Coverity & Update Coverity configuration.
+ - [#108](https://github.com/FreeRTOS/coreMQTT-Agent/pull/108) Use CBMC version 5.95.1.
+ - [#107](https://github.com/FreeRTOS/coreMQTT-Agent/pull/107) Add documentation about configuration options.
+ - [#105](https://github.com/FreeRTOS/coreMQTT-Agent/pull/105) Update this repository to use new CI-CD Actions.
+ - [#103](https://github.com/FreeRTOS/coreMQTT-Agent/pull/103) Update Agent to treat MQTTNeedMoreBytes correctly.
+ - [#84](https://github.com/FreeRTOS/coreMQTT-Agent/pull/84) Create pull_request_template.md.
+ - [#83](https://github.com/FreeRTOS/coreMQTT-Agent/pull/83) Add CBMC proof-running GitHub Action.
+ - [#81](https://github.com/FreeRTOS/coreMQTT-Agent/pull/81) Fix unsigned comparison IAR compiler warnings.
+
 ## v1.2.0 (October 2022)
 
 ### Changes
diff --git a/docs/doxygen/config.doxyfile b/docs/doxygen/config.doxyfile
@@ -48,7 +48,7 @@ PROJECT_NAME           = "coreMQTT Agent"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v1.2.0
+PROJECT_NUMBER         = v1.3.0+
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/manifest.yml b/manifest.yml
@@ -1,18 +1,20 @@
 name : "coreMQTT Agent"
-version: "v1.2.0"
+version: "v1.3.0+"
 description: |
   "Agent for thread-safe use of coreMQTT.\n"
 license: "MIT"
 dependencies:
   - name : "coreMQTT"
     version: "v2.3.1"
+    license: "MIT"
     repository:
       type: "git"
       url: "https://github.com/FreeRTOS/coreMQTT/"
       path: source/dependency/coreMQTT
 
   - name: "CMock"
-    version: "3b443e5"
+    version: "v2.5.3"
+    license: "MIT"
     repository:
       type: "git"
       url: " https://github.com/ThrowTheSwitch/CMock.git"
diff --git a/source/core_mqtt_agent.c b/source/core_mqtt_agent.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/source/core_mqtt_agent_command_functions.c b/source/core_mqtt_agent_command_functions.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/source/include/core_mqtt_agent.h b/source/include/core_mqtt_agent.h
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/source/include/core_mqtt_agent_command_functions.h b/source/include/core_mqtt_agent_command_functions.h
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/source/include/core_mqtt_agent_config_defaults.h b/source/include/core_mqtt_agent_config_defaults.h
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/source/include/core_mqtt_agent_default_logging.h b/source/include/core_mqtt_agent_default_logging.h
@@ -1,5 +1,5 @@
 /*
- * coreMQTT-Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2022 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/source/include/core_mqtt_agent_message_interface.h b/source/include/core_mqtt_agent_message_interface.h
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required ( VERSION 3.22.0 )
 project ( "MQTTAgent tests"
-          VERSION 1.2.0
+          VERSION 1.3.0
           LANGUAGES C )
 
 # Allow the project to be organized into folders.
diff --git a/test/cbmc/include/agent_command_pool_stubs.h b/test/cbmc/include/agent_command_pool_stubs.h
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/include/agent_message_stubs.h b/test/cbmc/include/agent_message_stubs.h
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/include/core_mqtt_config.h b/test/cbmc/include/core_mqtt_config.h
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/include/get_time_stub.h b/test/cbmc/include/get_time_stub.h
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/include/incoming_publish_callback_stub.h b/test/cbmc/include/incoming_publish_callback_stub.h
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/include/mqtt_agent_cbmc_state.h b/test/cbmc/include/mqtt_agent_cbmc_state.h
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/include/network_interface_stubs.h b/test/cbmc/include/network_interface_stubs.h
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgentCommand_Connect/MQTTAgentCommand_Connect_harness.c b/test/cbmc/proofs/MQTTAgentCommand_Connect/MQTTAgentCommand_Connect_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgentCommand_Disconnect/MQTTAgentCommand_Disconnect_harness.c b/test/cbmc/proofs/MQTTAgentCommand_Disconnect/MQTTAgentCommand_Disconnect_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgentCommand_Ping/MQTTAgentCommand_Ping_harness.c b/test/cbmc/proofs/MQTTAgentCommand_Ping/MQTTAgentCommand_Ping_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgentCommand_ProcessLoop/MQTTAgentCommand_ProcessLoop_harness.c b/test/cbmc/proofs/MQTTAgentCommand_ProcessLoop/MQTTAgentCommand_ProcessLoop_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgentCommand_Publish/MQTTAgentCommand_Publish_harness.c b/test/cbmc/proofs/MQTTAgentCommand_Publish/MQTTAgentCommand_Publish_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgentCommand_Subscribe/MQTTAgentCommand_Subscribe_harness.c b/test/cbmc/proofs/MQTTAgentCommand_Subscribe/MQTTAgentCommand_Subscribe_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgentCommand_Terminate/MQTTAgentCommand_Terminate_harness.c b/test/cbmc/proofs/MQTTAgentCommand_Terminate/MQTTAgentCommand_Terminate_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgentCommand_Unsubscribe/MQTTAgentCommand_Unsubscribe_harness.c b/test/cbmc/proofs/MQTTAgentCommand_Unsubscribe/MQTTAgentCommand_Unsubscribe_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgent_CancelAll/MQTTAgent_CancelAll_harness.c b/test/cbmc/proofs/MQTTAgent_CancelAll/MQTTAgent_CancelAll_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgent_CommandLoop/MQTTAgent_CommandLoop_harness.c b/test/cbmc/proofs/MQTTAgent_CommandLoop/MQTTAgent_CommandLoop_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgent_Connect/MQTTAgent_Connect_harness.c b/test/cbmc/proofs/MQTTAgent_Connect/MQTTAgent_Connect_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgent_Disconnect/MQTTAgent_Disconnect_harness.c b/test/cbmc/proofs/MQTTAgent_Disconnect/MQTTAgent_Disconnect_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgent_Init/MQTTAgent_Init_harness.c b/test/cbmc/proofs/MQTTAgent_Init/MQTTAgent_Init_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgent_Ping/MQTTAgent_Ping_harness.c b/test/cbmc/proofs/MQTTAgent_Ping/MQTTAgent_Ping_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgent_ProcessLoop/MQTTAgent_ProcessLoop_harness.c b/test/cbmc/proofs/MQTTAgent_ProcessLoop/MQTTAgent_ProcessLoop_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgent_Publish/MQTTAgent_Publish_harness.c b/test/cbmc/proofs/MQTTAgent_Publish/MQTTAgent_Publish_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgent_ResumeSession/MQTTAgent_ResumeSession_harness.c b/test/cbmc/proofs/MQTTAgent_ResumeSession/MQTTAgent_ResumeSession_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgent_Subscribe/MQTTAgent_Subscribe_harness.c b/test/cbmc/proofs/MQTTAgent_Subscribe/MQTTAgent_Subscribe_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgent_Terminate/MQTTAgent_Terminate_harness.c b/test/cbmc/proofs/MQTTAgent_Terminate/MQTTAgent_Terminate_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/proofs/MQTTAgent_Unsubscribe/MQTTAgent_Unsubscribe_harness.c b/test/cbmc/proofs/MQTTAgent_Unsubscribe/MQTTAgent_Unsubscribe_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/sources/mqtt_agent_cbmc_state.c b/test/cbmc/sources/mqtt_agent_cbmc_state.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/stubs/agent_command_functions_stub.c b/test/cbmc/stubs/agent_command_functions_stub.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/stubs/agent_command_pool_stubs.c b/test/cbmc/stubs/agent_command_pool_stubs.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/stubs/agent_message_stubs.c b/test/cbmc/stubs/agent_message_stubs.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/stubs/core_mqtt_stubs.c b/test/cbmc/stubs/core_mqtt_stubs.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/stubs/get_time_stub.c b/test/cbmc/stubs/get_time_stub.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/stubs/incoming_publish_callback_stub.c b/test/cbmc/stubs/incoming_publish_callback_stub.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/cbmc/stubs/network_interface_stubs.c b/test/cbmc/stubs/network_interface_stubs.c
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/CMock b/test/unit-test/CMock
@@ -1 +1 @@
-Subproject commit 3b443e551d538e93e86ec7bb56a0d7fde3715a3c
+Subproject commit 9d092898ef26ece140d9225e037274b64d4f851e
diff --git a/test/unit-test/config/core_mqtt_config.h b/test/unit-test/config/core_mqtt_config.h
@@ -1,5 +1,5 @@
 /*
- * coreMQTT Agent v1.2.0
+ * coreMQTT Agent <DEVELOPMENT BRANCH>
  * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
diff --git a/test/unit-test/logging/logging_levels.h b/test/unit-test/logging/logging_levels.h
diff --git a/test/unit-test/logging/logging_stack.h b/test/unit-test/logging/logging_stack.h
diff --git a/test/unit-test/mqtt_agent_command_functions_utest.c b/test/unit-test/mqtt_agent_command_functions_utest.c
diff --git a/test/unit-test/mqtt_agent_utest.c b/test/unit-test/mqtt_agent_utest.c

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * coreMQTT Agent v1.2.0`
	`2`	`+ * coreMQTT Agent <DEVELOPMENT BRANCH>`
`3`	`3`	`* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.`
`4`	`4`	`*`
`5`	`5`	`* Permission is hereby granted, free of charge, to any person obtaining a copy of`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * coreMQTT-Agent v1.2.0`
	`2`	`+ * coreMQTT Agent <DEVELOPMENT BRANCH>`
`3`	`3`	`* Copyright (C) 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.`
`4`	`4`	`*`
`5`	`5`	`* Permission is hereby granted, free of charge, to any person obtaining a copy of`