Skip to content

Commit 667cc64

Browse files
SkptakSoren Ptak
and
Soren Ptak
authored
LTS 2.0 Launch (#126)
* Updating CHANGELOG and README release months * Adding SPDX license * Fixing a workflow Co-authored-by: Soren Ptak <[email protected]>
1 parent a0cd612 commit 667cc64

32 files changed

+62
-2
lines changed

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
required: true
1212

1313
jobs:
14-
generate-sbom-and-tag-commit:
14+
tag-commit:
1515
name: Tag commit
1616
runs-on: ubuntu-latest
1717
steps:

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Change Log for coreJSON Library
22

3-
## v3.2.0 (September 2022)
3+
## v3.2.0 (October 2022)
44
- [#121](https://github.com/FreeRTOS/coreJSON/pull/121) MISRA C:2012 compliance updates.
55
- [#119](https://github.com/FreeRTOS/coreJSON/pull/119) Update CBMC Starter Kit.
66
- [#115](https://github.com/FreeRTOS/coreJSON/pull/115) Fix JSON validation for mismatched brackets.

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ This library has gone through code quality checks including verification that no
66

77
See memory requirements for this library [here](./docs/doxygen/include/size_table.md).
88

9+
**coreJSON v3.2.0 [source code](https://github.com/FreeRTOS/coreJSON/tree/v3.2.0/source) is part of the [FreeRTOS 202210.00 LTS](https://github.com/FreeRTOS/FreeRTOS-LTS/tree/202210.00-LTS) release.**
10+
911
**coreJSON v3.0.0 [source code](https://github.com/FreeRTOS/coreJSON/tree/v3.0.0/source) is part of the [FreeRTOS 202012.00 LTS](https://github.com/FreeRTOS/FreeRTOS-LTS/tree/202012.00-LTS) release.**
1012

1113
## Reference example

lexicon.txt

+2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ md
7070
microcontrollers
7171
min
7272
misra
73+
mit
7374
msb
7475
multibyte
7576
nb
@@ -106,6 +107,7 @@ skipspace
106107
skipspaceandcomma
107108
skipstring
108109
skiputf
110+
spdx
109111
stderr
110112
struct
111113
sublicense

source/core_json.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

source/include/core_json.h

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/include/core_json_annex.h

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/include/skipGeneric.h

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/proofs/JSON_Iterate/JSON_Iterate_harness.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/proofs/JSON_Search/JSON_Search_harness.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/proofs/JSON_Validate/JSON_Validate_harness.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/proofs/skipAnyLiteral/skipAnyLiteral_harness.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/proofs/skipCollection/skipCollection_harness.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/proofs/skipEscape/skipEscape_harness.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/proofs/skipNumber/skipNumber_harness.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/proofs/skipSpace/skipSpace_harness.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/proofs/skipSpaceAndComma/skipSpaceAndComma_harness.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/proofs/skipString/skipString_harness.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/proofs/skipUTF8/skipUTF8_harness.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/stubs/skipAnyLiteral.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/stubs/skipAnyScalar.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/stubs/skipCollection.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/stubs/skipDigits.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v1.0.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/stubs/skipEscape.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/stubs/skipGeneric.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/stubs/skipNumber.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/stubs/skipSpace.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/stubs/skipSpaceAndComma.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/stubs/skipString.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/cbmc/stubs/skipUTF8.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

test/unit-test/catch_assert.h

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/*
22
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
*
4+
* SPDX-License-Identifier: MIT
5+
*
46
* Permission is hereby granted, free of charge, to any person obtaining a copy of
57
* this software and associated documentation files (the "Software"), to deal in
68
* the Software without restriction, including without limitation the rights to

test/unit-test/core_json_utest.c

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
* coreJSON v3.2.0
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
5+
* SPDX-License-Identifier: MIT
6+
*
57
* Permission is hereby granted, free of charge, to any person obtaining a copy of
68
* this software and associated documentation files (the "Software"), to deal in
79
* the Software without restriction, including without limitation the rights to

0 commit comments

Comments
 (0)