couchbase 4.0.0 → 4.1.0

package/deps/couchbase-cxx-client/third_party/json/src/test/json/cbor.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/cbor_parts_parser.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/contrib_diff.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/contrib_get.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/contrib_patch_add.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/contrib_patch_copy.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/contrib_patch_move.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/contrib_patch_remove.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/contrib_patch_replace.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/contrib_patch_test.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/contrib_position.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/contrib_reference.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/contrib_schema.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/contrib_traits.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include <limits>
@@ -180,6 +180,40 @@ namespace tao::json
       TEST_ASSERT( !( v == h ) );
    }
 
+   void test_array()
+   {
+      const std::array< std::uint64_t, 4 > f = { 1, 2, 3, 4 };
+      value v = f;
+      TEST_ASSERT( v == f );
+      TEST_ASSERT( v >= f );
+      TEST_ASSERT( v <= f );
+      TEST_ASSERT( f == v );
+      TEST_ASSERT( f >= v );
+      TEST_ASSERT( f <= v );
+      TEST_ASSERT( v.is_array() );
+      TEST_ASSERT( v.get_array().size() == 4 );
+      TEST_ASSERT( v[ 0 ] == 1 );
+      TEST_ASSERT( v[ 1 ] == 2 );
+      TEST_ASSERT( v[ 2 ] == 3 );
+      TEST_ASSERT( v[ 3 ] == 4 );
+      const auto g = v.as< std::array< std::uint64_t, 4 > >();
+      TEST_ASSERT( g == f );
+
+      const std::array< std::uint64_t, 3 > h = { 2, 3, 4 };
+      TEST_ASSERT( h != v );
+      TEST_ASSERT( h > v );
+      TEST_ASSERT( h >= v );
+      TEST_ASSERT( !( h < v ) );
+      TEST_ASSERT( !( h <= v ) );
+      TEST_ASSERT( !( h == v ) );
+      TEST_ASSERT( v != h );
+      TEST_ASSERT( v < h );
+      TEST_ASSERT( v <= h );
+      TEST_ASSERT( !( v > h ) );
+      TEST_ASSERT( !( v >= h ) );
+      TEST_ASSERT( !( v == h ) );
+   }
+
    void test_map()
    {
       const std::map< std::string, std::uint64_t, std::less<> > f = { { "a", 1 }, { "b", 2 }, { "c", 3 } };
@@ -255,6 +289,7 @@ namespace tao::json
       test_list();
       test_set();
       test_vector();
+      test_array();
       test_map();
 
       test_pointer();

package/deps/couchbase-cxx-client/third_party/json/src/test/json/double.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/enable_implicit_constructor.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/escape.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/events_binary_to.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/events_compare.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/events_debug.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/events_hash.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/events_to_stream.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/events_to_string.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/include_json.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/integer.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/jaxn_ostream.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/jaxn_parse.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/jaxn_parts_parser.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/json_ostream.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/json_parse.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/json_parts_parser.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/json_pointer.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/key_camel_case_to_snake_case.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/key_snake_case_to_camel_case.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/literal.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/main.hpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #ifndef TAO_JSON_INCLUDE_SRC_TEST_MAIN_HPP

package/deps/couchbase-cxx-client/third_party/json/src/test/json/make_events.hpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #ifndef TAO_JSON_SRC_TEST_JSON_TEST_EVENTS_HPP

package/deps/couchbase-cxx-client/third_party/json/src/test/json/msgpack.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/object_construction.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/opaque_pointer.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"
@@ -95,13 +95,13 @@ namespace tao::json
       };
 
       template< template< typename... > class Traits, typename Consumer >
-      [[nodiscard]] array_t< Traits, Consumer > array( Consumer& c ) noexcept( noexcept( array_t< Traits, Consumer >( c ) ) )
+      [[nodiscard]] array_t< Traits, Consumer > array_consumer( Consumer& c ) noexcept( noexcept( array_t< Traits, Consumer >( c ) ) )
       {
          return array_t< Traits, Consumer >( c );
       }
 
       template< template< typename... > class Traits, typename Consumer >
-      [[nodiscard]] object_t< Traits, Consumer > object( Consumer& c ) noexcept( noexcept( object_t< Traits, Consumer >( c ) ) )
+      [[nodiscard]] object_t< Traits, Consumer > object_consumer( Consumer& c ) noexcept( noexcept( object_t< Traits, Consumer >( c ) ) )
       {
          return object_t< Traits, Consumer >( c );
       }
@@ -120,7 +120,7 @@ namespace tao::json
       template< template< typename... > class Traits, typename Consumer >
       static void produce( Consumer& consumer, const point& data )
       {
-         auto a = events::array< Traits >( consumer );
+         auto a = events::array_consumer< Traits >( consumer );
          a.push_back( data.x );
          a.push_back( data.y );
       }
