From 1e3f7808b1091d76b80369a93f0361453247f368 Mon Sep 17 00:00:00 2001 From: Max Romanov Date: Tue, 15 Jun 2021 10:35:15 +0300 Subject: Node.js: improving and test packaging. The patch removes the "files" section from package.json to avoid future issues with missing files. For package testing purposes, 'npm pack' is used instead of plain 'tar' to simulate packaging more accurately. --- auto/modules/nodejs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'auto/modules') diff --git a/auto/modules/nodejs b/auto/modules/nodejs index b2309143..7d4f8581 100644 --- a/auto/modules/nodejs +++ b/auto/modules/nodejs @@ -157,6 +157,7 @@ ${NXT_NODE}-copy: ${NXT_NODE_VERSION_FILE} ${NXT_NODE_PACKAGE_FILE} mkdir -p ${NXT_NODE_TMP} cp -rp src/nodejs/unit-http/* ${NXT_NODE_TMP}/ cp -p ${NXT_NODE_VERSION_FILE} ${NXT_NODE_PACKAGE_FILE} ${NXT_NODE_TMP}/ + rm -f ${NXT_NODE_TMP}/binding_pub.gyp ${NXT_NODE}-copy-g: ${NXT_NODE_VERSION_FILE} ${NXT_NODE_PACKAGE_FILE} mkdir -p ${NXT_NODE_TMP_G} @@ -174,10 +175,12 @@ ${NXT_NODE_PACKAGE_FILE}: ${NXT_VERSION_H} src/nodejs/unit-http/package.json src/nodejs/unit-http/package.json > ${NXT_NODE_PACKAGE_FILE} ${NXT_NODE_TARBALL}: ${NXT_NODE}-copy - tar -zcvf ${NXT_NODE_TARBALL} -C ${NXT_NODE_TMP} . + cd ${NXT_NODE_TMP} && npm pack + mv ${NXT_NODE_TMP}/unit-http-\$(NXT_VERSION).tgz ${NXT_NODE_TARBALL} ${NXT_NODE_TARBALL_G}: ${NXT_NODE}-copy-g - tar -zcvf ${NXT_NODE_TARBALL_G} -C ${NXT_NODE_TMP_G} . + cd ${NXT_NODE_TMP_G} && npm pack + mv ${NXT_NODE_TMP_G}/unit-http-\$(NXT_VERSION).tgz ${NXT_NODE_TARBALL_G} install: ${NXT_NODE}-$NXT_NODE_INSTALL -- cgit From 1a85ad378f3374b9c83b59ae9c12277288aa7c30 Mon Sep 17 00:00:00 2001 From: Max Romanov Date: Mon, 9 Aug 2021 10:14:57 +0300 Subject: Java: upgrading third-party components. --- auto/modules/java | 8 ++++---- auto/modules/java_jar.sha512 | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'auto/modules') diff --git a/auto/modules/java b/auto/modules/java index 05b3100c..d2699c36 100644 --- a/auto/modules/java +++ b/auto/modules/java @@ -238,7 +238,7 @@ cat << END > $NXT_JAVA_JARS static const char *nxt_java_system_jars[] = { END -NXT_TOMCAT_VERSION=9.0.44 +NXT_TOMCAT_VERSION=9.0.50 NXT_JAR_VERSION=$NXT_TOMCAT_VERSION @@ -271,7 +271,7 @@ NXT_JAR_NAME=tomcat-util . auto/modules/java_get_jar NXT_JAR_NAME=ecj -NXT_JAR_VERSION=3.25.0 +NXT_JAR_VERSION=3.26.0 NXT_JAR_NAMESPACE=org/eclipse/jdt/ . auto/modules/java_get_jar @@ -284,7 +284,7 @@ static const char *nxt_java_unit_jars[] = { "$NXT_UNIT_JAR", END -NXT_JAR_VERSION=9.4.38.v20210224 +NXT_JAR_VERSION=9.4.43.v20210629 NXT_JAR_NAMESPACE=org/eclipse/jetty/ NXT_JAR_NAME=jetty-util @@ -297,7 +297,7 @@ NXT_JAR_NAME=jetty-http . auto/modules/java_get_jar NXT_JAR_NAME=classgraph -NXT_JAR_VERSION=4.8.102 +NXT_JAR_VERSION=4.8.111 NXT_JAR_NAMESPACE=io/github/classgraph/ . auto/modules/java_get_jar diff --git a/auto/modules/java_jar.sha512 b/auto/modules/java_jar.sha512 index 98d27149..6f792ee7 100644 --- a/auto/modules/java_jar.sha512 +++ b/auto/modules/java_jar.sha512 @@ -1,14 +1,14 @@ -5105e9edf0fc6a4a51eb2bb1e2c23bb78a604fe2df3b1e814cf638ce22845a6ae57e75af31db9dd00d5c650403e751659cca8d3bc465fb96525c695188d2055f classgraph-4.8.102.jar -48cee25d195a5c713a962b035ecba633797753474f290c107a0ee96272cd9ae1b6b62b060ef37e0699f6a5af4d4b45e514ef710309f41bdd9440925cf60a111a ecj-3.25.0.jar -3f2a4a5b7f71c6a1317cec29ea12eb04eac68f4cee94c30ffb75fdd36dbc9c622059fb762e27f74f7b7a38eb84966732ba963cc294f5aaf8b7f5f8c9d60c8899 jetty-http-9.4.38.v20210224.jar -cc416b324841e9c259538a3ec678a9d8e07d3bea9b0bb687bc15a759c5065c7de6ea7bbbb15b369b8c6d2023c3294906d8f9cfda28e1b7859283008790581a4d jetty-server-9.4.38.v20210224.jar -efdbeae97c959459c10b05aae62189c535a0935dadf7debf4257257c31a98a4167ca1318daa81dae32161f51117b17468d5fb5a6bb4eea40864ce1265623d684 jetty-util-9.4.38.v20210224.jar -f2534f246c0cec9be576f18d67759b5a997074bb7870cbf7b9469f062ddc6932e5cec45fd439a5beacc8c6248d39dc458af81245a6eb988e294667f2bcd251df tomcat-api-9.0.44.jar -0c8050b04b02a6a1f1384d1a4041594c09868cfeb139978274c5e5797eb95e0668495f489eb61cfe742905e453184edc0ad8a9fd3b2796e960981a20ae4a0334 tomcat-el-api-9.0.44.jar -cc81a06795553f06d3dfe930429fdf47a8e0c1813c554b640d98090cc661c1eb27a91b9a9055bd14d918fc9451073632a635741dd413fd7b4a380d8907862e14 tomcat-jasper-9.0.44.jar -de50107ff31b8c5a7eb97fe86c2fdfa38305be632c8d62329219884dfb6bbe76372b40a67e808263a55b510a41cde639d55e7925d89db06472392519f0410063 tomcat-jasper-el-9.0.44.jar -69a79e58cea950b713f26a94e1db90221c297375a338f010d1332027ef5d93fd262163ec787b06d8cd41a4a31faa81bb4fc83836148eb14a6757591f6fe5f3c6 tomcat-jsp-api-9.0.44.jar -ca036312596dbd92ae43dda79a9a5ad168cf90a12369636fdc6febbedb559b83d5fa22d77629659b588d70990f8a077fd8356be1c56b0227e07688b67dd7c76e tomcat-juli-9.0.44.jar -952c122413805de16de603cfc233785e53b558b39f146b6fa4e11324e26572e4aee76fec2ee69adecc8f4271cd28acb917e1a9e61a908710b3582ab1f76c9706 tomcat-servlet-api-9.0.44.jar -6920bfb2b1ae173d716fedbf4f238003f569a161f277a888c2d53dac0af80ef0480c9ca3be0ede4583716c1b97c1cfa1665439d14274b7d73ec948fd9f952b89 tomcat-util-9.0.44.jar -915304750cbdffc4c9926fcb22eb928d2895cccd8b3f6f13aefb4e5302cccf5f513502b70812630026dd2968712c4c3b1cfe98d37ecf7b349988e7255ddc5b18 tomcat-util-scan-9.0.44.jar +9ffd4be045bd5f2f0400aa25270ee8663ed8f794994e81a0fe6f2c6e1ca3e77b9dcd1521c208e3ca928535919868c6607e1fc2303188e47347aff1ac58641353 classgraph-4.8.111.jar +ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b96eaa8826647f1d5323e185018fe33a64c402d69c73c9158 ecj-3.26.0.jar +a3ce1a5a41c9791ece4cbbf049ec4add1ec41330743d6757daea520f8b329299f5dd274f9e5741ba41fe49510f203efd19540d2404390eca53421132f5f46d4b jetty-http-9.4.43.v20210629.jar +61a14e97baac9962bd68ece24f8b967eec8e32edfebfa27c6a13996a86650d82f8977bf1aa582fc9706a1b028cb3cec0057c97628235dfc130061939845229e6 jetty-server-9.4.43.v20210629.jar +304fcdba2bdbf37e8f2ea69a3f5fbdffdfefd98d80fa78883b1dca1129a4907cef63eb2fa7c83eef359022a3b6a2f3ff742d8d23075c83d049ac01f1402e97f8 jetty-util-9.4.43.v20210629.jar +7fb21023c0469296ccb257d9672d727aeb4b437d1b000344c5087bb120ca0e5fc3fcddd6524b851c7cffbf01c042edb5e779e03f82753cf61d43c920f260ccdf tomcat-api-9.0.50.jar +d505100fd7bca52db627c4f36aeb244ada08121ba35509ef4251a1779ef68261599ba7d5e08667441c6582cb471162092c150adc46e670550efbea16ad8dc3dd tomcat-el-api-9.0.50.jar +a0a9d99428a96f6e33d24938ab23ffff7c0b04e737183616e951e3bb978da9f057a19da6ebe0cbf2e7ad0c87735c19aae12ececd588405779dac725d37dee2ea tomcat-jasper-9.0.50.jar +ce8ee01533b2fea8c2611a96eccc8ce89ad99f8f646e5e9a9e6883909ad133952e7db1424900654747c3140b1581dfcfc25dafa0e9773f4de74082100b7ac2f1 tomcat-jasper-el-9.0.50.jar +fa05e5d950340dbf806f2dd74f1c8549d12e477dd7fd7e4755a64641220190352a19faf669580f35799b884ab08d96770a8514c2b67fce9c6a1742dcaba954ef tomcat-jsp-api-9.0.50.jar +fff70d05d13217fa98247dfa35aae43179aab4bb7b00073f0f5de331eb9f3d331aef218670e5e6e2280fb74d2f98733cd4bd72d499cdc29ff6dcaf6cbbbf470f tomcat-juli-9.0.50.jar +56a6f6c2887546390ca66463f2a748ee56a1537fe9a4a2edc0ea21abf332a473742523e4b8e8433fa9e132f359b106bff7bf96ed611532c6738a236095237c33 tomcat-servlet-api-9.0.50.jar +d02d4f166fa9490e2af22c314180f54b48fec120957bd483529bf65df0f0187736177e140067bc775d7c7b751eedbf953e259a20bc76d3b9a974e7b3b9be2024 tomcat-util-9.0.50.jar +1bd03304eaf7c8bb10092356c31c42366465f29f4828a935cb5ec9a890c05d7b41b8ddcdbad507aeb4cb09441f39e7cb10832737bd8e754e84cf98a6837c1cd5 tomcat-util-scan-9.0.50.jar -- cgit From b586707c861448cfdd6d8783864c4a1ce7112a77 Mon Sep 17 00:00:00 2001 From: Max Romanov Date: Thu, 12 Aug 2021 14:55:51 +0300 Subject: Java: upgrading third-party components. --- auto/modules/java | 4 ++-- auto/modules/java_jar.sha512 | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'auto/modules') diff --git a/auto/modules/java b/auto/modules/java index d2699c36..e8137217 100644 --- a/auto/modules/java +++ b/auto/modules/java @@ -238,7 +238,7 @@ cat << END > $NXT_JAVA_JARS static const char *nxt_java_system_jars[] = { END -NXT_TOMCAT_VERSION=9.0.50 +NXT_TOMCAT_VERSION=9.0.52 NXT_JAR_VERSION=$NXT_TOMCAT_VERSION @@ -297,7 +297,7 @@ NXT_JAR_NAME=jetty-http . auto/modules/java_get_jar NXT_JAR_NAME=classgraph -NXT_JAR_VERSION=4.8.111 +NXT_JAR_VERSION=4.8.112 NXT_JAR_NAMESPACE=io/github/classgraph/ . auto/modules/java_get_jar diff --git a/auto/modules/java_jar.sha512 b/auto/modules/java_jar.sha512 index 6f792ee7..5289081c 100644 --- a/auto/modules/java_jar.sha512 +++ b/auto/modules/java_jar.sha512 @@ -1,14 +1,14 @@ -9ffd4be045bd5f2f0400aa25270ee8663ed8f794994e81a0fe6f2c6e1ca3e77b9dcd1521c208e3ca928535919868c6607e1fc2303188e47347aff1ac58641353 classgraph-4.8.111.jar +e7ad5ee436f6befaddcdd1046022a2e30444a435d9419a33f8316f66e794cf710809dbcf7e408a087f434cd9cb724682965b5e4098e34803569241eb44288322 classgraph-4.8.112.jar ab441acf5551a7dc81c353eaccb3b3df9e89a48987294d19e39acdb83a5b640fcdff7414cee29f5b96eaa8826647f1d5323e185018fe33a64c402d69c73c9158 ecj-3.26.0.jar a3ce1a5a41c9791ece4cbbf049ec4add1ec41330743d6757daea520f8b329299f5dd274f9e5741ba41fe49510f203efd19540d2404390eca53421132f5f46d4b jetty-http-9.4.43.v20210629.jar 61a14e97baac9962bd68ece24f8b967eec8e32edfebfa27c6a13996a86650d82f8977bf1aa582fc9706a1b028cb3cec0057c97628235dfc130061939845229e6 jetty-server-9.4.43.v20210629.jar 304fcdba2bdbf37e8f2ea69a3f5fbdffdfefd98d80fa78883b1dca1129a4907cef63eb2fa7c83eef359022a3b6a2f3ff742d8d23075c83d049ac01f1402e97f8 jetty-util-9.4.43.v20210629.jar -7fb21023c0469296ccb257d9672d727aeb4b437d1b000344c5087bb120ca0e5fc3fcddd6524b851c7cffbf01c042edb5e779e03f82753cf61d43c920f260ccdf tomcat-api-9.0.50.jar -d505100fd7bca52db627c4f36aeb244ada08121ba35509ef4251a1779ef68261599ba7d5e08667441c6582cb471162092c150adc46e670550efbea16ad8dc3dd tomcat-el-api-9.0.50.jar -a0a9d99428a96f6e33d24938ab23ffff7c0b04e737183616e951e3bb978da9f057a19da6ebe0cbf2e7ad0c87735c19aae12ececd588405779dac725d37dee2ea tomcat-jasper-9.0.50.jar -ce8ee01533b2fea8c2611a96eccc8ce89ad99f8f646e5e9a9e6883909ad133952e7db1424900654747c3140b1581dfcfc25dafa0e9773f4de74082100b7ac2f1 tomcat-jasper-el-9.0.50.jar -fa05e5d950340dbf806f2dd74f1c8549d12e477dd7fd7e4755a64641220190352a19faf669580f35799b884ab08d96770a8514c2b67fce9c6a1742dcaba954ef tomcat-jsp-api-9.0.50.jar -fff70d05d13217fa98247dfa35aae43179aab4bb7b00073f0f5de331eb9f3d331aef218670e5e6e2280fb74d2f98733cd4bd72d499cdc29ff6dcaf6cbbbf470f tomcat-juli-9.0.50.jar -56a6f6c2887546390ca66463f2a748ee56a1537fe9a4a2edc0ea21abf332a473742523e4b8e8433fa9e132f359b106bff7bf96ed611532c6738a236095237c33 tomcat-servlet-api-9.0.50.jar -d02d4f166fa9490e2af22c314180f54b48fec120957bd483529bf65df0f0187736177e140067bc775d7c7b751eedbf953e259a20bc76d3b9a974e7b3b9be2024 tomcat-util-9.0.50.jar -1bd03304eaf7c8bb10092356c31c42366465f29f4828a935cb5ec9a890c05d7b41b8ddcdbad507aeb4cb09441f39e7cb10832737bd8e754e84cf98a6837c1cd5 tomcat-util-scan-9.0.50.jar +f14ac948559c0b6e20f6d84e5177fea46ea1321a7a401f280ee9323f3a07e70e141d2b12c8c466c446efb55a58743af931b0584f56494f17311cab511bcd214a tomcat-api-9.0.52.jar +a5ca293732267854a296ccc79b25051acf76fa8dea6118d43aa2e95b6d1951dfaffb941430b5080d7ab62d82d2c82c9385baf99e3c4a2bb6bf4a04372149169d tomcat-el-api-9.0.52.jar +8660e11dd0f994de43b19ba251a789dc3194a6b82d674085fed510200c789b402b27ab97bcecfec0720f563bb0dd18c2631cd8bb5c35e604c1460d7357492123 tomcat-jasper-9.0.52.jar +5b0b3e0edb47e3c4269736542d66d6fc099a74965fdcd5d3a6382db3f75bec7329e81f0719aaafccd318a058ec8fbba113a6ae9234ca94a00c8c39e5c8885568 tomcat-jasper-el-9.0.52.jar +a4368d1073d79a4f8a1cb8967a5e39af87723a17b2d94466554e8e4d3e8bb2dec3ee37db9f606e0c775dd4028604d4e87921f0dda764c8ef138aa50acf03d549 tomcat-jsp-api-9.0.52.jar +8687e108489996226a83e8310c73a2a176fac9ce365a7bd3fc23955fe968c3858a24c047cb5c7fbd1f3a890c893dcdf55e88180eefe61b98c1a3bf4e316fb07e tomcat-juli-9.0.52.jar +f9929f433e2b2f93897a87d117af2519e44020b44e3a475dfc81662b08d08e010b14a3dd6df2d4800196cdba7cbb8db2b879341c5a0ef1d11e5abe63d872bc34 tomcat-servlet-api-9.0.52.jar +c21ccf969378f2cad0ead32451c2527ea944207b5a894b642ee554042fe87eb0ce647aacbf8a51d12b4ecf2bf13e9380da78d8f7792486909daba72e8d0f83f2 tomcat-util-9.0.52.jar +14b4eb31c124d22c7ea7f05808cd6a46076f9d72648afd76e2d11924874117266771a455686d704225d2eff94656f024293140a3259b108857fa6b8b218ddd63 tomcat-util-scan-9.0.52.jar -- cgit