diff --git a/ide/bcpg/external/bcpg-jdk18on-1.86-license.txt b/ide/bcpg/external/bcpg-jdk18on-1.87-license.txt
similarity index 98%
rename from ide/bcpg/external/bcpg-jdk18on-1.86-license.txt
rename to ide/bcpg/external/bcpg-jdk18on-1.87-license.txt
index ff9eeb634988..7e5e0569faef 100644
--- a/ide/bcpg/external/bcpg-jdk18on-1.86-license.txt
+++ b/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
diff --git a/ide/bcpg/external/binaries-list b/ide/bcpg/external/binaries-list
index d08e46e79631..41ea2cc2ff87 100644
--- a/ide/bcpg/external/binaries-list
+++ b/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
diff --git a/ide/bcpg/nbproject/project.properties b/ide/bcpg/nbproject/project.properties
index f0d7811de3fd..543472078903 100644
--- a/ide/bcpg/nbproject/project.properties
+++ b/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
diff --git a/ide/bcpg/nbproject/project.xml b/ide/bcpg/nbproject/project.xml
index a29fa0769fe0..72f8cbc55059 100644
--- a/ide/bcpg/nbproject/project.xml
+++ b/ide/bcpg/nbproject/project.xml
@@ -28,7 +28,7 @@
bcpg.jar
- external/bcpg-jdk18on-1.86.jar
+ external/bcpg-jdk18on-1.87.jar
diff --git a/ide/bcpkix/external/bcpkix-jdk18on-1.86-license.txt b/ide/bcpkix/external/bcpkix-jdk18on-1.87-license.txt
similarity index 98%
rename from ide/bcpkix/external/bcpkix-jdk18on-1.86-license.txt
rename to ide/bcpkix/external/bcpkix-jdk18on-1.87-license.txt
index 28736c27d50e..a71fd6b666c5 100644
--- a/ide/bcpkix/external/bcpkix-jdk18on-1.86-license.txt
+++ b/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
diff --git a/ide/bcpkix/external/binaries-list b/ide/bcpkix/external/binaries-list
index 03e8bd1f246b..800204705839 100644
--- a/ide/bcpkix/external/binaries-list
+++ b/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
diff --git a/ide/bcpkix/nbproject/project.properties b/ide/bcpkix/nbproject/project.properties
index f05ff4bd8b12..0848df6b0bc8 100644
--- a/ide/bcpkix/nbproject/project.properties
+++ b/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
diff --git a/ide/bcpkix/nbproject/project.xml b/ide/bcpkix/nbproject/project.xml
index 551e935dc86f..d7a78bfd580e 100644
--- a/ide/bcpkix/nbproject/project.xml
+++ b/ide/bcpkix/nbproject/project.xml
@@ -28,7 +28,7 @@
bcpkix.jar
- external/bcpkix-jdk18on-1.86.jar
+ external/bcpkix-jdk18on-1.87.jar
diff --git a/ide/bcprov/external/bcprov-jdk18on-1.86-license.txt b/ide/bcprov/external/bcprov-jdk18on-1.87-license.txt
similarity index 98%
rename from ide/bcprov/external/bcprov-jdk18on-1.86-license.txt
rename to ide/bcprov/external/bcprov-jdk18on-1.87-license.txt
index 28736c27d50e..a71fd6b666c5 100644
--- a/ide/bcprov/external/bcprov-jdk18on-1.86-license.txt
+++ b/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
diff --git a/ide/bcprov/external/binaries-list b/ide/bcprov/external/binaries-list
index 43989509ab58..2f0d0a58d1d0 100644
--- a/ide/bcprov/external/binaries-list
+++ b/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
diff --git a/ide/bcprov/nbproject/project.properties b/ide/bcprov/nbproject/project.properties
index e38243fc0967..0e6bf8e7dcd5 100644
--- a/ide/bcprov/nbproject/project.properties
+++ b/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
diff --git a/ide/bcprov/nbproject/project.xml b/ide/bcprov/nbproject/project.xml
index 473ea7b68971..a75df8cc048d 100644
--- a/ide/bcprov/nbproject/project.xml
+++ b/ide/bcprov/nbproject/project.xml
@@ -28,7 +28,7 @@
bcprov.jar
- external/bcprov-jdk18on-1.86.jar
+ external/bcprov-jdk18on-1.87.jar
diff --git a/ide/bcutil/external/bcutil-jdk18on-1.86-license.txt b/ide/bcutil/external/bcutil-jdk18on-1.87-license.txt
similarity index 98%
rename from ide/bcutil/external/bcutil-jdk18on-1.86-license.txt
rename to ide/bcutil/external/bcutil-jdk18on-1.87-license.txt
index d01c04473e98..62796351c9e4 100644
--- a/ide/bcutil/external/bcutil-jdk18on-1.86-license.txt
+++ b/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
diff --git a/ide/bcutil/external/binaries-list b/ide/bcutil/external/binaries-list
index 41569d023d51..6f89b1de3429 100644
--- a/ide/bcutil/external/binaries-list
+++ b/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
diff --git a/ide/bcutil/nbproject/project.properties b/ide/bcutil/nbproject/project.properties
index 641bd71af1c1..2dd1c4943efc 100644
--- a/ide/bcutil/nbproject/project.properties
+++ b/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
diff --git a/ide/bcutil/nbproject/project.xml b/ide/bcutil/nbproject/project.xml
index b72af3e902d4..dde4b4cc1ce5 100644
--- a/ide/bcutil/nbproject/project.xml
+++ b/ide/bcutil/nbproject/project.xml
@@ -28,7 +28,7 @@
bcutil.jar
- external/bcutil-jdk18on-1.86.jar
+ external/bcutil-jdk18on-1.87.jar
diff --git a/ide/c.google.gson/external/binaries-list b/ide/c.google.gson/external/binaries-list
index 4fede550d4a2..de7215aae946 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.
-48B8230771E573B54CE6E867A9001E75977FE78E com.google.code.gson:gson:2.13.2
+EFC0E34EDE4E3204EAEFB84A00E55E8C86634382 com.google.code.gson:gson:2.14.0
diff --git a/ide/c.google.gson/external/gson-2.13.2-license.txt b/ide/c.google.gson/external/gson-2.14.0-license.txt
similarity index 99%
rename from ide/c.google.gson/external/gson-2.13.2-license.txt
rename to ide/c.google.gson/external/gson-2.14.0-license.txt
index 3f4e114b00a7..db5e9558b2e5 100644
--- a/ide/c.google.gson/external/gson-2.13.2-license.txt
+++ b/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
diff --git a/ide/c.google.gson/nbproject/project.properties b/ide/c.google.gson/nbproject/project.properties
index c73ef103be5a..a7650646d419 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.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
diff --git a/ide/c.google.gson/nbproject/project.xml b/ide/c.google.gson/nbproject/project.xml
index c2e086fdbd3b..91723c67cfa8 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.13.2.jar
+ external/gson-2.14.0.jar
diff --git a/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/CherryPickCommand.java b/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/CherryPickCommand.java
index fb918888f36e..a05e3a7b16b0 100644
--- a/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/CherryPickCommand.java
+++ b/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 readTodoFile (Repository repository) throws IOExcep
return Collections.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);
+ }
+ }
};
}
}
diff --git a/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/LogTest.java b/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/LogTest.java
index a9c32b6e4bb6..f20642541ca4 100644
--- a/ide/libs.git/test/unit/src/org/netbeans/libs/git/jgit/commands/LogTest.java
+++ b/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");
diff --git a/ide/o.eclipse.jgit.gpg.bc/external/binaries-list b/ide/o.eclipse.jgit.gpg.bc/external/binaries-list
index 04064c71f8ac..0067a5a875e7 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.
-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
diff --git a/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.8.1.202611041320-r-license.txt b/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.8.1.202611041320-r-license.txt
new file mode 100644
index 000000000000..6571c8a82126
--- /dev/null
+++ b/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.
diff --git a/ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties b/ide/o.eclipse.jgit.gpg.bc/nbproject/project.properties
index 465a5c656feb..58cc4f7dffc2 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-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
diff --git a/ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml b/ide/o.eclipse.jgit.gpg.bc/nbproject/project.xml
index 081064584ff5..16138e4666d8 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-7.7.1.202607240634-r.jar
+ external/org.eclipse.jgit.gpg.bc-7.8.1.202611041320-r.jar
diff --git a/ide/o.eclipse.jgit.lfs/external/binaries-list b/ide/o.eclipse.jgit.lfs/external/binaries-list
index 4c252d456758..790e53edcebb 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.
-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
diff --git a/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.7.1.202607240634-r-license.txt b/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.8.1.202611041320-r-license.txt
similarity index 98%
rename from ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.7.1.202607240634-r-license.txt
rename to ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.8.1.202611041320-r-license.txt
index 3996f49e967c..d3e1fb5c92a7 100644
--- a/ide/o.eclipse.jgit.gpg.bc/external/org.eclipse.jgit.gpg.bc-7.7.1.202607240634-r-license.txt
+++ b/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/
diff --git a/ide/o.eclipse.jgit.lfs/nbproject/project.properties b/ide/o.eclipse.jgit.lfs/nbproject/project.properties
index 8d25984ca4b5..9d5a4cdbdbfc 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-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
diff --git a/ide/o.eclipse.jgit.lfs/nbproject/project.xml b/ide/o.eclipse.jgit.lfs/nbproject/project.xml
index 6c4ab9f2e42d..4f61ca0584d0 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-7.7.1.202607240634-r.jar
+ external/org.eclipse.jgit.lfs-7.8.1.202611041320-r.jar
diff --git a/ide/o.eclipse.jgit.ssh.apache.agent/external/binaries-list b/ide/o.eclipse.jgit.ssh.apache.agent/external/binaries-list
index 54c1c0a4dbc2..d6fca4f5e225 100644
--- a/ide/o.eclipse.jgit.ssh.apache.agent/external/binaries-list
+++ b/ide/o.eclipse.jgit.ssh.apache.agent/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.
-C8E5BACAD1C1CF112B2DA5A81F506DCD2ACDC4F5 org.eclipse.jgit:org.eclipse.jgit.ssh.apache.agent:7.7.1.202607240634-r
+6E356F500C5F6E3C39E1EA82B37DD8702BBE224D org.eclipse.jgit:org.eclipse.jgit.ssh.apache.agent:7.8.1.202611041320-r
diff --git a/ide/o.eclipse.jgit.ssh.apache/external/org.eclipse.jgit.ssh.apache-7.7.1.202607240634-r-license.txt b/ide/o.eclipse.jgit.ssh.apache.agent/external/org.eclipse.jgit.ssh.apache.agent-7.8.1.202611041320-r-license.txt
similarity index 98%
rename from ide/o.eclipse.jgit.ssh.apache/external/org.eclipse.jgit.ssh.apache-7.7.1.202607240634-r-license.txt
rename to ide/o.eclipse.jgit.ssh.apache.agent/external/org.eclipse.jgit.ssh.apache.agent-7.8.1.202611041320-r-license.txt
index 3996f49e967c..497dd24c22ed 100644
--- a/ide/o.eclipse.jgit.ssh.apache/external/org.eclipse.jgit.ssh.apache-7.7.1.202607240634-r-license.txt
+++ b/ide/o.eclipse.jgit.ssh.apache.agent/external/org.eclipse.jgit.ssh.apache.agent-7.8.1.202611041320-r-license.txt
@@ -1,6 +1,6 @@
-Name: JGit Library
+Name: JGit SSH Apache Agent
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/
diff --git a/ide/o.eclipse.jgit.ssh.apache.agent/nbproject/project.properties b/ide/o.eclipse.jgit.ssh.apache.agent/nbproject/project.properties
index 8c2f931d31db..a26fe4cd700b 100644
--- a/ide/o.eclipse.jgit.ssh.apache.agent/nbproject/project.properties
+++ b/ide/o.eclipse.jgit.ssh.apache.agent/nbproject/project.properties
@@ -17,4 +17,4 @@
is.autoload=true
-release.external/org.eclipse.jgit.ssh.apache.agent-7.7.1.202607240634-r.jar=modules/org-eclipse-jgit-ssh-apache-agent.jar
+release.external/org.eclipse.jgit.ssh.apache.agent-7.8.1.202611041320-r.jar=modules/org-eclipse-jgit-ssh-apache-agent.jar
diff --git a/ide/o.eclipse.jgit.ssh.apache.agent/nbproject/project.xml b/ide/o.eclipse.jgit.ssh.apache.agent/nbproject/project.xml
index 6a2153d185a9..a00d6002f61e 100644
--- a/ide/o.eclipse.jgit.ssh.apache.agent/nbproject/project.xml
+++ b/ide/o.eclipse.jgit.ssh.apache.agent/nbproject/project.xml
@@ -49,7 +49,7 @@
org-eclipse-jgit-ssh-apache-agent.jar
- external/org.eclipse.jgit.ssh.apache.agent-7.7.1.202607240634-r.jar
+ external/org.eclipse.jgit.ssh.apache.agent-7.8.1.202611041320-r.jar
diff --git a/ide/o.eclipse.jgit.ssh.apache/build.xml b/ide/o.eclipse.jgit.ssh.apache/build.xml
index 26ddc4dc6d63..e5f8a702d22f 100644
--- a/ide/o.eclipse.jgit.ssh.apache/build.xml
+++ b/ide/o.eclipse.jgit.ssh.apache/build.xml
@@ -27,7 +27,7 @@
list.
-->
-
+
diff --git a/ide/o.eclipse.jgit.ssh.apache/external/binaries-list b/ide/o.eclipse.jgit.ssh.apache/external/binaries-list
index 74682688f5fb..40cdd8d5d8f7 100644
--- a/ide/o.eclipse.jgit.ssh.apache/external/binaries-list
+++ b/ide/o.eclipse.jgit.ssh.apache/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.
-DCC179CB371F0282895FED7BCC53BA371A9F79C7 org.eclipse.jgit:org.eclipse.jgit.ssh.apache:7.7.1.202607240634-r
+F6E503C1721493825D1E7F3CE4ED5F2D8B3063C9 org.eclipse.jgit:org.eclipse.jgit.ssh.apache:7.8.1.202611041320-r
diff --git a/ide/o.eclipse.jgit.ssh.apache.agent/external/org.eclipse.jgit.ssh.apache.agent-7.7.1.202607240634-r-license.txt b/ide/o.eclipse.jgit.ssh.apache/external/org.eclipse.jgit.ssh.apache-7.8.1.202611041320-r-license.txt
similarity index 98%
rename from ide/o.eclipse.jgit.ssh.apache.agent/external/org.eclipse.jgit.ssh.apache.agent-7.7.1.202607240634-r-license.txt
rename to ide/o.eclipse.jgit.ssh.apache/external/org.eclipse.jgit.ssh.apache-7.8.1.202611041320-r-license.txt
index 3996f49e967c..99664383f5ab 100644
--- a/ide/o.eclipse.jgit.ssh.apache.agent/external/org.eclipse.jgit.ssh.apache.agent-7.7.1.202607240634-r-license.txt
+++ b/ide/o.eclipse.jgit.ssh.apache/external/org.eclipse.jgit.ssh.apache-7.8.1.202611041320-r-license.txt
@@ -1,6 +1,6 @@
-Name: JGit Library
+Name: JGit SSH Apache
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/
diff --git a/ide/o.eclipse.jgit.ssh.apache/nbproject/org-eclipse-jgit-ssh-apache.sig b/ide/o.eclipse.jgit.ssh.apache/nbproject/org-eclipse-jgit-ssh-apache.sig
index 8eff19dc4d0d..feca628c5073 100644
--- a/ide/o.eclipse.jgit.ssh.apache/nbproject/org-eclipse-jgit-ssh-apache.sig
+++ b/ide/o.eclipse.jgit.ssh.apache/nbproject/org-eclipse-jgit-ssh-apache.sig
@@ -1,5 +1,5 @@
#Signature file v4.1
-#Version 7.0.6.0
+#Version 7.1
CLSS public abstract interface java.io.Closeable
intf java.lang.AutoCloseable
@@ -1839,7 +1839,9 @@ fld public java.lang.String pkcs11Unsupported
fld public java.lang.String pkcs11Warning
fld public java.lang.String proxyCannotAuthenticate
fld public java.lang.String proxyHttpFailure
+fld public java.lang.String proxyHttpHeadersTooLong
fld public java.lang.String proxyHttpInvalidUserName
+fld public java.lang.String proxyHttpMessageTooLong
fld public java.lang.String proxyHttpUnexpectedReply
fld public java.lang.String proxyHttpUnspecifiedFailureReason
fld public java.lang.String proxyJumpAbort
@@ -2054,10 +2056,11 @@ meth protected long getTimeout()
meth protected void adjustTimeout()
meth protected void clearPassword()
meth protected void init(org.apache.sshd.client.session.ClientSession)
-meth protected void setDone(boolean) throws java.lang.Exception
+meth protected void setDone(boolean,org.apache.sshd.common.util.buffer.Buffer) throws java.lang.Exception
meth public void runWhenDone(java.util.concurrent.Callable) throws java.lang.Exception
supr java.lang.Object
-hfds DEFAULT_PROXY_TIMEOUT_NANOS,bufferedCommands,done,lastProxyOperationTime,lock,remainingProxyProtocolTime,unregister
+hfds DEFAULT_PROXY_TIMEOUT_NANOS,bufferedCommands,done,lastProxyOperationTime,lock,remainingProxyProtocolTime,trailingDataHandler,unregister
+hcls ThrowingConsumer
CLSS public org.eclipse.jgit.internal.transport.sshd.proxy.AuthenticationChallenge
cons public init(java.lang.String)
@@ -2079,7 +2082,7 @@ cons public init(java.net.InetSocketAddress,java.net.InetSocketAddress,java.lang
meth public void messageReceived(org.apache.sshd.common.io.IoSession,org.apache.sshd.common.util.Readable) throws java.lang.Exception
meth public void sendClientProxyMetadata(org.apache.sshd.client.session.ClientSession) throws java.lang.Exception
supr org.eclipse.jgit.internal.transport.sshd.proxy.AbstractClientProxyConnector
-hfds HTTP_HEADER_PROXY_AUTHENTICATION,HTTP_HEADER_PROXY_AUTHORIZATION,authenticator,availableAuthentications,basic,clientAuthentications,negotiate,ongoing
+hfds HTTP_HEADER_PROXY_AUTHENTICATION,HTTP_HEADER_PROXY_AUTHORIZATION,MAX_REPLY_LENGTH,authenticator,availableAuthentications,basic,clientAuthentications,data,negotiate,ongoing
hcls HttpAuthenticationHandler,HttpBasicAuthentication,NegotiateAuthentication
CLSS public final org.eclipse.jgit.internal.transport.sshd.proxy.HttpParser
diff --git a/ide/o.eclipse.jgit.ssh.apache/nbproject/project.xml b/ide/o.eclipse.jgit.ssh.apache/nbproject/project.xml
index ea31a0f3fdb8..89f8728a49ca 100644
--- a/ide/o.eclipse.jgit.ssh.apache/nbproject/project.xml
+++ b/ide/o.eclipse.jgit.ssh.apache/nbproject/project.xml
@@ -67,7 +67,7 @@
org-eclipse-jgit-ssh-apache.jar
- external/org.eclipse.jgit.ssh.apache-7.7.1.202607240634-r.jar
+ external/org.eclipse.jgit.ssh.apache-7.8.1.202611041320-r.jar
diff --git a/ide/o.eclipse.jgit/build.xml b/ide/o.eclipse.jgit/build.xml
index 50ea25782f3c..9fbe5e247ccf 100644
--- a/ide/o.eclipse.jgit/build.xml
+++ b/ide/o.eclipse.jgit/build.xml
@@ -27,7 +27,7 @@
list.
-->
-
+
diff --git a/ide/o.eclipse.jgit/external/binaries-list b/ide/o.eclipse.jgit/external/binaries-list
index 99f69b9af7a0..dd002a6104e4 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.
-56AE76F632F5565DD838FC13C73DB89C449A17ED org.eclipse.jgit:org.eclipse.jgit:7.7.1.202607240634-r
+D5B20C74D3CEB81A4AABA56E4D5E9E875931DB9A org.eclipse.jgit:org.eclipse.jgit:7.8.1.202611041320-r
diff --git a/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.7.1.202607240634-r-license.txt b/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.7.1.202607240634-r-license.txt
deleted file mode 100644
index 3996f49e967c..000000000000
--- a/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.7.1.202607240634-r-license.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-Name: JGit Library
-Origin: Eclipse
-Version: 7.7.1.202607240634-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.
diff --git a/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.7.1.202607240634-r-license.txt b/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.8.1.202611041320-r-license.txt
similarity index 98%
rename from ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.7.1.202607240634-r-license.txt
rename to ide/o.eclipse.jgit/external/org.eclipse.jgit-7.8.1.202611041320-r-license.txt
index 3996f49e967c..c5f09d52ca54 100644
--- a/ide/o.eclipse.jgit.lfs/external/org.eclipse.jgit.lfs-7.7.1.202607240634-r-license.txt
+++ b/ide/o.eclipse.jgit/external/org.eclipse.jgit-7.8.1.202611041320-r-license.txt
@@ -1,6 +1,6 @@
-Name: JGit Library
+Name: JGit
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/
diff --git a/ide/o.eclipse.jgit/nbproject/project.xml b/ide/o.eclipse.jgit/nbproject/project.xml
index f2c3d2fdcd52..961134e97e2d 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-7.7.1.202607240634-r.jar
+ external/org.eclipse.jgit-7.8.1.202611041320-r.jar