@@ -140,7 +140,7 @@ namespace tao::json
       template< template< typename... > class Traits, typename Consumer >
       static void produce( Consumer& consumer, const employee& data )
       {
-         auto o = events::object< Traits >( consumer );
+         auto o = events::object_consumer< Traits >( consumer );
          o.insert( "name", data.name );
          if( !data.position.empty() ) {
             o.insert( "position", data.position );

package/deps/couchbase-cxx-client/third_party/json/src/test/json/operators.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/optional.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include <limits>

package/deps/couchbase-cxx-client/third_party/json/src/test/json/public_base.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/self_contained.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/sha256.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/temporary_parsing.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include <bitset>

package/deps/couchbase-cxx-client/third_party/json/src/test/json/test.hpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #ifndef TAO_JSON_SRC_TEST_JSON_TEST_HPP

package/deps/couchbase-cxx-client/third_party/json/src/test/json/test_events.hpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #ifndef TAO_JSON_SRC_TEST_JSON_TEST_EVENTS_HPP

package/deps/couchbase-cxx-client/third_party/json/src/test/json/test_types.hpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #ifndef TAO_JSON_SRC_TEST_JSON_TEST_TYPES_HPP

package/deps/couchbase-cxx-client/third_party/json/src/test/json/test_unhex.hpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #ifndef TAO_JSON_SRC_TEST_JSON_UNHEX_HPP

package/deps/couchbase-cxx-client/third_party/json/src/test/json/type.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/ubjson.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/uri_fragment.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/validate_event_interfaces.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2017-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"
@@ -24,6 +24,7 @@
 #include <tao/json/events/validate_event_order.hpp>
 #include <tao/json/events/validate_keys.hpp>
 #include <tao/json/events/virtual_ref.hpp>
+#include <tao/json/events/virtual_wrap.hpp>
 
 #include <tao/json/events/binary_to_base64.hpp>
 #include <tao/json/events/binary_to_base64url.hpp>
@@ -116,6 +117,7 @@ namespace tao::json
 
       check_consumer_impl< events::ref< Consumer > >();
       check_consumer_impl< events::virtual_ref< Consumer > >();
+      check_consumer_impl< events::virtual_wrap< Consumer > >();
 
       check_consumer_impl< events::tee< Consumer > >();
       check_consumer_impl< events::tee< events::discard, Consumer > >();

package/deps/couchbase-cxx-client/third_party/json/src/test/json/validate_utf8.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2019-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/value_access.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/value_basics.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include <algorithm>

package/deps/couchbase-cxx-client/third_party/json/src/test/json/value_create.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include <limits>
@@ -104,8 +104,8 @@ namespace tao::json
       test_signed< T >( -1 );
       test_signed< T >( 42 );
       test_signed< T >( -42 );
-      test_signed< T >( (std::numeric_limits< T >::min)() );
-      test_signed< T >( (std::numeric_limits< T >::max)() );
+      test_signed< T >( ( std::numeric_limits< T >::min )() );
+      test_signed< T >( ( std::numeric_limits< T >::max )() );
    }
 
    template< typename T >
@@ -127,8 +127,8 @@ namespace tao::json
       test_unsigned< T >( 0 );
       test_unsigned< T >( 1 );
       test_unsigned< T >( 42 );
-      test_unsigned< T >( (std::numeric_limits< T >::min)() );
-      test_unsigned< T >( (std::numeric_limits< T >::max)() );
+      test_unsigned< T >( ( std::numeric_limits< T >::min )() );
+      test_unsigned< T >( ( std::numeric_limits< T >::max )() );
    }
 
    void test_double( const double d )

package/deps/couchbase-cxx-client/third_party/json/src/test/json/value_ptr.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2016-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2016-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/value_subscript.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2015-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2015-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-cxx-client/third_party/json/src/test/json/with_arguments.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2021 Dr. Colin Hirsch and Daniel Frey
+// Copyright (c) 2018-2022 Dr. Colin Hirsch and Daniel Frey
 // Please see LICENSE for license or visit https://github.com/taocpp/json/
 
 #include "test.hpp"

package/deps/couchbase-transactions-cxx/CMakeLists.txt

@@ -77,6 +77,13 @@ configure_file(
     COPYONLY)
 
 if(NOT COUCHBASE_TXNS_CXX_CLIENT_EXTERNAL)
+    if (APPLE AND NOT DEFINED OPENSSL_ROOT_DIR)
+        # look in typical brew location - missed by the openssl finder
+        message(STATUS "no OPENSSL_ROOT_DIR specified, using MacOS, so defaulting to homebrew location")
+        set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl@1.1", CACHE INTERNAL "")
+    endif()
+    message(STATUS "APPLE: '${APPLE}', SSL: '${OPENSSL_ROOT_DIR}'")
+    find_package(OpenSSL REQUIRED)
     set(COUCHBASE_CXX_CLIENT_BUILD_TESTS OFF CACHE INTERNAL "")
     add_subdirectory(deps/couchbase-cxx-client)
 endif()

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/.gitmodules

@@ -3,7 +3,7 @@
 	url = https://github.com/microsoft/gsl.git
 [submodule "third_party/json"]
 	path = third_party/json
-	url = https://github.com/avsej/json.git
+	url = https://github.com/taocpp/json.git
 [submodule "third_party/spdlog"]
 	path = third_party/spdlog
 	url = https://github.com/gabime/spdlog.git

package/deps/couchbase-transactions-cxx/deps/couchbase-cxx-client/CMakeLists.txt

@@ -77,6 +77,7 @@ add_subdirectory(couchbase/topology)
 add_subdirectory(couchbase/utils)
 add_subdirectory(couchbase/protocol)
 add_subdirectory(couchbase/io)
+add_subdirectory(couchbase/management)
 add_subdirectory(couchbase/operations)
 add_subdirectory(couchbase/tracing)
 add_subdirectory(couchbase/metrics)
@@ -121,6 +122,7 @@ target_link_libraries(
          couchbase_topology
          couchbase_utils
          couchbase_protocol
+         couchbase_management
          couchbase_operations
          couchbase_operations_management
          couchbase_tracing