Merge pull request #109 from lahodaj/upgrade-failureaccess-1.0.2

Upgrade of failureaccess (component of Guava)

Author: Achal1607

build.xml

@@ -31,7 +31,7 @@
     <property name="nbplatform.default.harness.dir" location="${nbplatform.default.netbeans.dest.dir}/harness" />
     <property name="nbantext.jar" location="netbeans/nbbuild/build/nbantext.jar" />
     <property name="nb_all" location="netbeans" />
-    <property name="patches" value="patches/6133.diff patches/6330.diff patches/6481.diff patches/6615.diff patches/6631.diff patches/6637.diff patches/6642.diff patches/6649.diff patches/6690.diff patches/6771.diff patches/6329.diff patches/6742.diff patches/6780.diff patches/6834.diff patches/upgrade-codec.diff patches/mvn-sh.diff patches/rename-debugger.diff" />
+    <property name="patches" value="patches/6133.diff patches/6330.diff patches/6481.diff patches/6615.diff patches/6631.diff patches/6637.diff patches/6642.diff patches/6649.diff patches/6690.diff patches/6771.diff patches/6329.diff patches/6742.diff patches/6780.diff patches/6834.diff patches/upgrade-codec.diff patches/7001.diff patches/mvn-sh.diff patches/rename-debugger.diff" />
     <condition property="cmd.suffix" value=".cmd" else="">
         <os family="windows"/>
     </condition>

patches/7001.diff

