diff --git a/enterprise/libs.jackson/external/binaries-list b/enterprise/libs.jackson/external/binaries-list index 073162777d51..4d3771196497 100644 --- a/enterprise/libs.jackson/external/binaries-list +++ b/enterprise/libs.jackson/external/binaries-list @@ -15,9 +15,9 @@ # specific language governing permissions and limitations # under the License. -880A742337010DA4C851F843D8CAC150E22DFF9F com.fasterxml.jackson.core:jackson-annotations:2.17.0 -A6E5058EF9720623C517252D17162F845306FF3A com.fasterxml.jackson.core:jackson-core:2.17.0 -7173E9E1D4BC6D7CA03BC4EEEDCD548B8B580B34 com.fasterxml.jackson.core:jackson-databind:2.17.0 -6833C8573452D583E4AF650A7424D547606B2501 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.17.0 -3FAB507BBA9D477E52ED2302DC3DDBD23CBAE339 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0 -E07032CE170277213AC4835169CA79FA0340C7B5 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.17.0 +147B7B9412FFFF24339F8ABA080B292448E08698 com.fasterxml.jackson.core:jackson-annotations:2.17.2 +969A35CB35C86512ACBADCDBBBFB044C877DB814 com.fasterxml.jackson.core:jackson-core:2.17.2 +E6DEB029E5901E027C129341FAC39E515066B68C com.fasterxml.jackson.core:jackson-databind:2.17.2 +57FA7C1B5104BBC4599278D13933A937EE058E68 com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.17.2 +267B85E9BA2892A37BE6D80AA9CA1438A0D8C210 com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2 +C2978B818EF2F2B2738B387C143624EAB611D917 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.17.2 diff --git a/enterprise/libs.jackson/external/jackson-2.17.0-license.txt b/enterprise/libs.jackson/external/jackson-2.17.2-license.txt similarity index 98% rename from enterprise/libs.jackson/external/jackson-2.17.0-license.txt rename to enterprise/libs.jackson/external/jackson-2.17.2-license.txt index 991f005e790b..6aeb0ab71d77 100644 --- a/enterprise/libs.jackson/external/jackson-2.17.0-license.txt +++ b/enterprise/libs.jackson/external/jackson-2.17.2-license.txt @@ -2,8 +2,8 @@ Name: Jackson Description: Jackson is a high-performance JSON processor for Java. License: Apache-2.0 Origin: https://github.com/FasterXML/jackson -Version: 2.17.0 -Files: jackson-annotations-2.17.0.jar, jackson-core-2.17.0.jar, jackson-databind-2.17.0.jar, jackson-dataformat-cbor-2.17.0.jar, jackson-datatype-jsr310-2.17.0.jar, jackson-module-jaxb-annotations-2.17.0.jar +Version: 2.17.2 +Files: jackson-annotations-2.17.2.jar, jackson-core-2.17.2.jar, jackson-databind-2.17.2.jar, jackson-dataformat-cbor-2.17.2.jar, jackson-datatype-jsr310-2.17.2.jar, jackson-module-jaxb-annotations-2.17.2.jar Apache License diff --git a/enterprise/libs.jackson/nbproject/project.properties b/enterprise/libs.jackson/nbproject/project.properties index acdfd70b3111..8cd7a8a0055c 100644 --- a/enterprise/libs.jackson/nbproject/project.properties +++ b/enterprise/libs.jackson/nbproject/project.properties @@ -19,9 +19,9 @@ is.autoload=true javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.8 sigtest.gen.fail.on.error=false -release.external/jackson-annotations-2.17.0.jar=modules/ext/jackson/jackson-annotations-2.17.0.jar -release.external/jackson-core-2.17.0.jar=modules/ext/jackson/jackson-core-2.17.0.jar -release.external/jackson-databind-2.17.0.jar=modules/ext/jackson/jackson-databind-2.17.0.jar -release.external/jackson-dataformat-cbor-2.17.0.jar=modules/ext/jackson/jackson-dataformat-cbor-2.17.0.jar -release.external/jackson-datatype-jsr310-2.17.0.jar=modules/ext/jackson/jackson-datatype-jsr310-2.17.0.jar -release.external/jackson-module-jaxb-annotations-2.17.0.jar=modules/ext/jackson/jackson-module-jaxb-annotations-2.17.0.jar +release.external/jackson-annotations-2.17.2.jar=modules/ext/jackson/jackson-annotations-2.17.2.jar +release.external/jackson-core-2.17.2.jar=modules/ext/jackson/jackson-core-2.17.2.jar +release.external/jackson-databind-2.17.2.jar=modules/ext/jackson/jackson-databind-2.17.2.jar +release.external/jackson-dataformat-cbor-2.17.2.jar=modules/ext/jackson/jackson-dataformat-cbor-2.17.2.jar +release.external/jackson-datatype-jsr310-2.17.2.jar=modules/ext/jackson/jackson-datatype-jsr310-2.17.2.jar +release.external/jackson-module-jaxb-annotations-2.17.2.jar=modules/ext/jackson/jackson-module-jaxb-annotations-2.17.2.jar diff --git a/enterprise/libs.jackson/nbproject/project.xml b/enterprise/libs.jackson/nbproject/project.xml index c12f13cacdcd..9b324e26bbec 100644 --- a/enterprise/libs.jackson/nbproject/project.xml +++ b/enterprise/libs.jackson/nbproject/project.xml @@ -85,28 +85,28 @@ com.fasterxml.jackson.module.jaxb.ser - ext/jackson/jackson-annotations-2.17.0.jar - external/jackson-annotations-2.17.0.jar + ext/jackson/jackson-annotations-2.17.2.jar + external/jackson-annotations-2.17.2.jar - ext/jackson/jackson-core-2.17.0.jar - external/jackson-core-2.17.0.jar + ext/jackson/jackson-core-2.17.2.jar + external/jackson-core-2.17.2.jar - ext/jackson/jackson-databind-2.17.0.jar - external/jackson-databind-2.17.0.jar + ext/jackson/jackson-databind-2.17.2.jar + external/jackson-databind-2.17.2.jar - ext/jackson/jackson-dataformat-cbor-2.17.0.jar - external/jackson-dataformat-cbor-2.17.0.jar + ext/jackson/jackson-dataformat-cbor-2.17.2.jar + external/jackson-dataformat-cbor-2.17.2.jar - ext/jackson/jackson-datatype-jsr310-2.17.0.jar - external/jackson-datatype-jsr310-2.17.0.jar + ext/jackson/jackson-datatype-jsr310-2.17.2.jar + external/jackson-datatype-jsr310-2.17.2.jar - ext/jackson/jackson-module-jaxb-annotations-2.17.0.jar - external/jackson-module-jaxb-annotations-2.17.0.jar + ext/jackson/jackson-module-jaxb-annotations-2.17.2.jar + external/jackson-module-jaxb-annotations-2.17.2.jar diff --git a/ide/c.google.gson/external/binaries-list b/ide/c.google.gson/external/binaries-list index 26c51c83ca3e..851549697985 100644 --- a/ide/c.google.gson/external/binaries-list +++ b/ide/c.google.gson/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -8A432C1D6825781E21A02DB2E2C33C5FDE2833B9 com.google.code.gson:gson:2.8.9 +527175CA6D81050B53BDD4C457A6D6E017626B0E com.google.code.gson:gson:2.11.0 diff --git a/java/maven.indexer/external/gson-2.11.0-license.txt b/ide/c.google.gson/external/gson-2.11.0-license.txt similarity index 99% rename from java/maven.indexer/external/gson-2.11.0-license.txt rename to ide/c.google.gson/external/gson-2.11.0-license.txt index cce6b5849fd9..683468f22a25 100644 --- a/java/maven.indexer/external/gson-2.11.0-license.txt +++ b/ide/c.google.gson/external/gson-2.11.0-license.txt @@ -3,7 +3,6 @@ Description: JSon serialization/deserialization library Origin: GitHub Version: 2.11.0 License: Apache-2.0 -Source: https://github.com/google/gson Apache License Version 2.0, January 2004 diff --git a/ide/c.google.gson/external/gson-2.8.9-license.txt b/ide/c.google.gson/external/gson-2.8.9-license.txt deleted file mode 100644 index 2619e5f7cc1f..000000000000 --- a/ide/c.google.gson/external/gson-2.8.9-license.txt +++ /dev/null @@ -1,207 +0,0 @@ -Name: GSon -Description: JSon serialization/deserialization library -Origin: GitHub -Version: 2.8.9 -License: Apache-2.0 - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/ide/c.google.gson/nbproject/project.properties b/ide/c.google.gson/nbproject/project.properties index 8390fb7ebc51..b00dad9f6ed1 100644 --- a/ide/c.google.gson/nbproject/project.properties +++ b/ide/c.google.gson/nbproject/project.properties @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -release.external/gson-2.8.9.jar=modules/com-google-gson.jar +release.external/gson-2.11.0.jar=modules/com-google-gson.jar is.autoload=true javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.8 diff --git a/ide/c.google.gson/nbproject/project.xml b/ide/c.google.gson/nbproject/project.xml index c777eee166c7..4b7ad92120b1 100644 --- a/ide/c.google.gson/nbproject/project.xml +++ b/ide/c.google.gson/nbproject/project.xml @@ -28,7 +28,7 @@ com-google-gson.jar - external/gson-2.8.9.jar + external/gson-2.11.0.jar diff --git a/ide/c.google.guava/external/binaries-list b/ide/c.google.guava/external/binaries-list index fb2721be1648..bacafbfb96d9 100644 --- a/ide/c.google.guava/external/binaries-list +++ b/ide/c.google.guava/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -161BA27964A62F241533807A46B8711B13C1D94B com.google.guava:guava:33.0.0-jre +818E780DA2C66C63BBB6480FEF1F3855EEAFA3E4 com.google.guava:guava:33.2.1-jre diff --git a/ide/c.google.guava/external/guava-33.0.0-jre-license.txt b/ide/c.google.guava/external/guava-33.2.1-jre-license.txt similarity index 99% rename from ide/c.google.guava/external/guava-33.0.0-jre-license.txt rename to ide/c.google.guava/external/guava-33.2.1-jre-license.txt index fbfec6c443ee..186f7369f019 100644 --- a/ide/c.google.guava/external/guava-33.0.0-jre-license.txt +++ b/ide/c.google.guava/external/guava-33.2.1-jre-license.txt @@ -1,5 +1,5 @@ Name: Guava -Version: 33.0.0 +Version: 33.2.1 License: Apache-2.0 Origin: https://github.com/google/guava Description: Guava is a set of core libraries that includes new collection types (such as multimap and multiset), immutable collections, a graph library, and utilities for concurrency, I/O, hashing, primitives, strings, and more. diff --git a/ide/c.google.guava/nbproject/project.properties b/ide/c.google.guava/nbproject/project.properties index 75311b1e5641..ad5e7e6f3aab 100644 --- a/ide/c.google.guava/nbproject/project.properties +++ b/ide/c.google.guava/nbproject/project.properties @@ -17,6 +17,6 @@ javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.8 spec.version.base=27.18.0 -release.external/guava-33.0.0-jre.jar=modules/com-google-guava.jar +release.external/guava-33.2.1-jre.jar=modules/com-google-guava.jar is.autoload=true nbm.module.author=Tomas Stupka diff --git a/ide/c.google.guava/nbproject/project.xml b/ide/c.google.guava/nbproject/project.xml index 56e34cddfa47..f0576034930a 100644 --- a/ide/c.google.guava/nbproject/project.xml +++ b/ide/c.google.guava/nbproject/project.xml @@ -28,7 +28,7 @@ com-google-guava.jar - external/guava-33.0.0-jre.jar + external/guava-33.2.1-jre.jar diff --git a/ide/libs.commons_compress/external/binaries-list b/ide/libs.commons_compress/external/binaries-list index 6cdaeaf340c8..9653d3168f42 100644 --- a/ide/libs.commons_compress/external/binaries-list +++ b/ide/libs.commons_compress/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -44331C1130C370E726A2E1A3E6FBA6D2558EF04A org.apache.commons:commons-compress:1.26.1 +EB1F823447AF685208E684FCE84783B43517960C org.apache.commons:commons-compress:1.26.2 diff --git a/ide/libs.commons_compress/external/commons-compress-1.26.1-license.txt b/ide/libs.commons_compress/external/commons-compress-1.26.2-license.txt similarity index 99% rename from ide/libs.commons_compress/external/commons-compress-1.26.1-license.txt rename to ide/libs.commons_compress/external/commons-compress-1.26.2-license.txt index 7bd2796ce6fc..27a7b1be300f 100644 --- a/ide/libs.commons_compress/external/commons-compress-1.26.1-license.txt +++ b/ide/libs.commons_compress/external/commons-compress-1.26.2-license.txt @@ -1,5 +1,5 @@ Name: Commons Compress -Version: 1.26.1 +Version: 1.26.2 Description: The Apache Commons Compress library defines an API for working with ar, cpio, Unix dump, tar, zip, gzip, XZ, Pack200, bzip2, 7z, arj, lzma, snappy, DEFLATE, lz4, Brotli, Zstandard, DEFLATE64 and Z files. Origin: https://commons.apache.org/proper/commons-compress/index.html License: Apache-2.0 diff --git a/ide/libs.commons_compress/external/commons-compress-1.26.1-notice.txt b/ide/libs.commons_compress/external/commons-compress-1.26.2-notice.txt similarity index 100% rename from ide/libs.commons_compress/external/commons-compress-1.26.1-notice.txt rename to ide/libs.commons_compress/external/commons-compress-1.26.2-notice.txt diff --git a/ide/libs.commons_compress/nbproject/project.properties b/ide/libs.commons_compress/nbproject/project.properties index f57758c714df..e4c435cef45b 100644 --- a/ide/libs.commons_compress/nbproject/project.properties +++ b/ide/libs.commons_compress/nbproject/project.properties @@ -18,5 +18,5 @@ is.autoload=true javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.8 -release.external/commons-compress-1.26.1.jar=modules/ext/commons-compress-1.26.1.jar +release.external/commons-compress-1.26.2.jar=modules/ext/commons-compress-1.26.2.jar spec.version.base=0.31.0 diff --git a/ide/libs.commons_compress/nbproject/project.xml b/ide/libs.commons_compress/nbproject/project.xml index 578d351b36d8..ebe01df2bf98 100644 --- a/ide/libs.commons_compress/nbproject/project.xml +++ b/ide/libs.commons_compress/nbproject/project.xml @@ -45,8 +45,8 @@ org.apache.commons.compress.utils - ext/commons-compress-1.26.1.jar - external/commons-compress-1.26.1.jar + ext/commons-compress-1.26.2.jar + external/commons-compress-1.26.2.jar diff --git a/ide/libs.commons_compress/src/org/netbeans/libs/commons_compress/mf-layer.xml b/ide/libs.commons_compress/src/org/netbeans/libs/commons_compress/mf-layer.xml index a38cfb4d61d9..04a31a871cbb 100644 --- a/ide/libs.commons_compress/src/org/netbeans/libs/commons_compress/mf-layer.xml +++ b/ide/libs.commons_compress/src/org/netbeans/libs/commons_compress/mf-layer.xml @@ -27,7 +27,7 @@ - + diff --git a/ide/libs.commons_net/external/binaries-list b/ide/libs.commons_net/external/binaries-list index ea0bcdc17354..4c49eef9f17d 100644 --- a/ide/libs.commons_net/external/binaries-list +++ b/ide/libs.commons_net/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -86762EA0AC98FD41C91745A32D496A985E2BD5E7 commons-net:commons-net:3.10.0 +F0689B01D2E3EF4B316BCC87360849A22F05D06D commons-net:commons-net:3.11.1 diff --git a/ide/libs.commons_net/external/commons-net-3.10.0-license.txt b/ide/libs.commons_net/external/commons-net-3.11.1-license.txt similarity index 99% rename from ide/libs.commons_net/external/commons-net-3.10.0-license.txt rename to ide/libs.commons_net/external/commons-net-3.11.1-license.txt index bdfe0231e451..3e88a7422963 100644 --- a/ide/libs.commons_net/external/commons-net-3.10.0-license.txt +++ b/ide/libs.commons_net/external/commons-net-3.11.1-license.txt @@ -1,5 +1,5 @@ Name: Commons Net -Version: 3.10.0 +Version: 3.11.1 OSR: 3487 Description: Apache Commons Net implements the client side of many basic Internet protocols. Origin: https://commons.apache.org/proper/commons-net/index.html diff --git a/ide/libs.commons_net/external/commons-net-3.10.0-notice.txt b/ide/libs.commons_net/external/commons-net-3.11.1-notice.txt similarity index 100% rename from ide/libs.commons_net/external/commons-net-3.10.0-notice.txt rename to ide/libs.commons_net/external/commons-net-3.11.1-notice.txt diff --git a/ide/libs.commons_net/nbproject/project.properties b/ide/libs.commons_net/nbproject/project.properties index 03d7283e51ae..8e3353f7fb95 100644 --- a/ide/libs.commons_net/nbproject/project.properties +++ b/ide/libs.commons_net/nbproject/project.properties @@ -16,5 +16,5 @@ # under the License. is.autoload=true -release.external/commons-net-3.10.0.jar=modules/ext/commons-net-3.10.0.jar +release.external/commons-net-3.11.1.jar=modules/ext/commons-net-3.11.1.jar spec.version.base=2.47.0 diff --git a/ide/libs.commons_net/nbproject/project.xml b/ide/libs.commons_net/nbproject/project.xml index 94bbcafd14ee..04e99e10cf7d 100644 --- a/ide/libs.commons_net/nbproject/project.xml +++ b/ide/libs.commons_net/nbproject/project.xml @@ -31,8 +31,8 @@ org.apache.commons.net.util - ext/commons-net-3.10.0.jar - external/commons-net-3.10.0.jar + ext/commons-net-3.11.1.jar + external/commons-net-3.11.1.jar diff --git a/ide/libs.commons_net/src/org/netbeans/libs/commons_net/mf-layer.xml b/ide/libs.commons_net/src/org/netbeans/libs/commons_net/mf-layer.xml index f57759525bf8..d8a2e27811c6 100644 --- a/ide/libs.commons_net/src/org/netbeans/libs/commons_net/mf-layer.xml +++ b/ide/libs.commons_net/src/org/netbeans/libs/commons_net/mf-layer.xml @@ -27,7 +27,7 @@ - + diff --git a/ide/libs.freemarker/external/binaries-list b/ide/libs.freemarker/external/binaries-list index deb82f64d100..9d310234b841 100644 --- a/ide/libs.freemarker/external/binaries-list +++ b/ide/libs.freemarker/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -8607259125D4FBE982754227EA4F75DD513C6D19 org.freemarker:freemarker:2.3.32 +FECAEB606993FC9FD0F95FE5A644048A69C39474 org.freemarker:freemarker:2.3.33 diff --git a/ide/libs.freemarker/external/freemarker-2.3.32-license.txt b/ide/libs.freemarker/external/freemarker-2.3.33-license.txt similarity index 99% rename from ide/libs.freemarker/external/freemarker-2.3.32-license.txt rename to ide/libs.freemarker/external/freemarker-2.3.33-license.txt index fbca2b93d0aa..6030c6366bca 100644 --- a/ide/libs.freemarker/external/freemarker-2.3.32-license.txt +++ b/ide/libs.freemarker/external/freemarker-2.3.33-license.txt @@ -1,5 +1,5 @@ Name: Apache FreeMarker -Version: 2.3.32 +Version: 2.3.33 Origin: Apache Software Foundation License: Apache-2.0-freemarker Description: Template engine diff --git a/ide/libs.freemarker/external/freemarker-2.3.32-notice.txt b/ide/libs.freemarker/external/freemarker-2.3.33-notice.txt similarity index 100% rename from ide/libs.freemarker/external/freemarker-2.3.32-notice.txt rename to ide/libs.freemarker/external/freemarker-2.3.33-notice.txt diff --git a/ide/libs.freemarker/nbproject/project.properties b/ide/libs.freemarker/nbproject/project.properties index 860bd766623a..5bc2906a0b22 100644 --- a/ide/libs.freemarker/nbproject/project.properties +++ b/ide/libs.freemarker/nbproject/project.properties @@ -18,8 +18,8 @@ is.autoload=true javac.compilerargs=-Xlint:unchecked -javac.source=1.8 -release.external/freemarker-2.3.32.jar=modules/ext/freemarker-2.3.32.jar +javac.release=17 +release.external/freemarker-2.3.33.jar=modules/ext/freemarker-2.3.33.jar module.jar.verifylinkageignores=freemarker.((ext.ant.FreemarkerXmlTask)|(template.DefaultObjectWrapper)) spec.version.base=2.59.0 diff --git a/ide/libs.freemarker/nbproject/project.xml b/ide/libs.freemarker/nbproject/project.xml index ffc03f2c4869..bb440c516f3c 100644 --- a/ide/libs.freemarker/nbproject/project.xml +++ b/ide/libs.freemarker/nbproject/project.xml @@ -119,8 +119,8 @@ - ext/freemarker-2.3.32.jar - external/freemarker-2.3.32.jar + ext/freemarker-2.3.33.jar + external/freemarker-2.3.33.jar diff --git a/ide/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerEngine.java b/ide/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerEngine.java index 3c804ae32c23..5009a0e374f1 100644 --- a/ide/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerEngine.java +++ b/ide/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerEngine.java @@ -120,8 +120,8 @@ public Object eval(Reader reader, ScriptContext ctx) if (template == null) { template = new MyTemplate(fo, fileName, reader, conf); Object exceptionHandler = ctx.getAttribute(FREEMARKER_EXCEPTION_HANDLER); - if (exceptionHandler instanceof TemplateExceptionHandler) { - template.setTemplateExceptionHandler((TemplateExceptionHandler) exceptionHandler); + if (exceptionHandler instanceof TemplateExceptionHandler templateEH) { + template.setTemplateExceptionHandler(templateEH); } } else { ((MyTemplate)template).conf = conf; @@ -155,8 +155,8 @@ public Bindings createBindings() { // internals only below this point private static String getFilename(ScriptContext ctx) { Object tfo = ctx.getAttribute(FREEMARKER_TEMPLATE); - if (tfo instanceof FileObject) { - return ((FileObject)tfo).getPath(); + if (tfo instanceof FileObject fo) { + return fo.getPath(); } Object fileName = ctx.getAttribute(ScriptEngine.FILENAME); if (fileName != null) { @@ -167,11 +167,7 @@ private static String getFilename(ScriptContext ctx) { private static boolean isStringOutputMode(ScriptContext ctx) { Object flag = ctx.getAttribute(STRING_OUTPUT_MODE); - if (flag != null) { - return flag.equals(Boolean.TRUE); - } else { - return false; - } + return flag != null ? flag.equals(Boolean.TRUE) : false; } private void initFreeMarkerConfiguration(ScriptContext ctx) { @@ -180,9 +176,9 @@ private void initFreeMarkerConfiguration(ScriptContext ctx) { if (conf != null) { return; } - Object cfg = ctx.getAttribute(FREEMARKER_CONFIG); - if (cfg instanceof Configuration) { - conf = (Configuration) cfg; + Object obj = ctx.getAttribute(FREEMARKER_CONFIG); + if (obj instanceof Configuration configuration) { + conf = configuration; return; } @@ -225,8 +221,8 @@ private static void initConfProps(Configuration conf, ScriptContext ctx) { Set keys = props.keySet(); for (Object obj : keys) { String key; - if (obj instanceof String) { - key = (String) obj; + if (obj instanceof String str) { + key = str; } else { continue; } diff --git a/ide/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java b/ide/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java index 6524797b4d88..1669fca75976 100644 --- a/ide/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java +++ b/ide/libs.freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java @@ -21,8 +21,6 @@ */ package org.netbeans.libs.freemarker; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; import javax.script.ScriptEngine; import javax.script.ScriptEngineFactory; @@ -38,7 +36,7 @@ public String getEngineName() { @Override public String getEngineVersion() { - return "2.3.32"; + return "2.3.33"; } @Override @@ -53,7 +51,7 @@ public String getLanguageName() { @Override public String getLanguageVersion() { - return "2.3.32"; + return "2.3.33"; } @Override @@ -94,15 +92,9 @@ public String getOutputStatement(String toDisplay) { for (int i = 0; i < len; i++) { char ch = toDisplay.charAt(i); switch (ch) { - case '"': - buf.append("\\\""); - break; - case '\\': - buf.append("\\\\"); - break; - default: - buf.append(ch); - break; + case '"' -> buf.append("\\\""); + case '\\' -> buf.append("\\\\"); + default -> buf.append(ch); } } buf.append("\")}"); @@ -111,21 +103,15 @@ public String getOutputStatement(String toDisplay) { @Override public String getParameter(String key) { - if (key.equals(ScriptEngine.NAME)) { - return getLanguageName(); - } else if (key.equals(ScriptEngine.ENGINE)) { - return getEngineName(); - } else if (key.equals(ScriptEngine.ENGINE_VERSION)) { - return getEngineVersion(); - } else if (key.equals(ScriptEngine.LANGUAGE)) { - return getLanguageName(); - } else if (key.equals(ScriptEngine.LANGUAGE_VERSION)) { - return getLanguageVersion(); - } else if (key.equals("THREADING")) { - return "MULTITHREADED"; - } else { - return null; - } + return switch (key) { + case ScriptEngine.NAME -> getLanguageName(); + case ScriptEngine.ENGINE -> getEngineName(); + case ScriptEngine.ENGINE_VERSION -> getEngineVersion(); + case ScriptEngine.LANGUAGE -> getLanguageName(); + case ScriptEngine.LANGUAGE_VERSION -> getLanguageVersion(); + case "THREADING" -> "MULTITHREADED"; + default -> null; + }; } @Override @@ -143,20 +129,8 @@ public ScriptEngine getScriptEngine() { return new FreemarkerEngine(this); } - private static final List names; - private static final List extensions; - private static final List mimeTypes; - static { - ArrayList n = new ArrayList<>(2); - n.add("FreeMarker"); - n.add("freemarker"); - names = Collections.unmodifiableList(n); - ArrayList e = new ArrayList<>(2); - e.add("fm"); - e.add("ftl"); - extensions = Collections.unmodifiableList(e); - ArrayList m = new ArrayList<>(1); - m.add("text/x-freemarker"); - mimeTypes = Collections.unmodifiableList(m); - } + private static final List names = List.of("FreeMarker", "freemarker"); + private static final List extensions = List.of("fm", "ftl"); + private static final List mimeTypes = List.of("text/x-freemarker"); + } diff --git a/ide/libs.freemarker/src/org/netbeans/libs/freemarker/RsrcLoader.java b/ide/libs.freemarker/src/org/netbeans/libs/freemarker/RsrcLoader.java index db9cce6a9ff2..843a78e14a64 100644 --- a/ide/libs.freemarker/src/org/netbeans/libs/freemarker/RsrcLoader.java +++ b/ide/libs.freemarker/src/org/netbeans/libs/freemarker/RsrcLoader.java @@ -89,9 +89,7 @@ private FileObject getFile(String name) { if (tmp == null) { try { tmp = FileUtil.toFileObject(FileUtil.normalizeFile(Utilities.toFile(new URI(name)))); - } catch (URISyntaxException ex) { - } catch (IllegalArgumentException iae) { - } + } catch (URISyntaxException | IllegalArgumentException ignore) {} } return tmp; } diff --git a/ide/o.eclipse.jgit.gpg.bc/external/binaries-list b/ide/o.eclipse.jgit.gpg.bc/external/binaries-list index 7c18fdeb3d70..56b76abd1127 100644 --- a/ide/o.eclipse.jgit.gpg.bc/external/binaries-list +++ b/ide/o.eclipse.jgit.gpg.bc/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -BC86EE20219825813A6834D01290F50D01EB1992 org.eclipse.jgit:org.eclipse.jgit.gpg.bc:6.9.0.202403050737-r +B957A281EF7E8C6578601F6327BB12F7C5C2C17C org.eclipse.jgit:org.eclipse.jgit.gpg.bc:6.10.0.202406032230-r diff --git a/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-6.9.0.202403050737-r-license.txt b/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-6.10.0.202406032230-r-license.txt similarity index 99% rename from ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-6.9.0.202403050737-r-license.txt rename to ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-6.10.0.202406032230-r-license.txt index 8f332dbfe3aa..a9e04ec8dd7d 100644 --- a/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-6.9.0.202403050737-r-license.txt +++ b/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-6.10.0.202406032230-r-license.txt @@ -1,6 +1,6 @@ Name: JGit Library Origin: Eclipse -Version: 6.9.0.202403050737-r +Version: 6.10.0.202406032230-r Description: Integration library for Git client License: EDL-1.0-jgit URL: http://www.eclipse.org/jgit/download/ diff --git a/ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties b/ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties index 2912037e5cbd..8a3e1b3257e2 100644 --- a/ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties +++ b/ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties @@ -17,4 +17,4 @@ is.autoload=true -release.external/org.eclipse.jgit.gpg.bc-6.9.0.202403050737-r.jar=modules/org-eclipse-jgit-gpg-bc.jar +release.external/org.eclipse.jgit.gpg.bc-6.10.0.202406032230-r.jar=modules/org-eclipse-jgit-gpg-bc.jar diff --git a/ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml b/ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml index 9469bf07b522..556c829aca97 100644 --- a/ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml +++ b/ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml @@ -65,7 +65,7 @@ org-eclipse-jgit-gpg-bc.jar - external/org.eclipse.jgit.gpg.bc-6.9.0.202403050737-r.jar + external/org.eclipse.jgit.gpg.bc-6.10.0.202406032230-r.jar diff --git a/ide/o.eclipse.jgit.lfs/external/binaries-list b/ide/o.eclipse.jgit.lfs/external/binaries-list index 3c092b6b29c0..0f7c5ac56ac6 100644 --- a/ide/o.eclipse.jgit.lfs/external/binaries-list +++ b/ide/o.eclipse.jgit.lfs/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -334BD6230555DD1EB8ABD00FF4D704274E66F2FD org.eclipse.jgit:org.eclipse.jgit.lfs:6.9.0.202403050737-r +10F9FEEBA165C96C899B0181A1ECA7AE18B7DA81 org.eclipse.jgit:org.eclipse.jgit.lfs:6.10.0.202406032230-r diff --git a/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-6.9.0.202403050737-r-license.txt b/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-6.10.0.202406032230-r-license.txt similarity index 99% rename from ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-6.9.0.202403050737-r-license.txt rename to ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-6.10.0.202406032230-r-license.txt index 8f332dbfe3aa..a9e04ec8dd7d 100644 --- a/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-6.9.0.202403050737-r-license.txt +++ b/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-6.10.0.202406032230-r-license.txt @@ -1,6 +1,6 @@ Name: JGit Library Origin: Eclipse -Version: 6.9.0.202403050737-r +Version: 6.10.0.202406032230-r Description: Integration library for Git client License: EDL-1.0-jgit URL: http://www.eclipse.org/jgit/download/ diff --git a/ide/o.eclipse.jgit.lfs/nbproject/project.properties b/ide/o.eclipse.jgit.lfs/nbproject/project.properties index 66693e8480bf..e3c10a2ead9b 100644 --- a/ide/o.eclipse.jgit.lfs/nbproject/project.properties +++ b/ide/o.eclipse.jgit.lfs/nbproject/project.properties @@ -17,4 +17,4 @@ is.autoload=true -release.external/org.eclipse.jgit.lfs-6.9.0.202403050737-r.jar=modules/org-eclipse-jgit-lfs.jar +release.external/org.eclipse.jgit.lfs-6.10.0.202406032230-r.jar=modules/org-eclipse-jgit-lfs.jar diff --git a/ide/o.eclipse.jgit.lfs/nbproject/project.xml b/ide/o.eclipse.jgit.lfs/nbproject/project.xml index 41b70fe89796..89fd17b3a6bc 100644 --- a/ide/o.eclipse.jgit.lfs/nbproject/project.xml +++ b/ide/o.eclipse.jgit.lfs/nbproject/project.xml @@ -60,7 +60,7 @@ org-eclipse-jgit-lfs.jar - external/org.eclipse.jgit.lfs-6.9.0.202403050737-r.jar + external/org.eclipse.jgit.lfs-6.10.0.202406032230-r.jar diff --git a/ide/o.eclipse.jgit.ssh.jsch/external/binaries-list b/ide/o.eclipse.jgit.ssh.jsch/external/binaries-list index 16cd3e0d8441..78f338052ff9 100644 --- a/ide/o.eclipse.jgit.ssh.jsch/external/binaries-list +++ b/ide/o.eclipse.jgit.ssh.jsch/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -75E642C3FB1D054B2C3B39BF32578EC4DFDA816E org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:6.9.0.202403050737-r +B6A43BB49E2BD61F5BB0A1DBAE1D8F7883B2BA9D org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:6.10.0.202406032230-r diff --git a/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-6.9.0.202403050737-r-license.txt b/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-6.10.0.202406032230-r-license.txt similarity index 99% rename from ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-6.9.0.202403050737-r-license.txt rename to ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-6.10.0.202406032230-r-license.txt index 8f332dbfe3aa..a9e04ec8dd7d 100644 --- a/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-6.9.0.202403050737-r-license.txt +++ b/ide/o.eclipse.jgit.ssh.jsch/external/org.eclipse.jgit.ssh.jsch-6.10.0.202406032230-r-license.txt @@ -1,6 +1,6 @@ Name: JGit Library Origin: Eclipse -Version: 6.9.0.202403050737-r +Version: 6.10.0.202406032230-r Description: Integration library for Git client License: EDL-1.0-jgit URL: http://www.eclipse.org/jgit/download/ diff --git a/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.properties b/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.properties index 18545f522899..a27cd0e0cbc0 100644 --- a/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.properties +++ b/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.properties @@ -17,4 +17,4 @@ is.autoload=true -release.external/org.eclipse.jgit.ssh.jsch-6.9.0.202403050737-r.jar=modules/org-eclipse-jgit-ssh-jsch.jar +release.external/org.eclipse.jgit.ssh.jsch-6.10.0.202406032230-r.jar=modules/org-eclipse-jgit-ssh-jsch.jar diff --git a/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.xml b/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.xml index 84a76c7ee0ab..761515bf2097 100644 --- a/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.xml +++ b/ide/o.eclipse.jgit.ssh.jsch/nbproject/project.xml @@ -54,7 +54,7 @@ org-eclipse-jgit-ssh-jsch.jar - external/org.eclipse.jgit.ssh.jsch-6.9.0.202403050737-r.jar + external/org.eclipse.jgit.ssh.jsch-6.10.0.202406032230-r.jar diff --git a/ide/o.eclipse.jgit/external/binaries-list b/ide/o.eclipse.jgit/external/binaries-list index 28249eeb0978..17b8c009e7a4 100644 --- a/ide/o.eclipse.jgit/external/binaries-list +++ b/ide/o.eclipse.jgit/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -E4DA064611794C35CBF80A720A3F813285D5CCBA org.eclipse.jgit:org.eclipse.jgit:6.9.0.202403050737-r +E1166B8B313939890F29A5C611614B67E396B07E org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r diff --git a/ide/o.eclipse.jgit/external/org.eclipse.jgit-6.9.0.202403050737-r-license.txt b/ide/o.eclipse.jgit/external/org.eclipse.jgit-6.10.0.202406032230-r-license.txt similarity index 99% rename from ide/o.eclipse.jgit/external/org.eclipse.jgit-6.9.0.202403050737-r-license.txt rename to ide/o.eclipse.jgit/external/org.eclipse.jgit-6.10.0.202406032230-r-license.txt index 8f332dbfe3aa..a9e04ec8dd7d 100644 --- a/ide/o.eclipse.jgit/external/org.eclipse.jgit-6.9.0.202403050737-r-license.txt +++ b/ide/o.eclipse.jgit/external/org.eclipse.jgit-6.10.0.202406032230-r-license.txt @@ -1,6 +1,6 @@ Name: JGit Library Origin: Eclipse -Version: 6.9.0.202403050737-r +Version: 6.10.0.202406032230-r Description: Integration library for Git client License: EDL-1.0-jgit URL: http://www.eclipse.org/jgit/download/ diff --git a/ide/o.eclipse.jgit/nbproject/project.properties b/ide/o.eclipse.jgit/nbproject/project.properties index 0b02fbdae0fe..99a7a099b627 100644 --- a/ide/o.eclipse.jgit/nbproject/project.properties +++ b/ide/o.eclipse.jgit/nbproject/project.properties @@ -17,4 +17,4 @@ is.autoload=true -release.external/org.eclipse.jgit-6.9.0.202403050737-r.jar=modules/org-eclipse-jgit.jar +release.external/org.eclipse.jgit-6.10.0.202406032230-r.jar=modules/org-eclipse-jgit.jar diff --git a/ide/o.eclipse.jgit/nbproject/project.xml b/ide/o.eclipse.jgit/nbproject/project.xml index a1c1321b97ef..ddc48797cf81 100644 --- a/ide/o.eclipse.jgit/nbproject/project.xml +++ b/ide/o.eclipse.jgit/nbproject/project.xml @@ -52,7 +52,7 @@ org-eclipse-jgit.jar - external/org.eclipse.jgit-6.9.0.202403050737-r.jar + external/org.eclipse.jgit-6.10.0.202406032230-r.jar diff --git a/java/maven.indexer/external/binaries-list b/java/maven.indexer/external/binaries-list index bfde38daa870..3bf16d031787 100644 --- a/java/maven.indexer/external/binaries-list +++ b/java/maven.indexer/external/binaries-list @@ -14,13 +14,12 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -6B6780786C8FBF64FE4C809BBAC2CE4FD5D996C4 org.apache.maven.indexer:indexer-core:7.1.3 -7AB214FA5A675719E011F514939E52C010F049F6 org.apache.maven.indexer:search-api:7.1.3 -58A364CECD56F04A55D2F0C932DF879C7168C4C3 org.apache.maven.indexer:search-backend-smo:7.1.3 -2E487755A6814B2A1BC770C26569DCBA86873DCF org.apache.lucene:lucene-core:9.11.0 -DB385446BC3FD70E7C6A744276C0A157BD60EE0A org.apache.lucene:lucene-backward-codecs:9.11.0 -44ACCDC03C5482E602718F7BF91E5940BA4E4870 org.apache.lucene:lucene-highlighter:9.11.0 -E97FE1C0D102EDB8D6E1C01454992FD2B8D80AE0 org.apache.lucene:lucene-queryparser:9.11.0 -75A0A333CF1E043102743066C929E65FE51CBCDA org.apache.lucene:lucene-analysis-common:9.11.0 +7016F3B87E39E3C83B656C7C65E04C578127B266 org.apache.maven.indexer:indexer-core:7.1.4 +A4C838B4FF86F0327DA4715F9F8D2AA1D6C51633 org.apache.maven.indexer:search-api:7.1.4 +9D55FF1A2CCE7988615CF56ED69702C2C7FA5031 org.apache.maven.indexer:search-backend-smo:7.1.4 +8F52BA14B21774F41CE33CF5CA111CBDEFEED7F9 org.apache.lucene:lucene-core:9.11.1 +948FDA53CEEB0FA1B835AF5376ABEC771B2C3FB1 org.apache.lucene:lucene-backward-codecs:9.11.1 +E16CC9C531998A76EB5528147B5F07596F95FAD8 org.apache.lucene:lucene-highlighter:9.11.1 +AD6E5B135E1E284D4462D717086CE13A3CE01B4A org.apache.lucene:lucene-queryparser:9.11.1 +51286ACA019DB66311F71496191B4BD7ADAF3DCF org.apache.lucene:lucene-analysis-common:9.11.1 934C04D3CFEF185A8008E7BF34331B79730A9D43 javax.annotation:javax.annotation-api:1.3.2 -527175CA6D81050B53BDD4C457A6D6E017626B0E com.google.code.gson:gson:2.11.0 diff --git a/java/maven.indexer/external/indexer-core-7.1.3-license.txt b/java/maven.indexer/external/indexer-core-7.1.4-license.txt similarity index 99% rename from java/maven.indexer/external/indexer-core-7.1.3-license.txt rename to java/maven.indexer/external/indexer-core-7.1.4-license.txt index fe17e6a79b8f..c7f3b0812e67 100644 --- a/java/maven.indexer/external/indexer-core-7.1.3-license.txt +++ b/java/maven.indexer/external/indexer-core-7.1.4-license.txt @@ -1,11 +1,11 @@ Name: Maven Indexer Description: Maven remote repository indexing engine. -Version: 7.1.3 +Version: 7.1.4 Origin: Apache Software Foundation License: Apache-2.0 URL: https://repo.maven.apache.org/maven2/org/apache/maven/indexer/ Source: https://github.com/apache/maven-indexer -Files: indexer-core-7.1.3.jar search-api-7.1.3.jar search-backend-smo-7.1.3.jar +Files: indexer-core-7.1.4.jar search-api-7.1.4.jar search-backend-smo-7.1.4.jar Apache License Version 2.0, January 2004 diff --git a/java/maven.indexer/external/indexer-core-7.1.3-notice.txt b/java/maven.indexer/external/indexer-core-7.1.4-notice.txt similarity index 100% rename from java/maven.indexer/external/indexer-core-7.1.3-notice.txt rename to java/maven.indexer/external/indexer-core-7.1.4-notice.txt diff --git a/java/maven.indexer/external/lucene-9.11.0-license.txt b/java/maven.indexer/external/lucene-9.11.1-license.txt similarity index 99% rename from java/maven.indexer/external/lucene-9.11.0-license.txt rename to java/maven.indexer/external/lucene-9.11.1-license.txt index 6373bf4d691b..dc7a9bf3f2cf 100644 --- a/java/maven.indexer/external/lucene-9.11.0-license.txt +++ b/java/maven.indexer/external/lucene-9.11.1-license.txt @@ -1,11 +1,11 @@ Name: Apache Lucene Description: Java-based indexing and search technology -Version: 9.11.0 +Version: 9.11.1 Origin: Apache Software Foundation License: Apache-2.0-lucene2 URL: https://lucene.apache.org/ Source: https://github.com/apache/lucene -Files: lucene-analysis-common-9.11.0.jar lucene-backward-codecs-9.11.0.jar lucene-core-9.11.0.jar lucene-highlighter-9.11.0.jar lucene-queryparser-9.11.0.jar +Files: lucene-analysis-common-9.11.1.jar lucene-backward-codecs-9.11.1.jar lucene-core-9.11.1.jar lucene-highlighter-9.11.1.jar lucene-queryparser-9.11.1.jar Apache License Version 2.0, January 2004 diff --git a/java/maven.indexer/external/lucene-9.11.0-notice.txt b/java/maven.indexer/external/lucene-9.11.1-notice.txt similarity index 100% rename from java/maven.indexer/external/lucene-9.11.0-notice.txt rename to java/maven.indexer/external/lucene-9.11.1-notice.txt diff --git a/java/maven.indexer/nbproject/project.properties b/java/maven.indexer/nbproject/project.properties index d84d52c6e8a0..a2f27ce3d229 100644 --- a/java/maven.indexer/nbproject/project.properties +++ b/java/maven.indexer/nbproject/project.properties @@ -19,15 +19,14 @@ test.config.stableBTD.includes=**/*Test.class is.autoload=true javac.release=11 javac.compilerargs=-Xlint -Xlint:-serial -release.external/indexer-core-7.1.3.jar=modules/ext/maven/indexer-core-7.1.3.jar -release.external/search-api-7.1.3.jar=modules/ext/maven/search-api-7.1.3.jar -release.external/search-backend-smo-7.1.3.jar=modules/ext/maven/search-backend-smo-7.1.3.jar -release.external/gson-2.11.0.jar=modules/ext/maven/gson-2.11.0.jar -release.external/lucene-core-9.11.0.jar=modules/ext/maven/lucene-core-9.11.0.jar -release.external/lucene-backward-codecs-9.11.0.jar=modules/ext/maven/lucene-backward-codecs-9.11.0.jar -release.external/lucene-highlighter-9.11.0.jar=modules/ext/maven/lucene-highlighter-9.11.0.jar -release.external/lucene-queryparser-9.11.0.jar=modules/ext/maven/lucene-queryparser-9.11.0.jar -release.external/lucene-analysis-common-9.11.0.jar=modules/ext/maven/lucene-analysis-common-9.11.0.jar +release.external/indexer-core-7.1.4.jar=modules/ext/maven/indexer-core-7.1.4.jar +release.external/search-api-7.1.4.jar=modules/ext/maven/search-api-7.1.4.jar +release.external/search-backend-smo-7.1.4.jar=modules/ext/maven/search-backend-smo-7.1.4.jar +release.external/lucene-core-9.11.1.jar=modules/ext/maven/lucene-core-9.11.1.jar +release.external/lucene-backward-codecs-9.11.1.jar=modules/ext/maven/lucene-backward-codecs-9.11.1.jar +release.external/lucene-highlighter-9.11.1.jar=modules/ext/maven/lucene-highlighter-9.11.1.jar +release.external/lucene-queryparser-9.11.1.jar=modules/ext/maven/lucene-queryparser-9.11.1.jar +release.external/lucene-analysis-common-9.11.1.jar=modules/ext/maven/lucene-analysis-common-9.11.1.jar release.external/javax.annotation-api-1.3.2.jar=modules/ext/maven/javax.annotation-api-1.3.2.jar # XXX so long as Lucene is bundled here: sigtest.gen.fail.on.error=false diff --git a/java/maven.indexer/nbproject/project.xml b/java/maven.indexer/nbproject/project.xml index 29b8f32128b2..34b285a36fd0 100644 --- a/java/maven.indexer/nbproject/project.xml +++ b/java/maven.indexer/nbproject/project.xml @@ -25,6 +25,10 @@ org.netbeans.modules.maven.indexer + + com.google.gson + + org.netbeans.api.annotations.common @@ -176,45 +180,41 @@ org.netbeans.modules.maven.indexer.spi.impl - ext/maven/indexer-core-7.1.3.jar - external/indexer-core-7.1.3.jar + ext/maven/indexer-core-7.1.4.jar + external/indexer-core-7.1.4.jar - ext/maven/search-api-7.1.3.jar - external/search-api-7.1.3.jar + ext/maven/search-api-7.1.4.jar + external/search-api-7.1.4.jar - ext/maven/search-backend-smo-7.1.3.jar - external/search-backend-smo-7.1.3.jar + ext/maven/search-backend-smo-7.1.4.jar + external/search-backend-smo-7.1.4.jar - ext/maven/lucene-core-9.11.0.jar - external/lucene-core-9.11.0.jar + ext/maven/lucene-core-9.11.1.jar + external/lucene-core-9.11.1.jar - ext/maven/lucene-backward-codecs-9.11.0.jar - external/lucene-backward-codecs-9.11.0.jar + ext/maven/lucene-backward-codecs-9.11.1.jar + external/lucene-backward-codecs-9.11.1.jar - ext/maven/lucene-highlighter-9.11.0.jar - external/lucene-highlighter-9.11.0.jar + ext/maven/lucene-highlighter-9.11.1.jar + external/lucene-highlighter-9.11.1.jar - ext/maven/lucene-queryparser-9.11.0.jar - external/lucene-queryparser-9.11.0.jar + ext/maven/lucene-queryparser-9.11.1.jar + external/lucene-queryparser-9.11.1.jar - ext/maven/lucene-analysis-common-9.11.0.jar - external/lucene-analysis-common-9.11.0.jar + ext/maven/lucene-analysis-common-9.11.1.jar + external/lucene-analysis-common-9.11.1.jar ext/maven/javax.annotation-api-1.3.2.jar external/javax.annotation-api-1.3.2.jar - - ext/maven/gson-2.11.0.jar - external/gson-2.11.0.jar - diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps index 87d480f3d3a3..00e9127a9f09 100644 --- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps +++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps @@ -26,6 +26,7 @@ ide/db.sql.visualeditor/external/javacc-7.0.10.jar java/performance/external/jav java/maven.embedder/external/apache-maven-3.9.8-bin.zip ide/slf4j.api/external/slf4j-api-1.7.36.jar java/maven.embedder/external/apache-maven-3.9.8-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.16.1.jar java/maven.embedder/external/apache-maven-3.9.8-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.2.jar +java/maven.embedder/external/apache-maven-3.9.8-bin.zip ide/c.google.guava/external/guava-33.2.1-jre.jar java/maven.embedder/external/apache-maven-3.9.8-bin.zip java/maven.indexer/external/javax.annotation-api-1.3.2.jar # Used to parse data during build, but need to as a lib for ide cluster @@ -53,16 +54,16 @@ enterprise/websvc.restlib/external/osgi.core-8.0.0.jar platform/libs.osgi/extern extide/gradle/external/gradle-7.4-bin.zip enterprise/libs.amazon/external/ion-java-1.0.2.jar extide/gradle/external/gradle-7.4-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.2.jar extide/gradle/external/gradle-7.4-bin.zip ide/c.jcraft.jzlib/external/jzlib-1.1.3.jar -extide/gradle/external/gradle-7.4-bin.zip ide/libs.commons_compress/external/commons-compress-1.26.1.jar +extide/gradle/external/gradle-7.4-bin.zip ide/libs.commons_compress/external/commons-compress-1.26.2.jar extide/gradle/external/gradle-7.4-bin.zip ide/o.apache.commons.lang/external/commons-lang-2.6.jar -extide/gradle/external/gradle-7.4-bin.zip ide/o.eclipse.jgit/external/org.eclipse.jgit-5.7.0.202003110725-r.jar +extide/gradle/external/gradle-7.4-bin.zip ide/o.eclipse.jgit/external/org.eclipse.jgit-6.10.0.202406032230-r.jar extide/gradle/external/gradle-7.4-bin.zip java/debugger.jpda.truffle/external/antlr4-runtime-4.7.2.jar extide/gradle/external/gradle-7.4-bin.zip java/maven.embedder/external/apache-maven-3.9.8-bin.zip extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/hamcrest-core-1.3.jar extide/gradle/external/gradle-7.4-bin.zip platform/libs.junit4/external/junit-4.13.2.jar extide/gradle/external/gradle-7.4-bin.zip platform/libs.testng/external/jcommander-1.78.jar extide/gradle/external/gradle-7.4-bin.zip enterprise/cloud.oracle/external/httpclient-4.5.13.jar -extide/gradle/external/gradle-7.4-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.16.1.jar +extide/gradle/external/gradle-7.4-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.17.0.jar extide/gradle/external/gradle-7.4-bin.zip platform/libs.batik.read/external/xml-apis-1.4.01.jar # These are the endorsed version of the javaee apis and create libraries, so they are better kept separate diff --git a/platform/junitlib/external/binaries-list b/platform/junitlib/external/binaries-list index 5e11f55b2410..93937706bfba 100644 --- a/platform/junitlib/external/binaries-list +++ b/platform/junitlib/external/binaries-list @@ -16,9 +16,9 @@ # under the License. 33987872A811FE4D4001ED494B07854822257F42 junit:junit:4.13.2:sources F2F3F384DACD2ADE2DDF7AA7E0F4360DFEE38672 junit:junit:4.13.2:javadoc -B281DBB5921CE56B37B6E07A2502F663CA6C8DB6 org.junit.jupiter:junit-jupiter-api:5.10.2:sources -6B1A9F9714E17D9FE9D55BF74F05F802F3833C2B org.junit.jupiter:junit-jupiter-api:5.10.2:javadoc -1ADD8E4310A408675F46EAE8ACAFE6B2B72232E5 org.junit.jupiter:junit-jupiter-params:5.10.2:sources -1884958A4A9A9CB99F55D406072CF51348CA764C org.junit.jupiter:junit-jupiter-params:5.10.2:javadoc -624F71A8D76185F2AC8D234C686BBDAB0BD28AE0 org.junit.jupiter:junit-jupiter-engine:5.10.2:sources -10135E653002732D0D2F952190EE47DC008A42EE org.junit.jupiter:junit-jupiter-engine:5.10.2:javadoc \ No newline at end of file +64C385E8817F225ED6BBF6179856DF66DC338815 org.junit.jupiter:junit-jupiter-api:5.10.3:sources +D24094F7517EABAB7654600923381E3824FC9638 org.junit.jupiter:junit-jupiter-api:5.10.3:javadoc +1C01AC91F54B36643ABB411041ABDF27C3AAD8E7 org.junit.jupiter:junit-jupiter-params:5.10.3:sources +8FDCA2E86F8D6D496FA6E348F010AA121AAE2F37 org.junit.jupiter:junit-jupiter-params:5.10.3:javadoc +698D1CF97A3400805F030D8C1E546960641C078C org.junit.jupiter:junit-jupiter-engine:5.10.3:sources +2390CB89CE1511A27187B1351E283D9389B81EAD org.junit.jupiter:junit-jupiter-engine:5.10.3:javadoc \ No newline at end of file diff --git a/platform/junitlib/external/junit-jupiter-api-5.10.2-license.txt b/platform/junitlib/external/junit-jupiter-api-5.10.3-license.txt similarity index 99% rename from platform/junitlib/external/junit-jupiter-api-5.10.2-license.txt rename to platform/junitlib/external/junit-jupiter-api-5.10.3-license.txt index 4a4c52576e52..32a4e4e0c49d 100644 --- a/platform/junitlib/external/junit-jupiter-api-5.10.2-license.txt +++ b/platform/junitlib/external/junit-jupiter-api-5.10.3-license.txt @@ -1,9 +1,9 @@ Name: JUnit Jupiter API -Version: 5.10.2 +Version: 5.10.3 License: EPL-v20 Description: JUnit Jupiter API Origin: JUnit -Files: junit-jupiter-api-5.10.2-sources.jar junit-jupiter-api-5.10.2-javadoc.jar +Files: junit-jupiter-api-5.10.3-sources.jar junit-jupiter-api-5.10.3-javadoc.jar Eclipse Public License - v 2.0 diff --git a/platform/junitlib/external/junit-jupiter-engine-5.10.2-license.txt b/platform/junitlib/external/junit-jupiter-engine-5.10.3-license.txt similarity index 99% rename from platform/junitlib/external/junit-jupiter-engine-5.10.2-license.txt rename to platform/junitlib/external/junit-jupiter-engine-5.10.3-license.txt index aaebe89cc31d..0bae4d9a70e4 100644 --- a/platform/junitlib/external/junit-jupiter-engine-5.10.2-license.txt +++ b/platform/junitlib/external/junit-jupiter-engine-5.10.3-license.txt @@ -1,9 +1,9 @@ Name: JUnit Jupiter Engine -Version: 5.10.2 +Version: 5.10.3 License: EPL-v20 Description: JUnit Jupiter Engine Origin: JUnit -Files: junit-jupiter-engine-5.10.2-sources.jar junit-jupiter-engine-5.10.2-javadoc.jar +Files: junit-jupiter-engine-5.10.3-sources.jar junit-jupiter-engine-5.10.3-javadoc.jar Eclipse Public License - v 2.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. diff --git a/platform/junitlib/external/junit-jupiter-params-5.10.2-license.txt b/platform/junitlib/external/junit-jupiter-params-5.10.3-license.txt similarity index 99% rename from platform/junitlib/external/junit-jupiter-params-5.10.2-license.txt rename to platform/junitlib/external/junit-jupiter-params-5.10.3-license.txt index fd0907b17071..f5b7ef3580b7 100644 --- a/platform/junitlib/external/junit-jupiter-params-5.10.2-license.txt +++ b/platform/junitlib/external/junit-jupiter-params-5.10.3-license.txt @@ -1,9 +1,9 @@ Name: JUnit Jupiter Params -Version: 5.10.2 +Version: 5.10.3 License: EPL-v20 Description: JUnit Jupiter Params Origin: JUnit -Files: junit-jupiter-params-5.10.2-sources.jar junit-jupiter-params-5.10.2-javadoc.jar +Files: junit-jupiter-params-5.10.3-sources.jar junit-jupiter-params-5.10.3-javadoc.jar Eclipse Public License - v 2.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. diff --git a/platform/junitlib/nbproject/project.properties b/platform/junitlib/nbproject/project.properties index b5f1a0aea9af..c8192f07c093 100644 --- a/platform/junitlib/nbproject/project.properties +++ b/platform/junitlib/nbproject/project.properties @@ -19,20 +19,20 @@ javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial release.external/junit-4.13.2-sources.jar=docs/junit-4.13.2-sources.jar release.external/junit-4.13.2-javadoc.jar=docs/junit-4.13.2-javadoc.jar -release.external/junit-jupiter-api-5.10.2-sources.jar=docs/junit-jupiter-api-5.10.2-sources.jar -release.external/junit-jupiter-api-5.10.2-javadoc.jar=docs/junit-jupiter-api-5.10.2-javadoc.jar -release.external/junit-jupiter-params-5.10.2-sources.jar=docs/junit-jupiter-params-5.10.2-sources.jar -release.external/junit-jupiter-params-5.10.2-javadoc.jar=docs/junit-jupiter-params-5.10.2-javadoc.jar -release.external/junit-jupiter-engine-5.10.2-sources.jar=docs/junit-jupiter-engine-5.10.2-sources.jar -release.external/junit-jupiter-engine-5.10.2-javadoc.jar=docs/junit-jupiter-engine-5.10.2-javadoc.jar +release.external/junit-jupiter-api-5.10.3-sources.jar=docs/junit-jupiter-api-5.10.3-sources.jar +release.external/junit-jupiter-api-5.10.3-javadoc.jar=docs/junit-jupiter-api-5.10.3-javadoc.jar +release.external/junit-jupiter-params-5.10.3-sources.jar=docs/junit-jupiter-params-5.10.3-sources.jar +release.external/junit-jupiter-params-5.10.3-javadoc.jar=docs/junit-jupiter-params-5.10.3-javadoc.jar +release.external/junit-jupiter-engine-5.10.3-sources.jar=docs/junit-jupiter-engine-5.10.3-sources.jar +release.external/junit-jupiter-engine-5.10.3-javadoc.jar=docs/junit-jupiter-engine-5.10.3-javadoc.jar nbm.target.cluster=java nbm.is.global=false jnlp.indirect.jars=\ docs/junit-4.13.2-sources.jar,\ docs/junit-4.13.2-javadoc.jar,\ - docs/junit-jupiter-api-5.10.2-sources.jar,\ - docs/junit-jupiter-api-5.10.2-javadoc.jar,\ - docs/junit-jupiter-params-5.10.2-sources.jar,\ - docs/junit-jupiter-params-5.10.2-javadoc.jar,\ - docs/junit-jupiter-engine-5.10.2-sources.jar,\ - docs/junit-jupiter-engine-5.10.2-javadoc.jar + docs/junit-jupiter-api-5.10.3-sources.jar,\ + docs/junit-jupiter-api-5.10.3-javadoc.jar,\ + docs/junit-jupiter-params-5.10.3-sources.jar,\ + docs/junit-jupiter-params-5.10.3-javadoc.jar,\ + docs/junit-jupiter-engine-5.10.3-sources.jar,\ + docs/junit-jupiter-engine-5.10.3-javadoc.jar diff --git a/platform/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties b/platform/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties index abc11404ef70..7daa7be848fa 100644 --- a/platform/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties +++ b/platform/junitlib/src/org/netbeans/modules/junitlib/Bundle.properties @@ -20,5 +20,5 @@ OpenIDE-Module-Short-Description=Bundles the JUnit testing library. OpenIDE-Module-Long-Description=\ Includes the JUnit unit testing library and corresponding library definition. Versions 4.x/5.x are included. junit_4=JUnit 4.13.2 -junit_5=JUnit 5.10.2 +junit_5=JUnit 5.10.3 hamcrest=Hamcrest 1.3 diff --git a/platform/junitlib/src/org/netbeans/modules/junitlib/junit_5.xml b/platform/junitlib/src/org/netbeans/modules/junitlib/junit_5.xml index f28c25dfbf24..57853921529b 100644 --- a/platform/junitlib/src/org/netbeans/modules/junitlib/junit_5.xml +++ b/platform/junitlib/src/org/netbeans/modules/junitlib/junit_5.xml @@ -25,29 +25,29 @@ org.netbeans.modules.junitlib.Bundle classpath - jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-api-5.10.2.jar!/ - jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-params-5.10.2.jar!/ - jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-engine-5.10.2.jar!/ + jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-api-5.10.3.jar!/ + jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-params-5.10.3.jar!/ + jar:nbinst://org.netbeans.libs.junit5/modules/ext/junit-jupiter-engine-5.10.3.jar!/ javadoc - jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-api-5.10.2-javadoc.jar!/ - jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-params-5.10.2-javadoc.jar!/ - jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-engine-5.10.2-javadoc.jar!/ + jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-api-5.10.3-javadoc.jar!/ + jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-params-5.10.3-javadoc.jar!/ + jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-engine-5.10.3-javadoc.jar!/ src - jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-api-5.10.2-sources.jar!/ - jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-params-5.10.2-sources.jar!/ - jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-engine-5.10.2-sources.jar!/ + jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-api-5.10.3-sources.jar!/ + jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-params-5.10.3-sources.jar!/ + jar:nbinst://org.netbeans.modules.junitlib/docs/junit-jupiter-engine-5.10.3-sources.jar!/ maven-dependencies - org.junit.jupiter:junit-jupiter-api:5.10.2:jar - org.junit.jupiter:junit-jupiter-params:5.10.2:jar - org.junit.jupiter:junit-jupiter-engine:5.10.2:jar + org.junit.jupiter:junit-jupiter-api:5.10.3:jar + org.junit.jupiter:junit-jupiter-params:5.10.3:jar + org.junit.jupiter:junit-jupiter-engine:5.10.3:jar diff --git a/platform/libs.junit5/external/binaries-list b/platform/libs.junit5/external/binaries-list index 214aeb34cb48..e65c0f4984e7 100644 --- a/platform/libs.junit5/external/binaries-list +++ b/platform/libs.junit5/external/binaries-list @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -FB55D6E2BCE173F35FD28422E7975539621055EF org.junit.jupiter:junit-jupiter-api:5.10.2 -359132C82A9D3FA87A325DB6EDD33B5FDC67A3D8 org.junit.jupiter:junit-jupiter-params:5.10.2 -F1F8FE97BD58E85569205F071274D459C2C4F8CD org.junit.jupiter:junit-jupiter-engine:5.10.2 +A22AA91D1D6C69B2020A9AEB6D095EA81132BFA5 org.junit.jupiter:junit-jupiter-api:5.10.3 +4852F4E4AF9074D9214213B199751F99EFEAB8B9 org.junit.jupiter:junit-jupiter-params:5.10.3 +48C14E866BB1A87CA35D24FF068463BB202ADA24 org.junit.jupiter:junit-jupiter-engine:5.10.3 diff --git a/platform/libs.junit5/external/junit-jupiter-5.10.2-license.txt b/platform/libs.junit5/external/junit-jupiter-5.10.3-license.txt similarity index 99% rename from platform/libs.junit5/external/junit-jupiter-5.10.2-license.txt rename to platform/libs.junit5/external/junit-jupiter-5.10.3-license.txt index e2756b7b215b..d1c886534f2d 100644 --- a/platform/libs.junit5/external/junit-jupiter-5.10.2-license.txt +++ b/platform/libs.junit5/external/junit-jupiter-5.10.3-license.txt @@ -1,10 +1,10 @@ Name: JUnit Jupiter -Version: 5.10.2 -Files: junit-jupiter-api-5.10.2.jar junit-jupiter-params-5.10.2.jar junit-jupiter-engine-5.10.2.jar +Version: 5.10.3 +Files: junit-jupiter-api-5.10.3.jar junit-jupiter-params-5.10.3.jar junit-jupiter-engine-5.10.3.jar License: EPL-v20 Description: JUnit Jupiter Origin: JUnit -URL: https://search.maven.org/search?q=g:org.junit.jupiter%20AND%20v:5.10.2 +URL: https://search.maven.org/search?q=g:org.junit.jupiter%20AND%20v:5.10.3 Eclipse Public License - v 2.0 THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. diff --git a/platform/libs.junit5/nbproject/project.properties b/platform/libs.junit5/nbproject/project.properties index 9625476820f7..550a40fdeac1 100644 --- a/platform/libs.junit5/nbproject/project.properties +++ b/platform/libs.junit5/nbproject/project.properties @@ -16,9 +16,9 @@ # under the License. is.autoload=true -release.external/junit-jupiter-api-5.10.2.jar=modules/ext/junit-jupiter-api-5.10.2.jar -release.external/junit-jupiter-params-5.10.2.jar=modules/ext/junit-jupiter-params-5.10.2.jar -release.external/junit-jupiter-engine-5.10.2.jar=modules/ext/junit-jupiter-engine-5.10.2.jar +release.external/junit-jupiter-api-5.10.3.jar=modules/ext/junit-jupiter-api-5.10.3.jar +release.external/junit-jupiter-params-5.10.3.jar=modules/ext/junit-jupiter-params-5.10.3.jar +release.external/junit-jupiter-engine-5.10.3.jar=modules/ext/junit-jupiter-engine-5.10.3.jar nbm.target.cluster=platform sigtest.skip.check=true sigtest.fail.on.error=false diff --git a/platform/libs.junit5/nbproject/project.xml b/platform/libs.junit5/nbproject/project.xml index 6da355a91d22..e8194d6d1e71 100644 --- a/platform/libs.junit5/nbproject/project.xml +++ b/platform/libs.junit5/nbproject/project.xml @@ -43,16 +43,16 @@ org.junit.jupiter.engine.script - ext/junit-jupiter-api-5.10.2.jar - external/junit-jupiter-api-5.10.2.jar + ext/junit-jupiter-api-5.10.3.jar + external/junit-jupiter-api-5.10.3.jar - ext/junit-jupiter-params-5.10.2.jar - external/junit-jupiter-params-5.10.2.jar + ext/junit-jupiter-params-5.10.3.jar + external/junit-jupiter-params-5.10.3.jar - ext/junit-jupiter-engine-5.10.2.jar - external/junit-jupiter-engine-5.10.2.jar + ext/junit-jupiter-engine-5.10.3.jar + external/junit-jupiter-engine-5.10.3.jar diff --git a/platform/o.apache.commons.codec/build.xml b/platform/o.apache.commons.codec/build.xml index 80fab1b71079..9015d071cca8 100644 --- a/platform/o.apache.commons.codec/build.xml +++ b/platform/o.apache.commons.codec/build.xml @@ -22,13 +22,13 @@ - + - + - - + + diff --git a/platform/o.apache.commons.codec/external/binaries-list b/platform/o.apache.commons.codec/external/binaries-list index 8ea76c8c8bf4..f22d53f6ccf4 100644 --- a/platform/o.apache.commons.codec/external/binaries-list +++ b/platform/o.apache.commons.codec/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -47BD4D333FBA53406F6C6C51884DDBCA435C8862 commons-codec:commons-codec:1.16.1 +0DBE8EEF6E14460E73DA07F7B11BF994D6626355 commons-codec:commons-codec:1.17.0 diff --git a/platform/o.apache.commons.codec/external/commons-codec-1.16.1-license.txt b/platform/o.apache.commons.codec/external/commons-codec-1.17.0-license.txt similarity index 99% rename from platform/o.apache.commons.codec/external/commons-codec-1.16.1-license.txt rename to platform/o.apache.commons.codec/external/commons-codec-1.17.0-license.txt index a078057ab2fd..955633fa4d92 100644 --- a/platform/o.apache.commons.codec/external/commons-codec-1.16.1-license.txt +++ b/platform/o.apache.commons.codec/external/commons-codec-1.17.0-license.txt @@ -1,7 +1,7 @@ Name: Apache Commons Codec Description: General encoding/decoding algorithms (for example phonetic, base64, URL). Origin: https://commons.apache.org/proper/commons-codec/ -Version: 1.16.1 +Version: 1.17.0 License: Apache-2.0 Apache License diff --git a/platform/o.apache.commons.codec/external/commons-codec-1.16.1-notice.txt b/platform/o.apache.commons.codec/external/commons-codec-1.17.0-notice.txt similarity index 100% rename from platform/o.apache.commons.codec/external/commons-codec-1.16.1-notice.txt rename to platform/o.apache.commons.codec/external/commons-codec-1.17.0-notice.txt diff --git a/platform/o.apache.commons.codec/nbproject/project.xml b/platform/o.apache.commons.codec/nbproject/project.xml index 8458596d70e2..894b9e5b9450 100644 --- a/platform/o.apache.commons.codec/nbproject/project.xml +++ b/platform/o.apache.commons.codec/nbproject/project.xml @@ -28,7 +28,7 @@ org-apache-commons-codec.jar - external/commons-codec-1.16.1.jar + external/commons-codec-1.17.0.jar diff --git a/platform/o.apache.commons.commons_io/external/binaries-list b/platform/o.apache.commons.commons_io/external/binaries-list index d1f8238274d7..c97b1f7a66be 100644 --- a/platform/o.apache.commons.commons_io/external/binaries-list +++ b/platform/o.apache.commons.commons_io/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -27875A7935F1DDCC13267EB6FAE1F719E0409572 commons-io:commons-io:2.16.0 +377D592E740DC77124E0901291DBFAA6810A200E commons-io:commons-io:2.16.1 diff --git a/platform/o.apache.commons.commons_io/external/commons-io-2.16.0-license.txt b/platform/o.apache.commons.commons_io/external/commons-io-2.16.1-license.txt similarity index 99% rename from platform/o.apache.commons.commons_io/external/commons-io-2.16.0-license.txt rename to platform/o.apache.commons.commons_io/external/commons-io-2.16.1-license.txt index 2278c502f08d..92962a2eaae5 100644 --- a/platform/o.apache.commons.commons_io/external/commons-io-2.16.0-license.txt +++ b/platform/o.apache.commons.commons_io/external/commons-io-2.16.1-license.txt @@ -1,7 +1,7 @@ Name: Apache Commons IO Description: Assist with developing IO functionality Origin: Apache Software Foundation -Version: 2.16.0 +Version: 2.16.1 License: Apache-2.0 URL: https://commons.apache.org/proper/commons-io/ diff --git a/platform/o.apache.commons.commons_io/external/commons-io-2.16.0-notice.txt b/platform/o.apache.commons.commons_io/external/commons-io-2.16.1-notice.txt similarity index 100% rename from platform/o.apache.commons.commons_io/external/commons-io-2.16.0-notice.txt rename to platform/o.apache.commons.commons_io/external/commons-io-2.16.1-notice.txt diff --git a/platform/o.apache.commons.commons_io/nbproject/project.properties b/platform/o.apache.commons.commons_io/nbproject/project.properties index 919205842b22..c85dac5a27f2 100644 --- a/platform/o.apache.commons.commons_io/nbproject/project.properties +++ b/platform/o.apache.commons.commons_io/nbproject/project.properties @@ -16,7 +16,7 @@ # under the License. javac.compilerargs=-Xlint -Xlint:-serial javac.source=1.8 -release.external/commons-io-2.16.0.jar=modules/ext/commons-io-2.16.0.jar +release.external/commons-io-2.16.1.jar=modules/ext/commons-io-2.16.1.jar is.autoload=true nbm.module.author=Tomas Stupka #generics related sig validation failure diff --git a/platform/o.apache.commons.commons_io/nbproject/project.xml b/platform/o.apache.commons.commons_io/nbproject/project.xml index 034ecc161d68..00a248952f64 100644 --- a/platform/o.apache.commons.commons_io/nbproject/project.xml +++ b/platform/o.apache.commons.commons_io/nbproject/project.xml @@ -58,8 +58,8 @@ org.apache.commons.io.serialization - ext/commons-io-2.16.0.jar - external/commons-io-2.16.0.jar + ext/commons-io-2.16.1.jar + external/commons-io-2.16.1.jar diff --git a/platform/o.apache.commons.logging/build.xml b/platform/o.apache.commons.logging/build.xml index 0dd558349d1f..fcb4f3848be0 100644 --- a/platform/o.apache.commons.logging/build.xml +++ b/platform/o.apache.commons.logging/build.xml @@ -27,9 +27,9 @@ the original commons-logging. --> - + - + - + diff --git a/platform/o.apache.commons.logging/external/binaries-list b/platform/o.apache.commons.logging/external/binaries-list index f7e57836814d..4b53016932c6 100644 --- a/platform/o.apache.commons.logging/external/binaries-list +++ b/platform/o.apache.commons.logging/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -8CFF7DC1E492911F3DD7640EBFB60D6206A1DD40 commons-logging:commons-logging:1.3.1 +580AD1A4F34876C4F964C083361DE31B3D60BE68 commons-logging:commons-logging:1.3.3 diff --git a/platform/o.apache.commons.logging/external/commons-logging-1.3.1-license.txt b/platform/o.apache.commons.logging/external/commons-logging-1.3.3-license.txt similarity index 99% rename from platform/o.apache.commons.logging/external/commons-logging-1.3.1-license.txt rename to platform/o.apache.commons.logging/external/commons-logging-1.3.3-license.txt index 9f33aab7f4f8..f2dec05d88b4 100644 --- a/platform/o.apache.commons.logging/external/commons-logging-1.3.1-license.txt +++ b/platform/o.apache.commons.logging/external/commons-logging-1.3.3-license.txt @@ -1,6 +1,6 @@ Name: Apache Jakarta Commons Logging Origin: Apache Software Foundation -Version: 1.3.1 +Version: 1.3.3 License: Apache-2.0 Description: Logging component URL: https://commons.apache.org/proper/commons-logging/ diff --git a/platform/o.apache.commons.logging/external/commons-logging-1.3.1-notice.txt b/platform/o.apache.commons.logging/external/commons-logging-1.3.3-notice.txt similarity index 100% rename from platform/o.apache.commons.logging/external/commons-logging-1.3.1-notice.txt rename to platform/o.apache.commons.logging/external/commons-logging-1.3.3-notice.txt diff --git a/platform/o.apache.commons.logging/nbproject/project.xml b/platform/o.apache.commons.logging/nbproject/project.xml index 976fa01a9e9c..b7ffc5fa11f6 100644 --- a/platform/o.apache.commons.logging/nbproject/project.xml +++ b/platform/o.apache.commons.logging/nbproject/project.xml @@ -28,7 +28,7 @@ org-apache-commons-logging.jar - external/commons-logging-1.3.1.jar + external/commons-logging-1.3.3.jar