Update jgit from 7.7.1 to 7.8.1 and BouncyCastle from 1.86 to 1.87

ide/bcpg/external/bcpg-jdk18on-1.86-license.txt → ide/bcpg/external/bcpg-jdk18on-1.87-license.txt

@@ -1,5 +1,5 @@
 Name: Bouncy Castle Java OpenPGP/BCPG
-Version: 1.86
+Version: 1.87
 License: MIT-bouncycastle
 Origin: https://www.bouncycastle.org/latest_releases.html
 Description: Legion of the Bouncy Castle Java cryptography APIs

ide/bcpg/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.
-49DFE201A89EB19D2AE4F213F481765F4E4C0D51 org.bouncycastle:bcpg-jdk18on:1.86
+2DCD32242C24B3CD8234461CE28B7CF615ABF686 org.bouncycastle:bcpg-jdk18on:1.87

ide/bcpg/nbproject/project.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-release.external/bcpg-jdk18on-1.86.jar=modules/bcpg.jar
+release.external/bcpg-jdk18on-1.87.jar=modules/bcpg.jar
 is.autoload=true

ide/bcpg/nbproject/project.xml

@@ -28,7 +28,7 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>bcpg.jar</runtime-relative-path>
-                <binary-origin>external/bcpg-jdk18on-1.86.jar</binary-origin>
+                <binary-origin>external/bcpg-jdk18on-1.87.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

ide/bcpkix/external/bcpkix-jdk18on-1.86-license.txt → ide/bcpkix/external/bcpkix-jdk18on-1.87-license.txt

@@ -1,5 +1,5 @@
 Name: Bouncy Castle Java Provider
-Version: 1.86
+Version: 1.87
 License: MIT-bouncycastle
 Origin: https://www.bouncycastle.org/latest_releases.html
 Description: Legion of the Bouncy Castle Java cryptography APIs

ide/bcpkix/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.
-FB5EA65959DB10FE5D61148BB2B77F6E231455B1 org.bouncycastle:bcpkix-jdk18on:1.86
+CE798F0DAFB058963024BBE1096F77192CF3EDD7 org.bouncycastle:bcpkix-jdk18on:1.87

ide/bcpkix/nbproject/project.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-release.external/bcpkix-jdk18on-1.86.jar=modules/bcpkix.jar
+release.external/bcpkix-jdk18on-1.87.jar=modules/bcpkix.jar
 is.autoload=true

ide/bcpkix/nbproject/project.xml

@@ -28,7 +28,7 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>bcpkix.jar</runtime-relative-path>
-                <binary-origin>external/bcpkix-jdk18on-1.86.jar</binary-origin>
+                <binary-origin>external/bcpkix-jdk18on-1.87.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

ide/bcprov/external/bcprov-jdk18on-1.86-license.txt → ide/bcprov/external/bcprov-jdk18on-1.87-license.txt

@@ -1,5 +1,5 @@
 Name: Bouncy Castle Java Provider
-Version: 1.86
+Version: 1.87
 License: MIT-bouncycastle
 Origin: https://www.bouncycastle.org/latest_releases.html
 Description: Legion of the Bouncy Castle Java cryptography APIs

ide/bcprov/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.
-830C8467BED8E4C1148262386B09FC42AEDCF262 org.bouncycastle:bcprov-jdk18on:1.86
+3CF2BBC1280A743FD3D4D7D556883C13E5D28BE5 org.bouncycastle:bcprov-jdk18on:1.87

ide/bcprov/nbproject/project.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-release.external/bcprov-jdk18on-1.86.jar=modules/bcprov.jar
+release.external/bcprov-jdk18on-1.87.jar=modules/bcprov.jar
 is.autoload=true

ide/bcprov/nbproject/project.xml

@@ -28,7 +28,7 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>bcprov.jar</runtime-relative-path>
-                <binary-origin>external/bcprov-jdk18on-1.86.jar</binary-origin>
+                <binary-origin>external/bcprov-jdk18on-1.87.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

ide/bcutil/external/bcutil-jdk18on-1.86-license.txt → ide/bcutil/external/bcutil-jdk18on-1.87-license.txt

@@ -1,5 +1,5 @@
 Name: Bouncy Castle ASN.1 Extension and Utility APIs
-Version: 1.86
+Version: 1.87
 License: MIT-bouncycastle
 Origin: https://www.bouncycastle.org/latest_releases.html
 Description: Legion of the Bouncy Castle Java cryptography APIs

ide/bcutil/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.
-2C8E77F5601C2B84C8773AF4CAF403A34DACA357 org.bouncycastle:bcutil-jdk18on:1.86
+90400832BD1C3395F354775C0A3F18BD552FCCFF org.bouncycastle:bcutil-jdk18on:1.87

ide/bcutil/nbproject/project.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-release.external/bcutil-jdk18on-1.86.jar=modules/bcutil.jar
+release.external/bcutil-jdk18on-1.87.jar=modules/bcutil.jar
 is.autoload=true

