LTS Version Change (#123)

Skptak · Soren Ptak · web-flow · commit ccfdaf3a20ef · 2022-08-19T14:20:42.000-07:00
* Updating version and CHANGELOG for LTS 2.0 release

* Fixing revision

* Fixed incorrect version in CHANGELOG.md file

* Changing title for PR in the CHANGELOG.md file

Co-authored-by: Soren Ptak &lt;skptak@amazon.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log for coreJSON Library
 
+## v3.1.1 (August 2022)
+- [#121](https://github.com/FreeRTOS/coreJSON/pull/121) MISRA C:2012 compliance updates.
+- [#119](https://github.com/FreeRTOS/coreJSON/pull/119) Update CBMC Starter Kit.
+- [#115](https://github.com/FreeRTOS/coreJSON/pull/115) Fix JSON validation for mismatched brackets.
+- [#109](https://github.com/FreeRTOS/coreJSON/pull/109) Remove non-ASCII characters
+
 ## v3.1.0 (November 2021)
 - [#106](https://github.com/FreeRTOS/coreJSON/pull/106) Update doxygen version for documentation.
 
diff --git a/docs/doxygen/config.doxyfile b/docs/doxygen/config.doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = coreJSON
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = v3.1.0
+PROJECT_NUMBER         = v3.1.1
 
 # 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,5 +1,5 @@
 name : "coreJSON"
-version: "v3.1.0"
+version: "v3.1.1"
 description: |
   "A parser strictly enforcing the ECMA-404 JSON standard, suitable for microcontrollers. \n"
 license: "MIT"
diff --git a/source/core_json.c b/source/core_json.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -335,7 +335,6 @@ static bool skipOneHexEscape( const char * buf,
 
     i = *start;
 #define HEX_ESCAPE_LENGTH    ( 6U )   /* e.g., \u1234 */
-
     /* MISRA Ref 14.3.1 [Configuration dependent invariant] */
     /* More details at: https://github.com/FreeRTOS/coreJSON/blob/main/MISRA.md#rule-143 */
     /* coverity[misra_c_2012_rule_14_3_violation] */
diff --git a/source/include/core_json.h b/source/include/core_json.h
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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_json_annex.h b/test/cbmc/include/core_json_annex.h
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipGeneric.h b/test/cbmc/include/skipGeneric.h
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/JSON_Iterate/JSON_Iterate_harness.c b/test/cbmc/proofs/JSON_Iterate/JSON_Iterate_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/JSON_Search/JSON_Search_harness.c b/test/cbmc/proofs/JSON_Search/JSON_Search_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/JSON_Validate/JSON_Validate_harness.c b/test/cbmc/proofs/JSON_Validate/JSON_Validate_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipAnyLiteral/skipAnyLiteral_harness.c b/test/cbmc/proofs/skipAnyLiteral/skipAnyLiteral_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipCollection/skipCollection_harness.c b/test/cbmc/proofs/skipCollection/skipCollection_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipEscape/skipEscape_harness.c b/test/cbmc/proofs/skipEscape/skipEscape_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipNumber/skipNumber_harness.c b/test/cbmc/proofs/skipNumber/skipNumber_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipSpace/skipSpace_harness.c b/test/cbmc/proofs/skipSpace/skipSpace_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipSpaceAndComma/skipSpaceAndComma_harness.c b/test/cbmc/proofs/skipSpaceAndComma/skipSpaceAndComma_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipString/skipString_harness.c b/test/cbmc/proofs/skipString/skipString_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipUTF8/skipUTF8_harness.c b/test/cbmc/proofs/skipUTF8/skipUTF8_harness.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipAnyLiteral.c b/test/cbmc/stubs/skipAnyLiteral.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipAnyScalar.c b/test/cbmc/stubs/skipAnyScalar.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipCollection.c b/test/cbmc/stubs/skipCollection.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipEscape.c b/test/cbmc/stubs/skipEscape.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipGeneric.c b/test/cbmc/stubs/skipGeneric.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipNumber.c b/test/cbmc/stubs/skipNumber.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipSpace.c b/test/cbmc/stubs/skipSpace.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipSpaceAndComma.c b/test/cbmc/stubs/skipSpaceAndComma.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipString.c b/test/cbmc/stubs/skipString.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/skipUTF8.c b/test/cbmc/stubs/skipUTF8.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 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/core_json_utest.c b/test/unit-test/core_json_utest.c
@@ -1,5 +1,5 @@
 /*
- * coreJSON v3.1.0
+ * coreJSON v3.1.1
  * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.
  *
  * 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`		`- * coreJSON v3.1.0`
	`2`	`+ * coreJSON v3.1.1`
`3`	`3`	`* Copyright (C) 2020 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`