@@ -0,0 +1,312 @@
+diff --git a/ide/c.google.guava.failureaccess/external/binaries-list b/ide/c.google.guava.failureaccess/external/binaries-list
+index c71c3937fb..f4ff27670b 100644
+--- a/ide/c.google.guava.failureaccess/external/binaries-list
++++ b/ide/c.google.guava.failureaccess/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.
+-1DCF1DE382A0BF95A3D8B0849546C88BAC1292C9 com.google.guava:failureaccess:1.0.1
++C4A06A64E650562F30B7BF9AAEC1BFED43ACA12B com.google.guava:failureaccess:1.0.2
+diff --git a/ide/c.google.guava.failureaccess/external/failureaccess-1.0.1-license.txt b/ide/c.google.guava.failureaccess/external/failureaccess-1.0.2-license.txt
+similarity index 99%
+rename from ide/c.google.guava.failureaccess/external/failureaccess-1.0.1-license.txt
+rename to ide/c.google.guava.failureaccess/external/failureaccess-1.0.2-license.txt
+index 8db246aa2b..0c948ba081 100644
+--- a/ide/c.google.guava.failureaccess/external/failureaccess-1.0.1-license.txt
++++ b/ide/c.google.guava.failureaccess/external/failureaccess-1.0.2-license.txt
+@@ -1,5 +1,5 @@
+ Name: Guava - Failure Access Library
+-Version: 1.0.1
++Version: 1.0.2
+ License: Apache-2.0
+ Origin: https://github.com/google/guava
+ Description: A Guava subproject
+diff --git a/ide/c.google.guava.failureaccess/nbproject/project.properties b/ide/c.google.guava.failureaccess/nbproject/project.properties
+index 2b0193d616..68cfb5ce83 100644
+--- a/ide/c.google.guava.failureaccess/nbproject/project.properties
++++ b/ide/c.google.guava.failureaccess/nbproject/project.properties
+@@ -16,7 +16,7 @@
+ # under the License.
+ javac.compilerargs=-Xlint -Xlint:-serial
+ javac.source=1.8
+-spec.version.base=1.0.1
+-release.external/failureaccess-1.0.1.jar=modules/com-google-guava-failureaccess.jar
++spec.version.base=1.3.0
++release.external/failureaccess-1.0.2.jar=modules/com-google-guava-failureaccess.jar
+ is.autoload=true
+ nbm.module.author=Tomas Stupka
+diff --git a/ide/c.google.guava.failureaccess/nbproject/project.xml b/ide/c.google.guava.failureaccess/nbproject/project.xml
+index 358696d3e2..9284279c26 100644
+--- a/ide/c.google.guava.failureaccess/nbproject/project.xml
++++ b/ide/c.google.guava.failureaccess/nbproject/project.xml
+@@ -28,7 +28,7 @@
+            <public-packages/>
+            <class-path-extension>
+                <runtime-relative-path>com-google-guava-failureaccess.jar</runtime-relative-path>
+-               <binary-origin>external/failureaccess-1.0.1.jar</binary-origin>
++               <binary-origin>external/failureaccess-1.0.2.jar</binary-origin>
+             </class-path-extension>
+         </data>
+     </configuration>
+diff --git a/java/maven.embedder/build.xml b/java/maven.embedder/build.xml
+index 1cf5537607..9dd89c01e7 100644
+--- a/java/maven.embedder/build.xml
++++ b/java/maven.embedder/build.xml
+@@ -25,7 +25,9 @@
+         <mkdir dir="${cluster}/maven"/>
+         <unzip src="external/${bundled.maven}-bin.zip" dest="${cluster}/maven">
+             <mapper type="glob" from="${bundled.maven}/*" to="*"/>
+-        </unzip>                
++        </unzip>
++        <delete file="${cluster}/maven/lib/failureaccess-1.0.1.jar" />
++        <copy file="external/failureaccess-1.0.2.jar" todir="${cluster}/maven/lib/" />
+     </target>
+     <target name="check-binariesembedded-list">
+         <taskdef name="checkjarssha1" classname="org.netbeans.nbbuild.extlibs.CheckEmbeddedBinaries" classpath="${nbantext.jar}"/>
+diff --git a/java/maven.embedder/external/binaries-list b/java/maven.embedder/external/binaries-list
+index 6000cd52f3..a8a108b397 100644
+--- a/java/maven.embedder/external/binaries-list
++++ b/java/maven.embedder/external/binaries-list
+@@ -17,3 +17,4 @@
+ DC15DFF8F701B227EE523EEB7A17F77C10EAFE2F org.jdom:jdom2:2.0.6.1
+ 5D9CE6ADD7B714B8095F0E3E396C5E9F8C5DCFEF org.apache.maven.shared:maven-dependency-tree:2.2
+ 448660E65018FF4354574800D0EFA831C7F5F469 org.apache.maven:apache-maven:3.9.5:bin@zip
++C4A06A64E650562F30B7BF9AAEC1BFED43ACA12B com.google.guava:failureaccess:1.0.2
+diff --git a/java/maven.embedder/external/failureaccess-1.0.2-license.txt b/java/maven.embedder/external/failureaccess-1.0.2-license.txt
+new file mode 100644
+index 0000000000..0c948ba081
+--- /dev/null
++++ b/java/maven.embedder/external/failureaccess-1.0.2-license.txt
+@@ -0,0 +1,208 @@
++Name: Guava - Failure Access Library
++Version: 1.0.2
++License: Apache-2.0
++Origin: https://github.com/google/guava
++Description: A Guava subproject
++
++
++                                 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/java/maven.embedder/nbproject/project.xml b/java/maven.embedder/nbproject/project.xml
+index a2020eb4a6..d90f63543c 100644
+--- a/java/maven.embedder/nbproject/project.xml
++++ b/java/maven.embedder/nbproject/project.xml
+@@ -305,7 +305,7 @@
+                 <runtime-relative-path>../maven/lib/commons-lang3-3.12.0.jar</runtime-relative-path>
+             </class-path-extension>
+             <class-path-extension>
+-                <runtime-relative-path>../maven/lib/failureaccess-1.0.1.jar</runtime-relative-path>
++                <runtime-relative-path>../maven/lib/failureaccess-1.0.2.jar</runtime-relative-path>
+             </class-path-extension>
+             <class-path-extension>
+                 <runtime-relative-path>../maven/lib/guava-32.0.1-jre.jar</runtime-relative-path>
+diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+index eb4b13b21b..09df2c1194 100644
+--- a/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
++++ b/nbbuild/antsrc/org/netbeans/nbbuild/extlibs/ignored-overlaps
+@@ -28,4 +28,4 @@ ide/db.sql.visualeditor/external/javacc-7.0.10.jar java/performance/external/jav
+-java/maven.embedder/external/apache-maven-3.9.5-bin.zip ide/c.google.guava.failureaccess/external/failureaccess-1.0.1.jar
++java/maven.embedder/external/failureaccess-1.0.2.jar ide/c.google.guava.failureaccess/external/failureaccess-1.0.2.jar
+ 
+ # Used to parse data during build, but need to as a lib for ide cluster
+ nbbuild/external/json-simple-1.1.1.jar ide/libs.json_simple/external/json-simple-1.1.1.jar