ide/bcutil/nbproject/project.xml

@@ -28,7 +28,7 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>bcutil.jar</runtime-relative-path>
-                <binary-origin>external/bcutil-jdk18on-1.86.jar</binary-origin>
+                <binary-origin>external/bcutil-jdk18on-1.87.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

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.
-48B8230771E573B54CE6E867A9001E75977FE78E com.google.code.gson:gson:2.13.2
+EFC0E34EDE4E3204EAEFB84A00E55E8C86634382 com.google.code.gson:gson:2.14.0

ide/c.google.gson/external/gson-2.13.2-license.txt → ide/c.google.gson/external/gson-2.14.0-license.txt

@@ -1,7 +1,7 @@
 Name: GSon
 Description: JSon serialization/deserialization library
 Origin: GitHub
-Version: 2.13.2
+Version: 2.14.0
 License: Apache-2.0
 
                                  Apache License

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.13.2.jar=modules/com-google-gson.jar
+release.external/gson-2.14.0.jar=modules/com-google-gson.jar
 is.autoload=true
 javac.compilerargs=-Xlint -Xlint:-serial
 javac.release=8

ide/c.google.gson/nbproject/project.xml

@@ -28,7 +28,7 @@
            <public-packages/>
            <class-path-extension>
                <runtime-relative-path>com-google-gson.jar</runtime-relative-path>
-               <binary-origin>external/gson-2.13.2.jar</binary-origin>
+               <binary-origin>external/gson-2.14.0.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

ide/libs.git/src/org/netbeans/libs/git/jgit/commands/CherryPickCommand.java

@@ -45,6 +45,7 @@
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.lib.RepositoryState;
+import org.eclipse.jgit.merge.MergeAttributes;
 import org.eclipse.jgit.merge.RecursiveMerger;
 import org.eclipse.jgit.merge.ResolveMerger;
 import org.eclipse.jgit.merge.StrategyRecursive;
@@ -412,7 +413,6 @@ private List<RebaseTodoLine> readTodoFile (Repository repository) throws IOExcep
         return Collections.<RebaseTodoLine>emptyList();
     }
 
-    private static final Attributes NO_ATTRIBUTES = new Attributes();
     private class FailuresDetectRecursiveStrategy extends StrategyRecursive {
 
         @Override
@@ -430,16 +430,9 @@ protected boolean mergeTreeWalk (TreeWalk treeWalk, boolean ignoreConflicts)
                     boolean hasWorkingTreeIterator = tw.getTreeCount() > T_FILE;
                     boolean hasAttributeNodeProvider = treeWalk.getAttributesNodeProvider() != null;
                     while (treeWalk.next()) {
-                        Attributes[] attributes = hasAttributeNodeProvider ?
-                                new Attributes[] {
-                                    treeWalk.getAttributes(T_BASE),
-                                    treeWalk.getAttributes(T_OURS),
-                                    treeWalk.getAttributes(T_THEIRS)
-                                } : new Attributes[] {
-                                    NO_ATTRIBUTES,
-                                    NO_ATTRIBUTES,
-                                    NO_ATTRIBUTES
-                                };
+                        MergeAttributes attributes = hasAttributeNodeProvider
+                                ? new TreeWalkAttributes(treeWalk)
+                                : MergeAttributes.NO_ATTRIBUTES;
                         if (!processEntry(
                                 treeWalk.getTree(T_BASE, CanonicalTreeParser.class),
                                 treeWalk.getTree(T_OURS, CanonicalTreeParser.class),
@@ -459,6 +452,21 @@ protected boolean mergeTreeWalk (TreeWalk treeWalk, boolean ignoreConflicts)
                     }
                     return ok;
                 }
+
+                private record TreeWalkAttributes(TreeWalk walk) implements MergeAttributes {
+                    @Override
+                    public Attributes base() {
+                        return walk.getAttributes(T_BASE);
+                    }
+                    @Override
+                    public Attributes ours() {
+                        return walk.getAttributes(T_OURS);
+                    }
+                    @Override
+                    public Attributes theirs() {
+                        return walk.getAttributes(T_THEIRS);
+                    }
+                }
             };
         }
     }

ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/LogTest.java

@@ -27,6 +27,7 @@
 import org.eclipse.jgit.lib.PersonIdent;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevSort;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.eclipse.jgit.revwalk.filter.AndRevFilter;
 import org.eclipse.jgit.revwalk.filter.MessageRevFilter;
@@ -69,6 +70,41 @@ public void testMaxApplicationFlagCount() throws Exception {
         assertEquals(LogCommand.MAX_REVWALK_FLAGS, available); // if this fails, adjust the value
     }
 
