From 607216cb78cb724cffcc3a58648772a72c795072 Mon Sep 17 00:00:00 2001 From: Masatake Iwasaki Date: Thu, 23 Oct 2025 19:55:52 +0900 Subject: [PATCH] BIGTOP-4437. Upgrade Hadoop to 3.4.2. --- .../patch0-HADOOP-18867-branch-3.3.diff | 41 -- .../hadoop/patch1-HADOOP-19116-3.3.6.diff | 50 -- ...riple-beam.diff => patch1-YARN-11875.diff} | 26 +- .../hadoop/patch10-HDFS-17754-branch-3.3.diff | 77 --- .../common/hadoop/patch2-HADOOP-18583.diff | 115 ----- .../src/common/hadoop/patch2-YARN-11873.diff | 469 ++++++++++++++++++ .../common/hadoop/patch4-HADOOP-19551.diff | 14 - .../hadoop/patch5-fix-kms-shellprofile.diff | 8 +- ...FS-17287.diff => patch9-HADOOP-19019.diff} | 69 ++- .../src/common/hadoop/patch9-HDFS-17226.diff | 48 -- bigtop.bom | 2 +- bigtop_toolchain/manifests/packages.pp | 2 + 12 files changed, 523 insertions(+), 398 deletions(-) delete mode 100644 bigtop-packages/src/common/hadoop/patch0-HADOOP-18867-branch-3.3.diff delete mode 100644 bigtop-packages/src/common/hadoop/patch1-HADOOP-19116-3.3.6.diff rename bigtop-packages/src/common/hadoop/{patch8-YARN-11528-triple-beam.diff => patch1-YARN-11875.diff} (50%) delete mode 100644 bigtop-packages/src/common/hadoop/patch10-HDFS-17754-branch-3.3.diff delete mode 100644 bigtop-packages/src/common/hadoop/patch2-HADOOP-18583.diff create mode 100644 bigtop-packages/src/common/hadoop/patch2-YARN-11873.diff delete mode 100644 bigtop-packages/src/common/hadoop/patch4-HADOOP-19551.diff rename bigtop-packages/src/common/hadoop/{patch9-HDFS-17287.diff => patch9-HADOOP-19019.diff} (71%) delete mode 100644 bigtop-packages/src/common/hadoop/patch9-HDFS-17226.diff diff --git a/bigtop-packages/src/common/hadoop/patch0-HADOOP-18867-branch-3.3.diff b/bigtop-packages/src/common/hadoop/patch0-HADOOP-18867-branch-3.3.diff deleted file mode 100644 index 289432c927..0000000000 --- a/bigtop-packages/src/common/hadoop/patch0-HADOOP-18867-branch-3.3.diff +++ /dev/null @@ -1,41 +0,0 @@ -commit 0b97707a62a5d41896ddbc20a649d892a2d5b886 -Author: Masatake Iwasaki -Date: Fri Aug 25 21:44:32 2023 +0900 - - patch0-HADOOP-18867-branch-3.3.diff - -diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index f1ac43ed5b3..1503a86f15c 100644 ---- a/hadoop-project/pom.xml -+++ b/hadoop-project/pom.xml -@@ -99,7 +99,7 @@ - ${hadoop-thirdparty-shaded-prefix}.protobuf - ${hadoop-thirdparty-shaded-prefix}.com.google.common - -- 3.6.3 -+ 3.6.4 - 5.2.0 - 3.0.5 - 2.1.7 -@@ -1740,6 +1740,10 @@ - log4j - log4j - -+ -+ org.apache.yetus -+ audience-annotations -+ - - - -@@ -1769,6 +1773,10 @@ - jdk.tools - jdk.tools - -+ -+ org.apache.yetus -+ audience-annotations -+ - - - diff --git a/bigtop-packages/src/common/hadoop/patch1-HADOOP-19116-3.3.6.diff b/bigtop-packages/src/common/hadoop/patch1-HADOOP-19116-3.3.6.diff deleted file mode 100644 index a37aa06e5f..0000000000 --- a/bigtop-packages/src/common/hadoop/patch1-HADOOP-19116-3.3.6.diff +++ /dev/null @@ -1,50 +0,0 @@ -commit da1e732026cb4811ffe78ff98dc069e61ef71eaa -Author: PJ Fanning -Date: Tue Jun 11 13:09:23 2024 +0100 - - HADOOP-19116. Update to zookeeper client 3.8.4 due to CVE-2024-23944. (#6638) - - Updated ZK client dependency to 3.8.4 to address CVE-2024-23944. - - Contributed by PJ Fanning - - (cherry picked from commit bd63358c0bb53bb1097f38ebf6c125547fe5e547) - - Conflicts: - LICENSE-binary - hadoop-project/pom.xml - -diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml -index 1503a86f15c6..ffe339636716 100644 ---- a/hadoop-project/pom.xml -+++ b/hadoop-project/pom.xml -@@ -1415,6 +1415,14 @@ - log4j - log4j - -+ -+ ch.qos.logback -+ logback-core -+ -+ -+ ch.qos.logback -+ logback-classic -+ - - org.slf4j - slf4j-api -@@ -1459,6 +1467,14 @@ - log4j - log4j - -+ -+ ch.qos.logback -+ logback-core -+ -+ -+ ch.qos.logback -+ logback-classic -+ - - org.slf4j - slf4j-log4j12 diff --git a/bigtop-packages/src/common/hadoop/patch8-YARN-11528-triple-beam.diff b/bigtop-packages/src/common/hadoop/patch1-YARN-11875.diff similarity index 50% rename from bigtop-packages/src/common/hadoop/patch8-YARN-11528-triple-beam.diff rename to bigtop-packages/src/common/hadoop/patch1-YARN-11875.diff index 7075797587..85accc3508 100644 --- a/bigtop-packages/src/common/hadoop/patch8-YARN-11528-triple-beam.diff +++ b/bigtop-packages/src/common/hadoop/patch1-YARN-11875.diff @@ -1,14 +1,24 @@ +commit 85a5bef06a23c8c2c7aa03834eacd952865b342a +Author: slfan1989 <55643692+slfan1989@users.noreply.github.com> +Date: Wed Oct 8 09:46:41 2025 +0800 + + YARN-11875. Fix build failure caused by color@5.0.2. (#8016) Contributed by Shilun Fan + + * YARN-11875. Fix build failure caused by color@5.0.2. + + Reviewed-by: Steve Loughran + Signed-off-by: Shilun Fan + (cherry picked from commit d9c33088628d7146664ba97e4ef5f196b5f12d15) + diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json -index f09442cfc4e87..59cc3da179fd0 100644 +index 59cc3da179f..f5dd22bffcb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json -@@ -19,6 +19,9 @@ - "shelljs": "^0.2.6", +@@ -20,6 +20,7 @@ "apidoc": "0.17.7" }, -+ "resolutions": { -+ "triple-beam": "1.3.0" -+ }, + "resolutions": { ++ "color": "3.1.3", + "triple-beam": "1.3.0" + }, "scripts": { - "prestart": "npm install & mvn clean package", - "pretest": "npm install" diff --git a/bigtop-packages/src/common/hadoop/patch10-HDFS-17754-branch-3.3.diff b/bigtop-packages/src/common/hadoop/patch10-HDFS-17754-branch-3.3.diff deleted file mode 100644 index e90fdea4ea..0000000000 --- a/bigtop-packages/src/common/hadoop/patch10-HDFS-17754-branch-3.3.diff +++ /dev/null @@ -1,77 +0,0 @@ -commit 79fe8bef3b24901d3eb5d0d0de74cc4e03dbebce -Author: Chris Nauroth -Date: Tue Mar 11 03:32:10 2025 -0700 - - HDFS-17754. Add uriparser2 to notices (#7481) - - Contributed by Chris Nauroth - - (cherry picked from commit 2b32e46f666c7645f5d1e026be3982b99319ccb8) - - Conflicts: - NOTICE-binary - -diff --git a/NOTICE-binary b/NOTICE-binary -index 2189de34e37e..b1e1dc7692f6 100644 ---- a/NOTICE-binary -+++ b/NOTICE-binary -@@ -822,7 +822,7 @@ This product includes software developed by Apache - PureJavaCrc32C from apache-hadoop-common http://hadoop.apache.org/ - (Apache 2.0 license) - --This library containd statically linked libstdc++. This inclusion is allowed by -+This library contains statically linked libstdc++. This inclusion is allowed by - "GCC RUntime Library Exception" - http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html - -@@ -890,4 +890,11 @@ may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, - please check the country's laws, regulations and policies concerning the import, - possession, or use, and re-export of encryption software, to see if this is --permitted. -\ No newline at end of file -+permitted. -+ -+This product includes code from uriparser2, a C and C++ library for URI parsing. -+ -+ * LICENSE: -+ * license/LICENSE-uriparser2.txt (MIT License) -+ * HOMEPAGE: -+ * https://github.com/bnoordhuis/uriparser2 -diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/third_party/uriparser2/uriparser2/uriparser/UriQuery.c b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/third_party/uriparser2/uriparser2/uriparser/UriQuery.c -index 7cb031dda5c1..35793d20ef13 100644 ---- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/third_party/uriparser2/uriparser2/uriparser/UriQuery.c -+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/third_party/uriparser2/uriparser2/uriparser/UriQuery.c -@@ -219,6 +219,7 @@ int URI_FUNC(ComposeQueryEngine)(URI_CHAR * dest, - - /* Copy key */ - if (firstItem == URI_TRUE) { -+ ampersandLen = 1; - firstItem = URI_FALSE; - } else { - write[0] = _UT('&'); -diff --git a/licenses-binary/LICENSE-uriparser2.txt b/licenses-binary/LICENSE-uriparser2.txt -new file mode 100644 -index 000000000000..c662ad5d20e4 ---- /dev/null -+++ b/licenses-binary/LICENSE-uriparser2.txt -@@ -0,0 +1,19 @@ -+Copyright (c) 2010 Ben Noordhuis -+ -+Permission is hereby granted, free of charge, to any person obtaining a copy -+of this software and associated documentation files (the "Software"), to deal -+in the Software without restriction, including without limitation the rights -+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -+copies of the Software, and to permit persons to whom the Software is -+furnished to do so, subject to the following conditions: -+ -+The above copyright notice and this permission notice shall be included in -+all copies or substantial portions of the Software. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -+THE SOFTWARE. diff --git a/bigtop-packages/src/common/hadoop/patch2-HADOOP-18583.diff b/bigtop-packages/src/common/hadoop/patch2-HADOOP-18583.diff deleted file mode 100644 index 77d273d5ad..0000000000 --- a/bigtop-packages/src/common/hadoop/patch2-HADOOP-18583.diff +++ /dev/null @@ -1,115 +0,0 @@ -commit acbb688da6831ebefff34cc9ab1e5c86012da875 -Author: Sebastian Klemke <3669903+packet23@users.noreply.github.com> -Date: Thu Nov 7 19:14:13 2024 +0100 - - HADOOP-18583. Fix loading of OpenSSL 3.x symbols (#5256) (#7149) - - Contributed by Sebastian Klemke - - (cherry picked from commit f5cdb2658dd9ea3d3749db0ca40b0628f723ac20) - -diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c -index abff7ea5f17f..f17169dec247 100644 ---- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c -+++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/crypto/OpensslCipher.c -@@ -24,6 +24,57 @@ - - #include "org_apache_hadoop_crypto_OpensslCipher.h" - -+/* -+ # OpenSSL ABI Symbols -+ -+ Available on all OpenSSL versions: -+ -+ | Function | 1.0 | 1.1 | 3.0 | -+ |--------------------------------|-----|-----|-----| -+ | EVP_CIPHER_CTX_new | YES | YES | YES | -+ | EVP_CIPHER_CTX_free | YES | YES | YES | -+ | EVP_CIPHER_CTX_set_padding | YES | YES | YES | -+ | EVP_CIPHER_CTX_test_flags | YES | YES | YES | -+ | EVP_CipherInit_ex | YES | YES | YES | -+ | EVP_CipherUpdate | YES | YES | YES | -+ | EVP_CipherFinal_ex | YES | YES | YES | -+ | ENGINE_by_id | YES | YES | YES | -+ | ENGINE_free | YES | YES | YES | -+ | EVP_aes_256_ctr | YES | YES | YES | -+ | EVP_aes_128_ctr | YES | YES | YES | -+ -+ Available on old versions: -+ -+ | Function | 1.0 | 1.1 | 3.0 | -+ |--------------------------------|-----|-----|-----| -+ | EVP_CIPHER_CTX_cleanup | YES | --- | --- | -+ | EVP_CIPHER_CTX_init | YES | --- | --- | -+ | EVP_CIPHER_CTX_block_size | YES | YES | --- | -+ | EVP_CIPHER_CTX_encrypting | --- | YES | --- | -+ -+ Available on new versions: -+ -+ | Function | 1.0 | 1.1 | 3.0 | -+ |--------------------------------|-----|-----|-----| -+ | OPENSSL_init_crypto | --- | YES | YES | -+ | EVP_CIPHER_CTX_reset | --- | YES | YES | -+ | EVP_CIPHER_CTX_get_block_size | --- | --- | YES | -+ | EVP_CIPHER_CTX_is_encrypting | --- | --- | YES | -+ -+ Optionally available on new versions: -+ -+ | Function | 1.0 | 1.1 | 3.0 | -+ |--------------------------------|-----|-----|-----| -+ | EVP_sm4_ctr | --- | opt | opt | -+ -+ Name changes: -+ -+ | < 3.0 name | >= 3.0 name | -+ |----------------------------|--------------------------------| -+ | EVP_CIPHER_CTX_block_size | EVP_CIPHER_CTX_get_block_size | -+ | EVP_CIPHER_CTX_encrypting | EVP_CIPHER_CTX_is_encrypting | -+ */ -+ - #ifdef UNIX - static EVP_CIPHER_CTX * (*dlsym_EVP_CIPHER_CTX_new)(void); - static void (*dlsym_EVP_CIPHER_CTX_free)(EVP_CIPHER_CTX *); -@@ -87,6 +138,15 @@ static __dlsym_EVP_aes_128_ctr dlsym_EVP_aes_128_ctr; - static HMODULE openssl; - #endif - -+// names changed in OpenSSL 3 ABI - see History section in EVP_EncryptInit(3) -+#if OPENSSL_VERSION_NUMBER >= 0x30000000L -+#define CIPHER_CTX_BLOCK_SIZE "EVP_CIPHER_CTX_get_block_size" -+#define CIPHER_CTX_ENCRYPTING "EVP_CIPHER_CTX_is_encrypting" -+#else -+#define CIPHER_CTX_BLOCK_SIZE "EVP_CIPHER_CTX_block_size" -+#define CIPHER_CTX_ENCRYPTING "EVP_CIPHER_CTX_encrypting" -+#endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */ -+ - static void loadAesCtr(JNIEnv *env) - { - #ifdef UNIX -@@ -142,10 +202,10 @@ JNIEXPORT void JNICALL Java_org_apache_hadoop_crypto_OpensslCipher_initIDs - LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_test_flags, env, openssl, \ - "EVP_CIPHER_CTX_test_flags"); - LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_block_size, env, openssl, \ -- "EVP_CIPHER_CTX_block_size"); -+ CIPHER_CTX_BLOCK_SIZE); - #if OPENSSL_VERSION_NUMBER >= 0x10100000L - LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CIPHER_CTX_encrypting, env, openssl, \ -- "EVP_CIPHER_CTX_encrypting"); -+ CIPHER_CTX_ENCRYPTING); - #endif - LOAD_DYNAMIC_SYMBOL(dlsym_EVP_CipherInit_ex, env, openssl, \ - "EVP_CipherInit_ex"); -@@ -173,11 +233,11 @@ JNIEXPORT void JNICALL Java_org_apache_hadoop_crypto_OpensslCipher_initIDs - openssl, "EVP_CIPHER_CTX_test_flags"); - LOAD_DYNAMIC_SYMBOL(__dlsym_EVP_CIPHER_CTX_block_size, \ - dlsym_EVP_CIPHER_CTX_block_size, env, \ -- openssl, "EVP_CIPHER_CTX_block_size"); -+ openssl, CIPHER_CTX_BLOCK_SIZE); - #if OPENSSL_VERSION_NUMBER >= 0x10100000L - LOAD_DYNAMIC_SYMBOL(__dlsym_EVP_CIPHER_CTX_encrypting, \ - dlsym_EVP_CIPHER_CTX_encrypting, env, \ -- openssl, "EVP_CIPHER_CTX_encrypting"); -+ openssl, CIPHER_CTX_ENCRYPTING); - #endif - LOAD_DYNAMIC_SYMBOL(__dlsym_EVP_CipherInit_ex, dlsym_EVP_CipherInit_ex, \ - env, openssl, "EVP_CipherInit_ex"); diff --git a/bigtop-packages/src/common/hadoop/patch2-YARN-11873.diff b/bigtop-packages/src/common/hadoop/patch2-YARN-11873.diff new file mode 100644 index 0000000000..92f0b6733c --- /dev/null +++ b/bigtop-packages/src/common/hadoop/patch2-YARN-11873.diff @@ -0,0 +1,469 @@ +diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/yarn.lock b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/yarn.lock +new file mode 100644 +index 00000000000..d1e749996c8 +--- /dev/null ++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/yarn.lock +@@ -0,0 +1,463 @@ ++# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. ++# yarn lockfile v1 ++ ++ ++"@colors/colors@1.6.0", "@colors/colors@^1.6.0": ++ version "1.6.0" ++ resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0" ++ integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA== ++ ++"@dabh/diagnostics@^2.0.8": ++ version "2.0.8" ++ resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.8.tgz#ead97e72ca312cf0e6dd7af0d300b58993a31a5e" ++ integrity sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q== ++ dependencies: ++ "@so-ric/colorspace" "^1.1.6" ++ enabled "2.0.x" ++ kuler "^2.0.0" ++ ++"@so-ric/colorspace@^1.1.6": ++ version "1.1.6" ++ resolved "https://registry.yarnpkg.com/@so-ric/colorspace/-/colorspace-1.1.6.tgz#62515d8b9f27746b76950a83bde1af812d91923b" ++ integrity sha512-/KiKkpHNOBgkFJwu9sh48LkHSMYGyuTcSFK/qMBdnOAlrRJzRSXAOFB5qwzaVQuDl8wAvHVMkaASQDReTahxuw== ++ dependencies: ++ color "^5.0.2" ++ text-hex "1.0.x" ++ ++"@types/triple-beam@^1.3.2": ++ version "1.3.5" ++ resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c" ++ integrity sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw== ++ ++angular-loader@~1.6.4: ++ version "1.6.10" ++ resolved "https://registry.yarnpkg.com/angular-loader/-/angular-loader-1.6.10.tgz#5ab1995c65dd38640e6d9d738dbd85eddd5ec310" ++ integrity sha512-13435aXnWj4/46Wl1o1n8BGrqwv9DyeAKiBCQX9OLYBkL6C4GwhSltemj4SI9B84S6NS/8v3snXBGSoFuDMTBA== ++ ++angular-mocks@~1.6.4: ++ version "1.6.10" ++ resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.6.10.tgz#6a139e43c461d0c9a5a1acebc91e63db16031176" ++ integrity sha512-1865/NmqHNogibNoglY1MGBjx882iu2hI46BBhYDWyz0C4TDM5ER8H8SnYwQKUUG4RXMDsJizszEQ2BEoYKV9w== ++ ++angular-route@~1.6.4: ++ version "1.6.10" ++ resolved "https://registry.yarnpkg.com/angular-route/-/angular-route-1.6.10.tgz#4247a32eab19495624623e96c1626dfba17ebf21" ++ integrity sha512-BxjrjQNCbVqQKyB3nHjNI8zSUwhnQWFZnSBv5BZ336VbMKhWu74ad5xpFx5VMk6WyHlmMGDoRagzB6AKkRcvKA== ++ ++angular@~1.6.4: ++ version "1.6.10" ++ resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.10.tgz#eed3080a34d29d0f681ff119b18ce294e3f74826" ++ integrity sha512-PCZ5/hVdvPQiYyH0VwsPjrErPHRcITnaXxhksceOXgtJeesKHLA7KDu4X/yvcAi+1zdGgGF+9pDxkJvghXI9Wg== ++ ++apidoc-core@~0.8.2: ++ version "0.8.3" ++ resolved "https://registry.yarnpkg.com/apidoc-core/-/apidoc-core-0.8.3.tgz#d9d63545829df250d2cca049683a87e775364b96" ++ integrity sha512-KwKG/M2rQjzdPdaBPor0+n752+2KWtXv2yhYlekEF647KP+oGRbkBwLvLX2WetWEZpDx/pTordbYxOf/DvOnVA== ++ dependencies: ++ fs-extra "^3.0.1" ++ glob "^7.1.1" ++ iconv-lite "^0.4.17" ++ klaw-sync "^2.1.0" ++ lodash "~4.17.4" ++ semver "~5.3.0" ++ ++apidoc@0.17.7: ++ version "0.17.7" ++ resolved "https://registry.yarnpkg.com/apidoc/-/apidoc-0.17.7.tgz#a49090cbd8b3aa457bd054f00e0037e975fd3ee7" ++ integrity sha512-9Wf4bRPwCuWOIOxR42dDnsXnFw+rhJg5VrMQK+KmNxJwyIh30UqX6gvjjXSG6YO74MqE87F18bbQXUENK9dPGg== ++ dependencies: ++ apidoc-core "~0.8.2" ++ commander "^2.19.0" ++ fs-extra "^7.0.0" ++ lodash "^4.17.10" ++ markdown-it "^8.3.1" ++ winston "^3.0.0" ++ ++argparse@^1.0.7: ++ version "1.0.10" ++ resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" ++ integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== ++ dependencies: ++ sprintf-js "~1.0.2" ++ ++async@^3.2.3: ++ version "3.2.6" ++ resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce" ++ integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA== ++ ++balanced-match@^1.0.0: ++ version "1.0.2" ++ resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" ++ integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== ++ ++bootstrap@~3.3.7: ++ version "3.3.7" ++ resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.3.7.tgz#5a389394549f23330875a3b150656574f8a9eb71" ++ integrity sha512-qcFaisBrcBhTFkz1IUnGDYnX6ZWfFzH8zOixUDtHW9Ip+r+7MfMFav2rzy7cIHc7rgIg7xjhWBoo1mS/U26j4g== ++ ++brace-expansion@^1.1.7: ++ version "1.1.12" ++ resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.12.tgz#ab9b454466e5a8cc3a187beaad580412a9c5b843" ++ integrity sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg== ++ dependencies: ++ balanced-match "^1.0.0" ++ concat-map "0.0.1" ++ ++color-convert@^1.9.1: ++ version "1.9.3" ++ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" ++ integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== ++ dependencies: ++ color-name "1.1.3" ++ ++color-name@1.1.3: ++ version "1.1.3" ++ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" ++ integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== ++ ++color-name@^1.0.0: ++ version "1.1.4" ++ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" ++ integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== ++ ++color-string@^1.5.4: ++ version "1.9.1" ++ resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4" ++ integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg== ++ dependencies: ++ color-name "^1.0.0" ++ simple-swizzle "^0.2.2" ++ ++color@3.1.3, color@^5.0.2: ++ version "3.1.3" ++ resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e" ++ integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ== ++ dependencies: ++ color-convert "^1.9.1" ++ color-string "^1.5.4" ++ ++commander@^2.19.0: ++ version "2.20.3" ++ resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" ++ integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== ++ ++concat-map@0.0.1: ++ version "0.0.1" ++ resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" ++ integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== ++ ++enabled@2.0.x: ++ version "2.0.0" ++ resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" ++ integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== ++ ++entities@~1.1.1: ++ version "1.1.2" ++ resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" ++ integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== ++ ++fecha@^4.2.0: ++ version "4.2.3" ++ resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd" ++ integrity sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw== ++ ++fn.name@1.x.x: ++ version "1.1.0" ++ resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" ++ integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== ++ ++fs-extra@^3.0.1: ++ version "3.0.1" ++ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" ++ integrity sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg== ++ dependencies: ++ graceful-fs "^4.1.2" ++ jsonfile "^3.0.0" ++ universalify "^0.1.0" ++ ++fs-extra@^7.0.0: ++ version "7.0.1" ++ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" ++ integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== ++ dependencies: ++ graceful-fs "^4.1.2" ++ jsonfile "^4.0.0" ++ universalify "^0.1.0" ++ ++fs.realpath@^1.0.0: ++ version "1.0.0" ++ resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" ++ integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== ++ ++glob@^7.1.1: ++ version "7.2.3" ++ resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" ++ integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== ++ dependencies: ++ fs.realpath "^1.0.0" ++ inflight "^1.0.4" ++ inherits "2" ++ minimatch "^3.1.1" ++ once "^1.3.0" ++ path-is-absolute "^1.0.0" ++ ++graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: ++ version "4.2.11" ++ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" ++ integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== ++ ++iconv-lite@^0.4.17: ++ version "0.4.24" ++ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" ++ integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== ++ dependencies: ++ safer-buffer ">= 2.1.2 < 3" ++ ++inflight@^1.0.4: ++ version "1.0.6" ++ resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" ++ integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== ++ dependencies: ++ once "^1.3.0" ++ wrappy "1" ++ ++inherits@2, inherits@^2.0.3: ++ version "2.0.4" ++ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" ++ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== ++ ++is-arrayish@^0.3.1: ++ version "0.3.4" ++ resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.4.tgz#1ee5553818511915685d33bb13d31bf854e5059d" ++ integrity sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA== ++ ++is-stream@^2.0.0: ++ version "2.0.1" ++ resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" ++ integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== ++ ++jquery@3.3.1: ++ version "3.3.1" ++ resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca" ++ integrity sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg== ++ ++jsonfile@^3.0.0: ++ version "3.0.1" ++ resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" ++ integrity sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w== ++ optionalDependencies: ++ graceful-fs "^4.1.6" ++ ++jsonfile@^4.0.0: ++ version "4.0.0" ++ resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" ++ integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== ++ optionalDependencies: ++ graceful-fs "^4.1.6" ++ ++klaw-sync@^2.1.0: ++ version "2.1.0" ++ resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-2.1.0.tgz#3d3bcd8600e7bfdef53231c739ff053aed560e44" ++ integrity sha512-lIxVCUMQIF7hfygFfdZgv4Z+e1smLroaYNQMUcf1TcJ5oqxj9m8qk19iIuMVl+tXQPr3CSE4V+4XjGEqmsth0Q== ++ optionalDependencies: ++ graceful-fs "^4.1.11" ++ ++kuler@^2.0.0: ++ version "2.0.0" ++ resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" ++ integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== ++ ++linkify-it@^2.0.0: ++ version "2.2.0" ++ resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf" ++ integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw== ++ dependencies: ++ uc.micro "^1.0.1" ++ ++lodash@^4.17.10, lodash@~4.17.4: ++ version "4.17.21" ++ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" ++ integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== ++ ++logform@^2.7.0: ++ version "2.7.0" ++ resolved "https://registry.yarnpkg.com/logform/-/logform-2.7.0.tgz#cfca97528ef290f2e125a08396805002b2d060d1" ++ integrity sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ== ++ dependencies: ++ "@colors/colors" "1.6.0" ++ "@types/triple-beam" "^1.3.2" ++ fecha "^4.2.0" ++ ms "^2.1.1" ++ safe-stable-stringify "^2.3.1" ++ triple-beam "^1.3.0" ++ ++markdown-it@^8.3.1: ++ version "8.4.2" ++ resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54" ++ integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ== ++ dependencies: ++ argparse "^1.0.7" ++ entities "~1.1.1" ++ linkify-it "^2.0.0" ++ mdurl "^1.0.1" ++ uc.micro "^1.0.5" ++ ++mdurl@^1.0.1: ++ version "1.0.1" ++ resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" ++ integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g== ++ ++minimatch@^3.1.1: ++ version "3.1.2" ++ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" ++ integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== ++ dependencies: ++ brace-expansion "^1.1.7" ++ ++ms@^2.1.1: ++ version "2.1.3" ++ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" ++ integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== ++ ++once@^1.3.0: ++ version "1.4.0" ++ resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" ++ integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== ++ dependencies: ++ wrappy "1" ++ ++one-time@^1.0.0: ++ version "1.0.0" ++ resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" ++ integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== ++ dependencies: ++ fn.name "1.x.x" ++ ++path-is-absolute@^1.0.0: ++ version "1.0.1" ++ resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" ++ integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== ++ ++readable-stream@^3.4.0, readable-stream@^3.6.2: ++ version "3.6.2" ++ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" ++ integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== ++ dependencies: ++ inherits "^2.0.3" ++ string_decoder "^1.1.1" ++ util-deprecate "^1.0.1" ++ ++requirejs@^2.1.0: ++ version "2.3.7" ++ resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.7.tgz#0b22032e51a967900e0ae9f32762c23a87036bd0" ++ integrity sha512-DouTG8T1WanGok6Qjg2SXuCMzszOo0eHeH9hDZ5Y4x8Je+9JB38HdTLT4/VA8OaUhBa0JPVHJ0pyBkM1z+pDsw== ++ ++roboto-fontface@0.10.0: ++ version "0.10.0" ++ resolved "https://registry.yarnpkg.com/roboto-fontface/-/roboto-fontface-0.10.0.tgz#7eee40cfa18b1f7e4e605eaf1a2740afb6fd71b0" ++ integrity sha512-OlwfYEgA2RdboZohpldlvJ1xngOins5d7ejqnIBWr9KaMxsnBqotpptRXTyfNRLnFpqzX6sTDt+X+a+6udnU8g== ++ ++safe-buffer@~5.2.0: ++ version "5.2.1" ++ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" ++ integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== ++ ++safe-stable-stringify@^2.3.1: ++ version "2.5.0" ++ resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz#4ca2f8e385f2831c432a719b108a3bf7af42a1dd" ++ integrity sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA== ++ ++"safer-buffer@>= 2.1.2 < 3": ++ version "2.1.2" ++ resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" ++ integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== ++ ++semver@~5.3.0: ++ version "5.3.0" ++ resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" ++ integrity sha512-mfmm3/H9+67MCVix1h+IXTpDwL6710LyHuk7+cWC9T1mE0qz4iHhh6r4hU2wrIT9iTsAAC2XQRvfblL028cpLw== ++ ++shelljs@^0.2.6: ++ version "0.2.6" ++ resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.2.6.tgz#90492d72ffcc8159976baba62fb0f6884f0c3378" ++ integrity sha512-LQiM15qPbSyzHDFfI4v7EVhjBXG5PUAKWVBnVMBXwdlQSHZtzKYeKGzDHBIqpenPrCsPWqBSOF5o7oSvSfX+CA== ++ ++simple-swizzle@^0.2.2: ++ version "0.2.4" ++ resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.4.tgz#a8d11a45a11600d6a1ecdff6363329e3648c3667" ++ integrity sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw== ++ dependencies: ++ is-arrayish "^0.3.1" ++ ++sprintf-js@~1.0.2: ++ version "1.0.3" ++ resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" ++ integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== ++ ++stack-trace@0.0.x: ++ version "0.0.10" ++ resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" ++ integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg== ++ ++string_decoder@^1.1.1: ++ version "1.3.0" ++ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" ++ integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== ++ dependencies: ++ safe-buffer "~5.2.0" ++ ++text-hex@1.0.x: ++ version "1.0.0" ++ resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" ++ integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== ++ ++triple-beam@1.3.0, triple-beam@^1.3.0: ++ version "1.3.0" ++ resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" ++ integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== ++ ++uc.micro@^1.0.1, uc.micro@^1.0.5: ++ version "1.0.6" ++ resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" ++ integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== ++ ++universalify@^0.1.0: ++ version "0.1.2" ++ resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" ++ integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== ++ ++util-deprecate@^1.0.1: ++ version "1.0.2" ++ resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" ++ integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== ++ ++winston-transport@^4.9.0: ++ version "4.9.0" ++ resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.9.0.tgz#3bba345de10297654ea6f33519424560003b3bf9" ++ integrity sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A== ++ dependencies: ++ logform "^2.7.0" ++ readable-stream "^3.6.2" ++ triple-beam "^1.3.0" ++ ++winston@^3.0.0: ++ version "3.18.3" ++ resolved "https://registry.yarnpkg.com/winston/-/winston-3.18.3.tgz#93ac10808c8e1081d723bc8811cd2f445ddfdcd1" ++ integrity sha512-NoBZauFNNWENgsnC9YpgyYwOVrl2m58PpQ8lNHjV3kosGs7KJ7Npk9pCUE+WJlawVSe8mykWDKWFSVfs3QO9ww== ++ dependencies: ++ "@colors/colors" "^1.6.0" ++ "@dabh/diagnostics" "^2.0.8" ++ async "^3.2.3" ++ is-stream "^2.0.0" ++ logform "^2.7.0" ++ one-time "^1.0.0" ++ readable-stream "^3.4.0" ++ safe-stable-stringify "^2.3.1" ++ stack-trace "0.0.x" ++ triple-beam "^1.3.0" ++ winston-transport "^4.9.0" ++ ++wrappy@1: ++ version "1.0.2" ++ resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" ++ integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== diff --git a/bigtop-packages/src/common/hadoop/patch4-HADOOP-19551.diff b/bigtop-packages/src/common/hadoop/patch4-HADOOP-19551.diff deleted file mode 100644 index a2744103fb..0000000000 --- a/bigtop-packages/src/common/hadoop/patch4-HADOOP-19551.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/hadoop-common-project/hadoop-common/HadoopCommon.cmake b/hadoop-common-project/hadoop-common/HadoopCommon.cmake -index 7628ecf628de..8ed478dc8df7 100644 ---- a/hadoop-common-project/hadoop-common/HadoopCommon.cmake -+++ b/hadoop-common-project/hadoop-common/HadoopCommon.cmake -@@ -145,6 +145,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - # Make GNU extensions available. - hadoop_add_compiler_flags("-D_GNU_SOURCE") - -+ # using old default behavior on GCC >= 14.0 -+ hadoop_add_compiler_flags("-Wno-error=implicit-function-declaration") -+ - # If JVM_ARCH_DATA_MODEL is 32, compile all binaries as 32-bit. - if(JVM_ARCH_DATA_MODEL EQUAL 32) - # Force 32-bit code generation on amd64/x86_64, ppc64, sparc64 diff --git a/bigtop-packages/src/common/hadoop/patch5-fix-kms-shellprofile.diff b/bigtop-packages/src/common/hadoop/patch5-fix-kms-shellprofile.diff index 75413b051e..72295b33bd 100644 --- a/bigtop-packages/src/common/hadoop/patch5-fix-kms-shellprofile.diff +++ b/bigtop-packages/src/common/hadoop/patch5-fix-kms-shellprofile.diff @@ -1,11 +1,11 @@ diff --git a/hadoop-common-project/hadoop-kms/src/main/libexec/shellprofile.d/hadoop-kms.sh b/hadoop-common-project/hadoop-kms/src/main/libexec/shellprofile.d/hadoop-kms.sh -index 0d084bb36e6..dafe7459f4a 100755 +index b54bf811d6b..bb860ce2d93 100755 --- a/hadoop-common-project/hadoop-kms/src/main/libexec/shellprofile.d/hadoop-kms.sh +++ b/hadoop-common-project/hadoop-kms/src/main/libexec/shellprofile.d/hadoop-kms.sh -@@ -49,9 +49,4 @@ function hadoop_subcommand_kms - "-Dkms.config.dir=${HADOOP_CONF_DIR}" - hadoop_add_param HADOOP_OPTS "-Dkms.log.dir=" \ +@@ -51,9 +51,4 @@ function hadoop_subcommand_kms "-Dkms.log.dir=${HADOOP_LOG_DIR}" + hadoop_add_param HADOOP_OPTS "-Dlog4j.configuration=" \ + "-Dlog4j.configuration=file:${HADOOP_CONF_DIR}/kms-log4j.properties" - - if [[ "${HADOOP_DAEMON_MODE}" == "default" ]] || - [[ "${HADOOP_DAEMON_MODE}" == "start" ]]; then diff --git a/bigtop-packages/src/common/hadoop/patch9-HDFS-17287.diff b/bigtop-packages/src/common/hadoop/patch9-HADOOP-19019.diff similarity index 71% rename from bigtop-packages/src/common/hadoop/patch9-HDFS-17287.diff rename to bigtop-packages/src/common/hadoop/patch9-HADOOP-19019.diff index d2cb8d100f..e89fd3b87a 100644 --- a/bigtop-packages/src/common/hadoop/patch9-HDFS-17287.diff +++ b/bigtop-packages/src/common/hadoop/patch9-HADOOP-19019.diff @@ -1,46 +1,32 @@ +commit 14e781a026d16ce67f32e17a53df01d5b3f81716 +Author: jialiang <2510095164@qq.com> +Date: Tue Jan 23 14:51:20 2024 +0800 + + HADOOP-19019: Parallel Maven Build Support for Apache Hadoop (#6373). Contributed by JiaLiangC. + + Signed-off-by: Steve Loughran + Signed-off-by: He Xiaoqiao + (cherry picked from commit b2fac14828b69c761858dd7cb9ab17313c28b161) + diff --git a/hadoop-mapreduce-project/pom.xml b/hadoop-mapreduce-project/pom.xml -index 45ea915b62b1..426baaf90db8 100644 +index 6e63dd82922..30b37c8f4c0 100644 --- a/hadoop-mapreduce-project/pom.xml +++ b/hadoop-mapreduce-project/pom.xml -@@ -148,7 +148,35 @@ - ${leveldbjni.group} - leveldbjni-all +@@ -86,6 +86,12 @@ + hadoop-mapreduce-examples + ${project.version} -- -+ -+ org.apache.hadoop -+ hadoop-mapreduce-client-shuffle -+ ${project.version} -+ provided -+ -+ -+ org.apache.hadoop -+ hadoop-mapreduce-client-jobclient -+ ${project.version} -+ provided -+ + + org.apache.hadoop + hadoop-mapreduce-client-hs-plugins + ${project.version} + provided -+ -+ -+ org.apache.hadoop -+ hadoop-mapreduce-client-nativetask -+ ${project.version} -+ provided -+ -+ -+ org.apache.hadoop -+ hadoop-mapreduce-examples -+ provided + diff --git a/hadoop-yarn-project/pom.xml b/hadoop-yarn-project/pom.xml -index 74c774e8cf83..8d50d39ca7b3 100644 +index 94d7369fd82..3ced36748a8 100644 --- a/hadoop-yarn-project/pom.xml +++ b/hadoop-yarn-project/pom.xml @@ -33,6 +33,7 @@ @@ -51,9 +37,9 @@ index 74c774e8cf83..8d50d39ca7b3 100644 -@@ -82,6 +83,61 @@ - org.apache.hadoop - hadoop-yarn-services-core +@@ -90,6 +91,64 @@ + hadoop-yarn-applications-catalog-webapp + war + + org.apache.hadoop @@ -77,6 +63,16 @@ index 74c774e8cf83..8d50d39ca7b3 100644 + hadoop-yarn-server-timelineservice-hbase-client + ${project.version} + provided ++ ++ ++ com.google.errorprone ++ error_prone_annotations ++ ++ ++ org.codehaus.mojo ++ animal-sniffer-annotations ++ ++ + + + org.apache.hadoop @@ -98,13 +94,6 @@ index 74c774e8cf83..8d50d39ca7b3 100644 + + + org.apache.hadoop -+ hadoop-yarn-applications-catalog-webapp -+ ${hadoop.version} -+ provided -+ war -+ -+ -+ org.apache.hadoop + hadoop-yarn-ui + ${project.version} + ${yarn.ui.packaging} @@ -113,7 +102,7 @@ index 74c774e8cf83..8d50d39ca7b3 100644 -@@ -115,6 +171,32 @@ +@@ -123,6 +182,32 @@ diff --git a/bigtop-packages/src/common/hadoop/patch9-HDFS-17226.diff b/bigtop-packages/src/common/hadoop/patch9-HDFS-17226.diff deleted file mode 100644 index a09936bfa3..0000000000 --- a/bigtop-packages/src/common/hadoop/patch9-HDFS-17226.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/content_summary.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/content_summary.h -index 6762a65ca908b..d9809bab59291 100644 ---- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/content_summary.h -+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/content_summary.h -@@ -19,6 +19,7 @@ - #define HDFSPP_CONTENT_SUMMARY_H_ - - #include -+#include - - namespace hdfs { - -diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/fsinfo.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/fsinfo.h -index 103cf133bec22..156ed445181a3 100644 ---- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/fsinfo.h -+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/fsinfo.h -@@ -19,6 +19,7 @@ - #define HDFSPP_FSINFO_H_ - - #include -+#include - - namespace hdfs { - -diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/statinfo.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/statinfo.h -index 1da1f18a592bd..5924d1db00587 100644 ---- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/statinfo.h -+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/statinfo.h -@@ -19,6 +19,7 @@ - #define HDFSPP_STATINFO_H_ - - #include -+#include - - namespace hdfs { - -diff --git a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/uri.h b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/uri.h -index bc3d8b96d3f66..a7f735afb5dbc 100644 ---- a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/uri.h -+++ b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/uri.h -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - - namespace hdfs diff --git a/bigtop.bom b/bigtop.bom index 09b23da5a7..0a958d9cdc 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -156,7 +156,7 @@ bigtop { name = 'hadoop' rpm_pkg_suffix = "_" + bigtop.base_version.replace(".", "_") relNotes = 'Apache Hadoop' - version { base = '3.3.6'; pkg = base; release = 1 } + version { base = '3.4.2'; pkg = base; release = 1 } tarball { destination = "${name}-${version.base}.tar.gz" source = "${name}-${version.base}-src.tar.gz" } url { download_path = "/$name/common/$name-${version.base}" diff --git a/bigtop_toolchain/manifests/packages.pp b/bigtop_toolchain/manifests/packages.pp index 9fdbfd024f..3aec81bbd8 100644 --- a/bigtop_toolchain/manifests/packages.pp +++ b/bigtop_toolchain/manifests/packages.pp @@ -274,6 +274,8 @@ "libsnappy-dev", "libzstd-dev", "libboost-regex-dev", + "libboost-date-time-dev", + "libboost-program-options-dev", "xfslibs-dev", "libbz2-dev", "libreadline-dev",