Skip to content

Commit

Permalink
Version Number Fix (#125)
Browse files Browse the repository at this point in the history
* Bumping to version 3.2 instead of patch 3.1.1

* Fixing pattern match type in README

Co-authored-by: Soren Ptak <[email protected]>
  • Loading branch information
Skptak and Soren Ptak authored Sep 23, 2022
1 parent 16637e3 commit a0cd612
Show file tree
Hide file tree
Showing 30 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Change Log for coreJSON Library

## v3.1.1 (August 2022)
## v3.2.0 (September 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.
Expand Down
2 changes: 1 addition & 1 deletion docs/doxygen/config.doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
PROJECT_NUMBER = v3.2.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
Expand Down
2 changes: 1 addition & 1 deletion manifest.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name : "coreJSON"
version: "v3.1.1"
version: "v3.2.0"
description: |
"A parser strictly enforcing the ECMA-404 JSON standard, suitable for microcontrollers. \n"
license: "MIT"
2 changes: 1 addition & 1 deletion source/core_json.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion source/include/core_json.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/include/core_json_annex.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/include/skipGeneric.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/JSON_Iterate/JSON_Iterate_harness.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/JSON_Search/JSON_Search_harness.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/JSON_Validate/JSON_Validate_harness.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/skipAnyLiteral/skipAnyLiteral_harness.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/skipCollection/skipCollection_harness.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/skipEscape/skipEscape_harness.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/skipNumber/skipNumber_harness.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/skipSpace/skipSpace_harness.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/skipString/skipString_harness.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/proofs/skipUTF8/skipUTF8_harness.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/stubs/skipAnyLiteral.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/stubs/skipAnyScalar.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/stubs/skipCollection.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/stubs/skipEscape.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/stubs/skipGeneric.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/stubs/skipNumber.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/stubs/skipSpace.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/stubs/skipSpaceAndComma.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/stubs/skipString.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/cbmc/stubs/skipUTF8.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
2 changes: 1 addition & 1 deletion test/unit-test/core_json_utest.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* coreJSON v3.1.1
* coreJSON v3.2.0
* 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
Expand Down
8 changes: 4 additions & 4 deletions tools/coverity/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ Go to the root directory of the library and run the following commands in termin
~~~
6. Format the errors in HTML format so that it is more readable while removing the test and build directory from the report
~~~
cov-format-errors --dir . --file "*/source" --exclude-files '(/build/|/test/)' --html-output html-out;
cov-format-errors --dir . --file "source" --exclude-files '(/build/|/test/)' --html-output html-out;
~~~
7. Format the errors in JSON format to perform a jq query to get a simplified list of any exceptions.
NOTE: A blank output means there are no defects that aren't being suppressed by the config or inline comments.
~~~
cov-format-errors --dir . --file "*/source" --exclude-files '(/build/|/test/)' --json-output-v2 defects.json;
cov-format-errors --dir . --file "source" --exclude-files '(/build/|/test/)' --json-output-v2 defects.json;
echo -e "\n-------------------------Non-Suppresed Deviations, if any, Listed Below-------------------------\n";
jq '.issues[] | .events[] | .eventTag ' defects.json | sort | uniq -c | sort -nr;
echo -e "\n-------------------------Non-Suppresed Deviations, if any, Listed Above-------------------------\n";
Expand All @@ -67,8 +67,8 @@ For your convenience the commands above are below to be copy/pasted into a UNIX
cov-build --emit-complementary-info --dir cov-out make coverity_analysis;
cd cov-out/
cov-analyze --dir . --coding-standard-config ../../tools/coverity/misra.config;
cov-format-errors --dir . --file "*/source" --exclude-files '(/build/|/test/)' --html-output html-out;
cov-format-errors --dir . --file "*/source" --exclude-files '(/build/|/test/)' --json-output-v2 defects.json;
cov-format-errors --dir . --file "source" --exclude-files '(/build/|/test/)' --html-output html-out;
cov-format-errors --dir . --file "source" --exclude-files '(/build/|/test/)' --json-output-v2 defects.json;
echo -e "\n-------------------------Non-Suppresed Deviations, if any, Listed Below-------------------------\n";
jq '.issues[] | .events[] | .eventTag ' defects.json | sort | uniq -c | sort -nr;
echo -e "\n-------------------------Non-Suppresed Deviations, if any, Listed Above-------------------------\n";
Expand Down

0 comments on commit a0cd612

Please sign in to comment.