+    // jgit 7.8.0's TopoSortPendingGenerator consumed 4 application flags per
+    // TOPO walk (and did not release them on reset()); it was reverted in
+    // 7.8.1 (f00dbb27e "StartGenerator: Revert back to TopoSortGenerator").
+    // This is a tripwire to detect the re-introduction of flag-consuming
+    // TOPO generators: if this fails, re-check LogCommand.MAX_REVWALK_FLAGS
+    // and browsing the history of big repositories (many branches).
+    public void testTopoSortDoesNotConsumeApplicationFlags() throws Exception {
+        File f = new File(workDir, "testtopoflags");
+        write(f, "initial content");
+        File[] files = new File[]{f};
+        add(files);
+        GitClient client = getClient(workDir);
+        client.commit(files, "commit1", null, null, NULL_PROGRESS_MONITOR);
+        write(f, "modification");
+        add(files);
+        GitRevisionInfo revision2 = client.commit(files, "commit2", null, null, NULL_PROGRESS_MONITOR);
+
+        try (RevWalk walk = new RevWalk(repository)) {
+            walk.sort(RevSort.TOPO);
+            walk.markStart(walk.parseCommit(repository.resolve(revision2.getRevision())));
+            while (walk.next() != null) {
+                // ignore
+            }
+            int remaining = 0;
+            try {
+                while (walk.newFlag("FLAG" + remaining) != null) { //NOI18N
+                    remaining++;
+                }
+            } catch (IllegalArgumentException ex) {
+                // all flags allocated
+            }
+            assertEquals(LogCommand.MAX_REVWALK_FLAGS, remaining); // if this fails, the walk consumed flags
+        }
+    }
+
     public void testLogRevision() throws Exception {
         File f = new File(workDir, "testcat1");
         write(f, "initial content");

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.
-7B7F4B37FCB236A74B422EB9D9F16080EF874031 org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.7.1.202607240634-r
+50165D682847443921FD1A4A63066C5C6EC6C31C org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.8.1.202611041320-r

ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.8.1.202611041320-r-license.txt

@@ -0,0 +1,93 @@
+Name: JGit GPG Bouncy Castle
+Origin: Eclipse
+Version: 7.8.1.202611041320-r
+Description: Integration library for Git client
+License: EDL-1.0-jgit
+URL: http://www.eclipse.org/jgit/download/
+
+Eclipse Distribution License - v 1.0
+
+Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+    * Neither the name of the Eclipse Foundation, Inc. nor the names of its
+      contributors may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+SHA-1 UbcCheck - MIT
+
+Copyright (c) 2017:
+
+Marc Stevens
+Cryptology Group
+Centrum Wiskunde & Informatica
+P.O. Box 94079, 1090 GB Amsterdam, Netherlands
+marc@marc-stevens.nl
+
+
+Dan Shumow
+Microsoft Research
+danshu@microsoft.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+org.eclipse.jgit.gpg.bc.internal.keys.SExprParser - MIT
+
+Copyright (c) 2000-2021 The Legion of the Bouncy Castle Inc.
+(https://www.bouncycastle.org)
+
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+
+The above copyright notice and this permission notice shall be included in all copies or substantial
+portions of the Software.
+
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.

ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties

@@ -17,4 +17,4 @@
 
 is.autoload=true
 
-release.external/org.eclipse.jgit.gpg.bc-7.7.1.202607240634-r.jar=modules/org-eclipse-jgit-gpg-bc.jar
+release.external/org.eclipse.jgit.gpg.bc-7.8.1.202611041320-r.jar=modules/org-eclipse-jgit-gpg-bc.jar

ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml

@@ -65,7 +65,7 @@
             <public-packages/>
             <class-path-extension>
                 <runtime-relative-path>org-eclipse-jgit-gpg-bc.jar</runtime-relative-path>
-                <binary-origin>external/org.eclipse.jgit.gpg.bc-7.7.1.202607240634-r.jar</binary-origin>
+                <binary-origin>external/org.eclipse.jgit.gpg.bc-7.8.1.202611041320-r.jar</binary-origin>
             </class-path-extension>
         </data>
     </configuration>

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.
-A4D43B42B99A92559D8A54348EA2BE9DE69469BB org.eclipse.jgit:org.eclipse.jgit.lfs:7.7.1.202607240634-r
+E0C6BFEC8EFB739476F9C9684E36F4C583439435 org.eclipse.jgit:org.eclipse.jgit.lfs:7.8.1.202611041320-r

ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.7.1.202607240634-r-license.txt → ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.8.1.202611041320-r-license.txt

@@ -1,6 +1,6 @@
-Name: JGit Library
+Name: JGit LFS
 Origin: Eclipse
-Version: 7.7.1.202607240634-r
+Version: 7.8.1.202611041320-r
 Description: Integration library for Git client
 License: EDL-1.0-jgit
 URL: http://www.eclipse.org/jgit/download/

ide/o.eclipse.jgit.lfs/nbproject/project.properties

@@ -17,4 +17,4 @@
 
 is.autoload=true
 
-release.external/org.eclipse.jgit.lfs-7.7.1.202607240634-r.jar=modules/org-eclipse-jgit-lfs.jar
+release.external/org.eclipse.jgit.lfs-7.8.1.202611041320-r.jar=modules/org-eclipse-jgit-lfs.jar