Merge r1858334 and r1858335 from apr/trunk:

  * Follow-up to r1839819: Register jose/*.c in CMake build.
  * Follow-up to r1835348: Register json/*.c in CMake build.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.7.x@1920369 13f79535-47bb-0310-9956-ffa450edef68

CMakeLists.txt

@@ -207,6 +207,12 @@ SET(APR_SOURCES
   dbm/sdbm/sdbm_lock.c
   dbm/sdbm/sdbm_pair.c
   encoding/apr_base64.c
+  jose/apr_jose.c
+  jose/apr_jose_decode.c
+  jose/apr_jose_encode.c
+  json/apr_json.c
+  json/apr_json_decode.c
+  json/apr_json_encode.c
   hooks/apr_hooks.c
   memcache/apr_memcache.c
   misc/apr_date.c