diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 84c179c5d..23b15bb82 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,16 +4,13 @@ Here is minimal sequence of steps required to prepare development environment: -1. Download Boost superproject -2. Download Boost.JSON -3. Bootstrap Boost -4. Build Boost.JSON tests, benchmarks and examples +1. Download Boost +2. Bootstrap Boost +3. Build Boost.JSON tests, benchmarks and examples ``` git clone --recurse-submodules --jobs 8 https://github.com/boostorg/boost.git -cd boost/libs -git clone --recurse-submodules https://github.com/cppalliance/json.git -cd .. +cd boost ./bootstrap.sh ./b2 headers cd libs/json diff --git a/README.md b/README.md index 13a737a5e..fb7ac3453 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -[![Boost.JSON](https://raw.githubusercontent.com/CPPAlliance/json/master/doc/images/repo-logo-3.png)](http://master.json.cpp.al/) +[![Boost.JSON](https://raw.githubusercontent.com/CPPAlliance/json/master/doc/images/repo-logo-3.png)](https://www.boost.org/doc/libs/release/libs/json) -Branch | [`master`](https://github.com/CPPAlliance/json/tree/master) | [`develop`](https://github.com/CPPAlliance/json/tree/develop) | +Branch | [`master`](https://github.com/boostorg/json/tree/master) | [`develop`](https://github.com/boostorg/json/tree/develop) | --------------- | ----------------------------------------------------------- | ------------------------------------------------------------- | [Azure](https://azure.microsoft.com/en-us/services/devops/pipelines/) | [![Build Status](https://img.shields.io/azure-devops/build/vinniefalco/2571d415-8cc8-4120-a762-c03a8eda0659/8/master)](https://vinniefalco.visualstudio.com/json/_build/latest?definitionId=5&branchName=master) | [![Build Status](https://img.shields.io/azure-devops/build/vinniefalco/2571d415-8cc8-4120-a762-c03a8eda0659/8/develop)](https://vinniefalco.visualstudio.com/json/_build/latest?definitionId=8&branchName=develop) Docs | [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://www.boost.org/doc/libs/master/libs/json/) | [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](https://www.boost.org/doc/libs/develop/libs/json/) diff --git a/doc/Jamfile b/doc/Jamfile index 17d52c500..13fbc238d 100644 --- a/doc/Jamfile +++ b/doc/Jamfile @@ -5,7 +5,7 @@ # Distributed under the Boost Software License, Version 1.0. (See accompanying # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) # -# Official repository: https://github.com/cppalliance/json +# Official repository: https://github.com/boostorg/json # project json/doc ; diff --git a/doc/javadoc.hpp b/doc/javadoc.hpp index 3ced2c7fc..838bf007e 100644 --- a/doc/javadoc.hpp +++ b/doc/javadoc.hpp @@ -4,7 +4,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) // -// Official repository: https://github.com/cppalliance/json +// Official repository: https://github.com/boostorg/json // ----------------------------- DOCUMENTATION STYLE GUIDE ------------------------------- @@ -591,4 +591,4 @@ a list of relevant named requirements that this type meets. {See Also}] -*/ \ No newline at end of file +*/ diff --git a/doc/library-detail.adoc b/doc/library-detail.adoc index ae23b803b..1bd7320e7 100644 --- a/doc/library-detail.adoc +++ b/doc/library-detail.adoc @@ -1,9 +1,9 @@ -http://master.json.cpp.al/[image:https://raw.githubusercontent.com/CPPAlliance/json/master/doc/images/repo-logo-3.png[Boost.JSON]] +https://www.boost.org/doc/libs/release/libs/json/[image:https://raw.githubusercontent.com/CPPAlliance/json/master/doc/images/repo-logo-3.png[Boost.JSON]] [width="100%",cols="12%,43%,45%",options="header",] |=== -|Branch |https://github.com/CPPAlliance/json/tree/master[`master`] -|https://github.com/CPPAlliance/json/tree/develop[`develop`] +|Branch |https://github.com/boostorg/json/tree/master[`master`] +|https://github.com/boostorg/json/tree/develop[`develop`] |https://azure.microsoft.com/en-us/services/devops/pipelines/[Azure] |https://vinniefalco.visualstudio.com/json/_build/latest?definitionId=5&branchName=master[image:https://img.shields.io/azure-devops/build/vinniefalco/2571d415-8cc8-4120-a762-c03a8eda0659/8/master[Build Status]] diff --git a/doc/qbk/allocators/background.qbk b/doc/qbk/allocators/background.qbk index c8dc8d022..ad4eea3fd 100644 --- a/doc/qbk/allocators/background.qbk +++ b/doc/qbk/allocators/background.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/allocators/overview.qbk b/doc/qbk/allocators/overview.qbk index 7f3f40dc4..6012c66b6 100644 --- a/doc/qbk/allocators/overview.qbk +++ b/doc/qbk/allocators/overview.qbk @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/allocators/pmr.qbk b/doc/qbk/allocators/pmr.qbk index ffdad016d..ec416de74 100644 --- a/doc/qbk/allocators/pmr.qbk +++ b/doc/qbk/allocators/pmr.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/allocators/storage_ptr.qbk b/doc/qbk/allocators/storage_ptr.qbk index 603d1d150..77c57babc 100644 --- a/doc/qbk/allocators/storage_ptr.qbk +++ b/doc/qbk/allocators/storage_ptr.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/benchmarks.qbk b/doc/qbk/benchmarks.qbk index 6cf1216c0..1a1928784 100644 --- a/doc/qbk/benchmarks.qbk +++ b/doc/qbk/benchmarks.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [section Benchmarks] diff --git a/doc/qbk/comparison.qbk b/doc/qbk/comparison.qbk index a82c4491e..5d87bf23b 100644 --- a/doc/qbk/comparison.qbk +++ b/doc/qbk/comparison.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [section:comparison Comparison to Other Libraries] diff --git a/doc/qbk/conversion/alloc.qbk b/doc/qbk/conversion/alloc.qbk index 66fbe33a9..bffa8274e 100644 --- a/doc/qbk/conversion/alloc.qbk +++ b/doc/qbk/conversion/alloc.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/conversion/basics.qbk b/doc/qbk/conversion/basics.qbk index eb1757915..c94ae6b22 100644 --- a/doc/qbk/conversion/basics.qbk +++ b/doc/qbk/conversion/basics.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/conversion/context.qbk b/doc/qbk/conversion/context.qbk index f7be8b9a4..248ac5033 100644 --- a/doc/qbk/conversion/context.qbk +++ b/doc/qbk/conversion/context.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/conversion/custom.qbk b/doc/qbk/conversion/custom.qbk index aa8f681bf..5c7504b9a 100644 --- a/doc/qbk/conversion/custom.qbk +++ b/doc/qbk/conversion/custom.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/conversion/forward.qbk b/doc/qbk/conversion/forward.qbk index 4aa48ed34..a0be8753b 100644 --- a/doc/qbk/conversion/forward.qbk +++ b/doc/qbk/conversion/forward.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/conversion/guidelines.qbk b/doc/qbk/conversion/guidelines.qbk index 787380c5c..dd269c022 100644 --- a/doc/qbk/conversion/guidelines.qbk +++ b/doc/qbk/conversion/guidelines.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/conversion/nothrow.qbk b/doc/qbk/conversion/nothrow.qbk index e612c9798..f35579386 100644 --- a/doc/qbk/conversion/nothrow.qbk +++ b/doc/qbk/conversion/nothrow.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/conversion/overview.qbk b/doc/qbk/conversion/overview.qbk index 032812509..2099a6c2d 100644 --- a/doc/qbk/conversion/overview.qbk +++ b/doc/qbk/conversion/overview.qbk @@ -6,7 +6,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/dom/array.qbk b/doc/qbk/dom/array.qbk index 62c2d040d..8ac697285 100644 --- a/doc/qbk/dom/array.qbk +++ b/doc/qbk/dom/array.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/dom/init_lists.qbk b/doc/qbk/dom/init_lists.qbk index a3eb57a75..de3e31a52 100644 --- a/doc/qbk/dom/init_lists.qbk +++ b/doc/qbk/dom/init_lists.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/dom/numbers.qbk b/doc/qbk/dom/numbers.qbk index 4cd045300..1012a43bd 100644 --- a/doc/qbk/dom/numbers.qbk +++ b/doc/qbk/dom/numbers.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/dom/object.qbk b/doc/qbk/dom/object.qbk index 5c9462668..074d3743c 100644 --- a/doc/qbk/dom/object.qbk +++ b/doc/qbk/dom/object.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/dom/overview.qbk b/doc/qbk/dom/overview.qbk index 7c09f139d..6982c2378 100644 --- a/doc/qbk/dom/overview.qbk +++ b/doc/qbk/dom/overview.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [section:dom Document Model] diff --git a/doc/qbk/dom/string.qbk b/doc/qbk/dom/string.qbk index 89c8b20e9..942f3f7ed 100644 --- a/doc/qbk/dom/string.qbk +++ b/doc/qbk/dom/string.qbk @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/dom/value.qbk b/doc/qbk/dom/value.qbk index 0226c9fba..6d69dfd5a 100644 --- a/doc/qbk/dom/value.qbk +++ b/doc/qbk/dom/value.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/examples.qbk b/doc/qbk/examples.qbk index b45588b34..aa521ae3f 100644 --- a/doc/qbk/examples.qbk +++ b/doc/qbk/examples.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/faq.qbk b/doc/qbk/faq.qbk index a7e3274d3..be3e28910 100644 --- a/doc/qbk/faq.qbk +++ b/doc/qbk/faq.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/index.xml b/doc/qbk/index.xml index 8e4eb8442..69b5d789a 100644 --- a/doc/qbk/index.xml +++ b/doc/qbk/index.xml @@ -6,7 +6,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json -->
diff --git a/doc/qbk/io/overview.qbk b/doc/qbk/io/overview.qbk index 7483c0fad..bd2be4c4e 100644 --- a/doc/qbk/io/overview.qbk +++ b/doc/qbk/io/overview.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/io/parsing.qbk b/doc/qbk/io/parsing.qbk index 6da304d02..21a77b41f 100644 --- a/doc/qbk/io/parsing.qbk +++ b/doc/qbk/io/parsing.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/io/serializing.qbk b/doc/qbk/io/serializing.qbk index 5820ca520..7916d49ee 100644 --- a/doc/qbk/io/serializing.qbk +++ b/doc/qbk/io/serializing.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/main.qbk b/doc/qbk/main.qbk index bbd2eca78..13cd123db 100644 --- a/doc/qbk/main.qbk +++ b/doc/qbk/main.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [library Boost.JSON @@ -28,8 +28,8 @@ [template indexterm1[term1] ''''''[term1]''''''] [template indexterm2[term1 term2] ''''''[term1]''''''[term2]''''''] -[template include_file[path][^<''''''[path]''''''>]] -[template issue[n] '''#'''[n]''''''] +[template include_file[path][^<''''''[path]''''''>]] +[template issue[n] '''#'''[n]''''''] [/ Named Requirements ] diff --git a/doc/qbk/overview.qbk b/doc/qbk/overview.qbk index f43b32dfc..cea980317 100644 --- a/doc/qbk/overview.qbk +++ b/doc/qbk/overview.qbk @@ -5,7 +5,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [section Overview] diff --git a/doc/qbk/quick_look.qbk b/doc/qbk/quick_look.qbk index 7902179c3..cc49459fa 100644 --- a/doc/qbk/quick_look.qbk +++ b/doc/qbk/quick_look.qbk @@ -4,7 +4,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json ] [/-----------------------------------------------------------------------------] diff --git a/doc/qbk/quickref.xml b/doc/qbk/quickref.xml index d679773fe..ec30abec2 100644 --- a/doc/qbk/quickref.xml +++ b/doc/qbk/quickref.xml @@ -7,7 +7,7 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - Official repository: https://github.com/cppalliance/json + Official repository: https://github.com/boostorg/json --> diff --git a/fuzzing/Jamfile b/fuzzing/Jamfile index 983612d3f..e81395114 100644 --- a/fuzzing/Jamfile +++ b/fuzzing/Jamfile @@ -152,7 +152,7 @@ rule fuzzer-props ( props * ) -fsanitize=fuzzer # explicitly set BOOST_JSON_STACK_BUFFER_SIZE small so interesting # code paths are taken also for small inputs - # (see https://github.com/CPPAlliance/json/issues/333) + # (see https://github.com/boostorg/json/issues/333) BOOST_JSON_STACK_BUFFER_SIZE=64 ; } diff --git a/fuzzing/fuzz.sh b/fuzzing/fuzz.sh index aa48f8c35..de50ef411 100755 --- a/fuzzing/fuzz.sh +++ b/fuzzing/fuzz.sh @@ -53,7 +53,7 @@ fuzzer=./fuzzer_$variant if [ ! -e $fuzzer -o $srcfile -nt $fuzzer ] ; then # explicitly set BOOST_JSON_STACK_BUFFER_SIZE small so interesting - # code paths are taken also for small inputs (see https://github.com/CPPAlliance/json/issues/333) + # code paths are taken also for small inputs (see https://github.com/boostorg/json/issues/333) $CLANG \ -std=c++17 \ -O3 \