|
| 1 | +diff --git a/java/maven.embedder/build.xml b/java/maven.embedder/build.xml |
| 2 | +index 1cf553760703..9dd89c01e769 100644 |
| 3 | +--- a/java/maven.embedder/build.xml |
| 4 | ++++ b/java/maven.embedder/build.xml |
| 5 | +@@ -25,7 +25,9 @@ |
| 6 | + <mkdir dir="${cluster}/maven"/> |
| 7 | + <unzip src="external/${bundled.maven}-bin.zip" dest="${cluster}/maven"> |
| 8 | + <mapper type="glob" from="${bundled.maven}/*" to="*"/> |
| 9 | +- </unzip> |
| 10 | ++ </unzip> |
| 11 | ++ <delete file="${cluster}/maven/lib/failureaccess-1.0.1.jar" /> |
| 12 | ++ <copy file="external/failureaccess-1.0.2.jar" todir="${cluster}/maven/lib/" /> |
| 13 | + </target> |
| 14 | + <target name="check-binariesembedded-list"> |
| 15 | + <taskdef name="checkjarssha1" classname="org.netbeans.nbbuild.extlibs.CheckEmbeddedBinaries" classpath="${nbantext.jar}"/> |
| 16 | +diff --git a/java/maven.embedder/external/binaries-list b/java/maven.embedder/external/binaries-list |
| 17 | +index 94e918c9a5f8..c62571b895cb 100644 |
| 18 | +--- a/java/maven.embedder/external/binaries-list |
| 19 | ++++ b/java/maven.embedder/external/binaries-list |
| 20 | +@@ -17,3 +17,4 @@ |
| 21 | + DC15DFF8F701B227EE523EEB7A17F77C10EAFE2F org.jdom:jdom2:2.0.6.1 |
| 22 | + 5D9CE6ADD7B714B8095F0E3E396C5E9F8C5DCFEF org.apache.maven.shared:maven-dependency-tree:2.2 |
| 23 | + FC5C01A07E4A2DDF84AF0DFADF382E6F7993462D org.apache.maven:apache-maven:3.9.6:bin@zip |
| 24 | ++C4A06A64E650562F30B7BF9AAEC1BFED43ACA12B com.google.guava:failureaccess:1.0.2 |
| 25 | +diff --git a/java/maven.embedder/external/failureaccess-1.0.2-license.txt b/java/maven.embedder/external/failureaccess-1.0.2-license.txt |
| 26 | +new file mode 100644 |
| 27 | +index 000000000000..0c948ba081a4 |
| 28 | +--- /dev/null |
| 29 | ++++ b/java/maven.embedder/external/failureaccess-1.0.2-license.txt |
| 30 | +@@ -0,0 +1,208 @@ |
| 31 | ++Name: Guava - Failure Access Library |
| 32 | ++Version: 1.0.2 |
| 33 | ++License: Apache-2.0 |
| 34 | ++Origin: https://github.com/google/guava |
| 35 | ++Description: A Guava subproject |
| 36 | ++ |
| 37 | ++ |
| 38 | ++ Apache License |
| 39 | ++ Version 2.0, January 2004 |
| 40 | ++ http://www.apache.org/licenses/ |
| 41 | ++ |
| 42 | ++ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION |
| 43 | ++ |
| 44 | ++ 1. Definitions. |
| 45 | ++ |
| 46 | ++ "License" shall mean the terms and conditions for use, reproduction, |
| 47 | ++ and distribution as defined by Sections 1 through 9 of this document. |
| 48 | ++ |
| 49 | ++ "Licensor" shall mean the copyright owner or entity authorized by |
| 50 | ++ the copyright owner that is granting the License. |
| 51 | ++ |
| 52 | ++ "Legal Entity" shall mean the union of the acting entity and all |
| 53 | ++ other entities that control, are controlled by, or are under common |
| 54 | ++ control with that entity. For the purposes of this definition, |
| 55 | ++ "control" means (i) the power, direct or indirect, to cause the |
| 56 | ++ direction or management of such entity, whether by contract or |
| 57 | ++ otherwise, or (ii) ownership of fifty percent (50%) or more of the |
| 58 | ++ outstanding shares, or (iii) beneficial ownership of such entity. |
| 59 | ++ |
| 60 | ++ "You" (or "Your") shall mean an individual or Legal Entity |
| 61 | ++ exercising permissions granted by this License. |
| 62 | ++ |
| 63 | ++ "Source" form shall mean the preferred form for making modifications, |
| 64 | ++ including but not limited to software source code, documentation |
| 65 | ++ source, and configuration files. |
| 66 | ++ |
| 67 | ++ "Object" form shall mean any form resulting from mechanical |
| 68 | ++ transformation or translation of a Source form, including but |
| 69 | ++ not limited to compiled object code, generated documentation, |
| 70 | ++ and conversions to other media types. |
| 71 | ++ |
| 72 | ++ "Work" shall mean the work of authorship, whether in Source or |
| 73 | ++ Object form, made available under the License, as indicated by a |
| 74 | ++ copyright notice that is included in or attached to the work |
| 75 | ++ (an example is provided in the Appendix below). |
| 76 | ++ |
| 77 | ++ "Derivative Works" shall mean any work, whether in Source or Object |
| 78 | ++ form, that is based on (or derived from) the Work and for which the |
| 79 | ++ editorial revisions, annotations, elaborations, or other modifications |
| 80 | ++ represent, as a whole, an original work of authorship. For the purposes |
| 81 | ++ of this License, Derivative Works shall not include works that remain |
| 82 | ++ separable from, or merely link (or bind by name) to the interfaces of, |
| 83 | ++ the Work and Derivative Works thereof. |
| 84 | ++ |
| 85 | ++ "Contribution" shall mean any work of authorship, including |
| 86 | ++ the original version of the Work and any modifications or additions |
| 87 | ++ to that Work or Derivative Works thereof, that is intentionally |
| 88 | ++ submitted to Licensor for inclusion in the Work by the copyright owner |
| 89 | ++ or by an individual or Legal Entity authorized to submit on behalf of |
| 90 | ++ the copyright owner. For the purposes of this definition, "submitted" |
| 91 | ++ means any form of electronic, verbal, or written communication sent |
| 92 | ++ to the Licensor or its representatives, including but not limited to |
| 93 | ++ communication on electronic mailing lists, source code control systems, |
| 94 | ++ and issue tracking systems that are managed by, or on behalf of, the |
| 95 | ++ Licensor for the purpose of discussing and improving the Work, but |
| 96 | ++ excluding communication that is conspicuously marked or otherwise |
| 97 | ++ designated in writing by the copyright owner as "Not a Contribution." |
| 98 | ++ |
| 99 | ++ "Contributor" shall mean Licensor and any individual or Legal Entity |
| 100 | ++ on behalf of whom a Contribution has been received by Licensor and |
| 101 | ++ subsequently incorporated within the Work. |
| 102 | ++ |
| 103 | ++ 2. Grant of Copyright License. Subject to the terms and conditions of |
| 104 | ++ this License, each Contributor hereby grants to You a perpetual, |
| 105 | ++ worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
| 106 | ++ copyright license to reproduce, prepare Derivative Works of, |
| 107 | ++ publicly display, publicly perform, sublicense, and distribute the |
| 108 | ++ Work and such Derivative Works in Source or Object form. |
| 109 | ++ |
| 110 | ++ 3. Grant of Patent License. Subject to the terms and conditions of |
| 111 | ++ this License, each Contributor hereby grants to You a perpetual, |
| 112 | ++ worldwide, non-exclusive, no-charge, royalty-free, irrevocable |
| 113 | ++ (except as stated in this section) patent license to make, have made, |
| 114 | ++ use, offer to sell, sell, import, and otherwise transfer the Work, |
| 115 | ++ where such license applies only to those patent claims licensable |
| 116 | ++ by such Contributor that are necessarily infringed by their |
| 117 | ++ Contribution(s) alone or by combination of their Contribution(s) |
| 118 | ++ with the Work to which such Contribution(s) was submitted. If You |
| 119 | ++ institute patent litigation against any entity (including a |
| 120 | ++ cross-claim or counterclaim in a lawsuit) alleging that the Work |
| 121 | ++ or a Contribution incorporated within the Work constitutes direct |
| 122 | ++ or contributory patent infringement, then any patent licenses |
| 123 | ++ granted to You under this License for that Work shall terminate |
| 124 | ++ as of the date such litigation is filed. |
| 125 | ++ |
| 126 | ++ 4. Redistribution. You may reproduce and distribute copies of the |
| 127 | ++ Work or Derivative Works thereof in any medium, with or without |
| 128 | ++ modifications, and in Source or Object form, provided that You |
| 129 | ++ meet the following conditions: |
| 130 | ++ |
| 131 | ++ (a) You must give any other recipients of the Work or |
| 132 | ++ Derivative Works a copy of this License; and |
| 133 | ++ |
| 134 | ++ (b) You must cause any modified files to carry prominent notices |
| 135 | ++ stating that You changed the files; and |
| 136 | ++ |
| 137 | ++ (c) You must retain, in the Source form of any Derivative Works |
| 138 | ++ that You distribute, all copyright, patent, trademark, and |
| 139 | ++ attribution notices from the Source form of the Work, |
| 140 | ++ excluding those notices that do not pertain to any part of |
| 141 | ++ the Derivative Works; and |
| 142 | ++ |
| 143 | ++ (d) If the Work includes a "NOTICE" text file as part of its |
| 144 | ++ distribution, then any Derivative Works that You distribute must |
| 145 | ++ include a readable copy of the attribution notices contained |
| 146 | ++ within such NOTICE file, excluding those notices that do not |
| 147 | ++ pertain to any part of the Derivative Works, in at least one |
| 148 | ++ of the following places: within a NOTICE text file distributed |
| 149 | ++ as part of the Derivative Works; within the Source form or |
| 150 | ++ documentation, if provided along with the Derivative Works; or, |
| 151 | ++ within a display generated by the Derivative Works, if and |
| 152 | ++ wherever such third-party notices normally appear. The contents |
| 153 | ++ of the NOTICE file are for informational purposes only and |
| 154 | ++ do not modify the License. You may add Your own attribution |
| 155 | ++ notices within Derivative Works that You distribute, alongside |
| 156 | ++ or as an addendum to the NOTICE text from the Work, provided |
| 157 | ++ that such additional attribution notices cannot be construed |
| 158 | ++ as modifying the License. |
| 159 | ++ |
| 160 | ++ You may add Your own copyright statement to Your modifications and |
| 161 | ++ may provide additional or different license terms and conditions |
| 162 | ++ for use, reproduction, or distribution of Your modifications, or |
| 163 | ++ for any such Derivative Works as a whole, provided Your use, |
| 164 | ++ reproduction, and distribution of the Work otherwise complies with |
| 165 | ++ the conditions stated in this License. |
| 166 | ++ |
| 167 | ++ 5. Submission of Contributions. Unless You explicitly state otherwise, |
| 168 | ++ any Contribution intentionally submitted for inclusion in the Work |
| 169 | ++ by You to the Licensor shall be under the terms and conditions of |
| 170 | ++ this License, without any additional terms or conditions. |
| 171 | ++ Notwithstanding the above, nothing herein shall supersede or modify |
| 172 | ++ the terms of any separate license agreement you may have executed |
| 173 | ++ with Licensor regarding such Contributions. |
| 174 | ++ |
| 175 | ++ 6. Trademarks. This License does not grant permission to use the trade |
| 176 | ++ names, trademarks, service marks, or product names of the Licensor, |
| 177 | ++ except as required for reasonable and customary use in describing the |
| 178 | ++ origin of the Work and reproducing the content of the NOTICE file. |
| 179 | ++ |
| 180 | ++ 7. Disclaimer of Warranty. Unless required by applicable law or |
| 181 | ++ agreed to in writing, Licensor provides the Work (and each |
| 182 | ++ Contributor provides its Contributions) on an "AS IS" BASIS, |
| 183 | ++ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or |
| 184 | ++ implied, including, without limitation, any warranties or conditions |
| 185 | ++ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A |
| 186 | ++ PARTICULAR PURPOSE. You are solely responsible for determining the |
| 187 | ++ appropriateness of using or redistributing the Work and assume any |
| 188 | ++ risks associated with Your exercise of permissions under this License. |
| 189 | ++ |
| 190 | ++ 8. Limitation of Liability. In no event and under no legal theory, |
| 191 | ++ whether in tort (including negligence), contract, or otherwise, |
| 192 | ++ unless required by applicable law (such as deliberate and grossly |
| 193 | ++ negligent acts) or agreed to in writing, shall any Contributor be |
| 194 | ++ liable to You for damages, including any direct, indirect, special, |
| 195 | ++ incidental, or consequential damages of any character arising as a |
| 196 | ++ result of this License or out of the use or inability to use the |
| 197 | ++ Work (including but not limited to damages for loss of goodwill, |
| 198 | ++ work stoppage, computer failure or malfunction, or any and all |
| 199 | ++ other commercial damages or losses), even if such Contributor |
| 200 | ++ has been advised of the possibility of such damages. |
| 201 | ++ |
| 202 | ++ 9. Accepting Warranty or Additional Liability. While redistributing |
| 203 | ++ the Work or Derivative Works thereof, You may choose to offer, |
| 204 | ++ and charge a fee for, acceptance of support, warranty, indemnity, |
| 205 | ++ or other liability obligations and/or rights consistent with this |
| 206 | ++ License. However, in accepting such obligations, You may act only |
| 207 | ++ on Your own behalf and on Your sole responsibility, not on behalf |
| 208 | ++ of any other Contributor, and only if You agree to indemnify, |
| 209 | ++ defend, and hold each Contributor harmless for any liability |
| 210 | ++ incurred by, or claims asserted against, such Contributor by reason |
| 211 | ++ of your accepting any such warranty or additional liability. |
| 212 | ++ |
| 213 | ++ END OF TERMS AND CONDITIONS |
| 214 | ++ |
| 215 | ++ APPENDIX: How to apply the Apache License to your work. |
| 216 | ++ |
| 217 | ++ To apply the Apache License to your work, attach the following |
| 218 | ++ boilerplate notice, with the fields enclosed by brackets "[]" |
| 219 | ++ replaced with your own identifying information. (Don't include |
| 220 | ++ the brackets!) The text should be enclosed in the appropriate |
| 221 | ++ comment syntax for the file format. We also recommend that a |
| 222 | ++ file or class name and description of purpose be included on the |
| 223 | ++ same "printed page" as the copyright notice for easier |
| 224 | ++ identification within third-party archives. |
| 225 | ++ |
| 226 | ++ Copyright [yyyy] [name of copyright owner] |
| 227 | ++ |
| 228 | ++ Licensed under the Apache License, Version 2.0 (the "License"); |
| 229 | ++ you may not use this file except in compliance with the License. |
| 230 | ++ You may obtain a copy of the License at |
| 231 | ++ |
| 232 | ++ http://www.apache.org/licenses/LICENSE-2.0 |
| 233 | ++ |
| 234 | ++ Unless required by applicable law or agreed to in writing, software |
| 235 | ++ distributed under the License is distributed on an "AS IS" BASIS, |
| 236 | ++ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 237 | ++ See the License for the specific language governing permissions and |
| 238 | ++ limitations under the License. |
| 239 | +diff --git a/java/maven.embedder/nbproject/project.xml b/java/maven.embedder/nbproject/project.xml |
| 240 | +index 8271d91403a2..69494e4f2e05 100644 |
| 241 | +--- a/java/maven.embedder/nbproject/project.xml |
| 242 | ++++ b/java/maven.embedder/nbproject/project.xml |
| 243 | +@@ -305,7 +305,7 @@ |
| 244 | + <runtime-relative-path>../maven/lib/commons-lang3-3.12.0.jar</runtime-relative-path> |
| 245 | + </class-path-extension> |
| 246 | + <class-path-extension> |
| 247 | +- <runtime-relative-path>../maven/lib/failureaccess-1.0.1.jar</runtime-relative-path> |
| 248 | ++ <runtime-relative-path>../maven/lib/failureaccess-1.0.2.jar</runtime-relative-path> |
| 249 | + </class-path-extension> |
| 250 | + <class-path-extension> |
| 251 | + <runtime-relative-path>../maven/lib/guava-32.0.1-jre.jar</runtime-relative-path> |
| 252 | +diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps |
| 253 | +index ec07902509..dd52e08038 100644 |
| 254 | +--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps |
| 255 | ++++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps |
| 256 | +@@ -26,7 +26,7 @@ ide/db.sql.visualeditor/external/javacc-7.0.10.jar java/performance/external/jav |
| 257 | + java/maven.embedder/external/apache-maven-3.9.6-bin.zip ide/slf4j.api/external/slf4j-api-1.7.36.jar |
| 258 | + java/maven.embedder/external/apache-maven-3.9.6-bin.zip platform/o.apache.commons.lang3/external/commons-lang3-3.12.0.jar |
| 259 | + java/maven.embedder/external/apache-maven-3.9.6-bin.zip platform/o.apache.commons.codec/external/commons-codec-1.16.1.jar |
| 260 | +-java/maven.embedder/external/apache-maven-3.9.6-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.2.jar |
| 261 | ++java/maven.embedder/external/failureaccess-1.0.2.jar ide/c.google.guava.failureaccess/external/failureaccess-1.0.2.jar |
| 262 | + java/maven.embedder/external/apache-maven-3.9.6-bin.zip java/maven.indexer/external/javax.annotation-api-1.3.2.jar |
| 263 | + |
| 264 | + # Used to parse data during build, but need to as a lib for ide cluster |
0 commit comments