diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e0859d2c1..bb9df9ff6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,17 +12,17 @@ chance to give input and is useful for tracking. ## Submitting changes -- We use [Gerrit](https://git.eclipse.org/r/) to review all changes by committers -or contributors before they are merged. +- We use [Gerrit on GerritHub](https://eclipse.gerrithub.io/q/project:eclipse-jgit/jgit+status:open) + to review all changes by committers or contributors before they are merged. - Make sure you have an account and have set up the `commit-msg` hook before committing. - When committing your changes, see the contributor guide or other commits on what your commit message should include. - Run the following to push your change for review (with `username` -replaced by your Gerrit username): +replaced by your GitHub username): ```bash -git push ssh://username@git.eclipse.org:29418/jgit/jgit.git HEAD:refs/for/master +git push ssh://username@eclipse.gerrithub.io:29418/eclipse-jgit/jgit HEAD:refs/for/master ``` - Add the link to the review as a comment on the bug report, so that diff --git a/WORKSPACE b/WORKSPACE index 5698c8383..71a27c26e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -90,18 +90,18 @@ maven_jar( sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850", ) -SSHD_VERS = "2.10.0" +SSHD_VERS = "2.11.0" maven_jar( name = "sshd-osgi", artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS, - sha1 = "03677ac1da780b7bdb682da50b762d79ea0d940d", + sha1 = "7ec6b14ab789fc4b1ce9fdcd0e13d22b5c940e7b", ) maven_jar( name = "sshd-sftp", artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS, - sha1 = "88707339ac0693d48df0ec1bafb84c78d792ed08", + sha1 = "3a293bba303c486a9ff6be8e11c9c68fd56b63c7", ) maven_jar( @@ -148,8 +148,8 @@ maven_jar( maven_jar( name = "commons-compress", - artifact = "org.apache.commons:commons-compress:1.24.0", - sha1 = "b4b1b5a3d9573b2970fddab236102c0a4d27d35e", + artifact = "org.apache.commons:commons-compress:1.25.0", + sha1 = "9d35aec423da6c8a7f93d7e9e1c6b1d9fe14bb5e", ) maven_jar( @@ -214,83 +214,83 @@ maven_jar( sha1 = "b3add478d4382b78ea20b1671390a858002feb6c", ) -JETTY_VER = "10.0.16" +JETTY_VER = "10.0.18" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER, - sha1 = "3b995aca89a81109672587f81d411efbd0530d2a", - src_sha1 = "52fe27e7afe4e8759b4f283fe7d2c047f4c1119d", + sha1 = "cc0acde71a3b04db8fcde2ad60a00dfd4effab23", + src_sha1 = "b038debaa2c0c4674fa1bc6e96bcf8bf283be0e8", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "7735aba773abefb79f0f68e058bf7b303df9364e", - src_sha1 = "9f5edba151781d9997b3f4e4d4b7394777176555", + sha1 = "399601ef4e649b3be6f9fd6176b208914f9fd171", + src_sha1 = "b203e58304afe23d8820af6abe3ca39696fe7530", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "fefaa98e95b9737562d196d24f7846734ce99e17", - src_sha1 = "466af604e91b390ef2d9dccf7b115a58a280ac88", + sha1 = "b59b7df009bbb85be455e42524e9a11944fb3ba1", + src_sha1 = "d45709036a573843cd57daeb3112f00f8bf4f753", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "0bf1c1db5bb6e97c1040ee5c1053ec46b9895c5a", - src_sha1 = "30381054b9f3e532dad731d7657ddcae40614342", + sha1 = "9b7f2b580bdcf2a9c27168eac58276c7e6e99ccf", + src_sha1 = "4bbede666e912c8abb60c04022b84225fe9ce369", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "a96c25a805a64a39a7c6e81dbd779bd228ca13aa", - src_sha1 = "8178ce7430fe98e02b3221610cf5ad057c8489d3", + sha1 = "a622527216b27f72744daf849aa2fa0c6f3db131", + src_sha1 = "402c5aa958a734576f13898e63f7ca7f73360b76", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "1513b0c4d8ce627835a5511950d4c40be6450258", - src_sha1 = "297da3bb10874c8ed63615c7116b5a8a74c4adcb", + sha1 = "1ee6a71c2249d5596ba578f015121c99b2b7591a", + src_sha1 = "cbba373f654f22e0f0c10c02938e2df8ec2f0fd3", ) maven_jar( name = "jetty-util-ajax", artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER, - sha1 = "234c1c2a259ab10ed4cc9e24c447b08ac9e1fb69", - src_sha1 = "1b0548113863a8bfd9b94f8ab36a5a288cc0096e", + sha1 = "3560c8a15f920e24daf8ad4196e23ec21610f7d6", + src_sha1 = "4b4966b125c586795e425b7b561bcd5b223d6617", ) -BOUNCYCASTLE_VER = "1.76" +BOUNCYCASTLE_VER = "1.77" maven_jar( name = "bcpg", artifact = "org.bouncycastle:bcpg-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "d5c23d0470261254d0e84dde1d4237d228540298", - src_sha1 = "68d49cdd07da2121a904f481e2e92ca864c08d05", + sha1 = "bb0be51e8b378baae6e0d86f5282cd3887066539", + src_sha1 = "33ff3269cede7165dac44033a3b150cc9f9f11cf", ) maven_jar( name = "bcprov", artifact = "org.bouncycastle:bcprov-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "3a785d0b41806865ad7e311162bfa3fa60b3965b", - src_sha1 = "9e00748625819d7e3cc1447366dfa76f0b354a2d", + sha1 = "2cc971b6c20949c1ff98d1a4bc741ee848a09523", + src_sha1 = "14ea9a3d759261358c6a1f59490ded125b5273a6", ) maven_jar( name = "bcutil", artifact = "org.bouncycastle:bcutil-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "8c7594e651a278bcde18e038d8ab55b1f97f4d31", - src_sha1 = "836bb2c42f10b29127b470ebe5c648927dd4ddc6", + sha1 = "de3eaef351545fe8562cf29ddff4a403a45b49b7", + src_sha1 = "6f8f56ab009e7a3204817a0d45ed9638f5e30116", ) maven_jar( name = "bcpkix", artifact = "org.bouncycastle:bcpkix-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "10c9cf5c1b4d64abeda28ee32fbade3b74373622", - src_sha1 = "e5700c1de407652c1af5961ac8a04fab02eda365", + sha1 = "ed953791ba0229747dd0fd9911e3d76a462acfd3", + src_sha1 = "fdff397d5de0306db014f0a17e91717150db2768", ) diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java index 68f8a4555..3924d6859 100644 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java +++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java @@ -75,6 +75,10 @@ public byte[] recoverKeyData(int encAlgorithm, byte[] key, .getSymmetricCipherName(encAlgorithm); byte[] decrypted = null; try { + // errorprone: "Dynamically constructed transformation + // strings are also flagged, as they may conceal an instance + // of ECB mode." + @SuppressWarnings("InsecureCryptoUsage") Cipher c = Cipher .getInstance(algorithmName + "/OCB/NoPadding"); //$NON-NLS-1$ SecretKey secretKey = new SecretKeySpec(key, algorithmName); diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index e89faf919..ecade7052 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -8,31 +8,31 @@ Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.apache.sshd.common;version="[2.10.0,2.11.0)", - org.apache.sshd.common.config.keys;version="[2.10.0,2.11.0)", - org.apache.sshd.common.file.virtualfs;version="[2.10.0,2.11.0)", - org.apache.sshd.common.helpers;version="[2.10.0,2.11.0)", - org.apache.sshd.common.io;version="[2.10.0,2.11.0)", - org.apache.sshd.common.kex;version="[2.10.0,2.11.0)", - org.apache.sshd.common.keyprovider;version="[2.10.0,2.11.0)", - org.apache.sshd.common.session;version="[2.10.0,2.11.0)", - org.apache.sshd.common.signature;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.buffer;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.logging;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.security;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.threads;version="[2.10.0,2.11.0)", - org.apache.sshd.core;version="[2.10.0,2.11.0)", - org.apache.sshd.server;version="[2.10.0,2.11.0)", - org.apache.sshd.server.auth;version="[2.10.0,2.11.0)", - org.apache.sshd.server.auth.gss;version="[2.10.0,2.11.0)", - org.apache.sshd.server.auth.keyboard;version="[2.10.0,2.11.0)", - org.apache.sshd.server.auth.password;version="[2.10.0,2.11.0)", - org.apache.sshd.server.command;version="[2.10.0,2.11.0)", - org.apache.sshd.server.session;version="[2.10.0,2.11.0)", - org.apache.sshd.server.shell;version="[2.10.0,2.11.0)", - org.apache.sshd.server.subsystem;version="[2.10.0,2.11.0)", - org.apache.sshd.sftp;version="[2.10.0,2.11.0)", - org.apache.sshd.sftp.server;version="[2.10.0,2.11.0)", +Import-Package: org.apache.sshd.common;version="[2.11.0,2.12.0)", + org.apache.sshd.common.config.keys;version="[2.11.0,2.12.0)", + org.apache.sshd.common.file.virtualfs;version="[2.11.0,2.12.0)", + org.apache.sshd.common.helpers;version="[2.11.0,2.12.0)", + org.apache.sshd.common.io;version="[2.11.0,2.12.0)", + org.apache.sshd.common.kex;version="[2.11.0,2.12.0)", + org.apache.sshd.common.keyprovider;version="[2.11.0,2.12.0)", + org.apache.sshd.common.session;version="[2.11.0,2.12.0)", + org.apache.sshd.common.signature;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.buffer;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.logging;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.security;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.threads;version="[2.11.0,2.12.0)", + org.apache.sshd.core;version="[2.11.0,2.12.0)", + org.apache.sshd.server;version="[2.11.0,2.12.0)", + org.apache.sshd.server.auth;version="[2.11.0,2.12.0)", + org.apache.sshd.server.auth.gss;version="[2.11.0,2.12.0)", + org.apache.sshd.server.auth.keyboard;version="[2.11.0,2.12.0)", + org.apache.sshd.server.auth.password;version="[2.11.0,2.12.0)", + org.apache.sshd.server.command;version="[2.11.0,2.12.0)", + org.apache.sshd.server.session;version="[2.11.0,2.12.0)", + org.apache.sshd.server.shell;version="[2.11.0,2.12.0)", + org.apache.sshd.server.subsystem;version="[2.11.0,2.12.0)", + org.apache.sshd.sftp;version="[2.11.0,2.12.0)", + org.apache.sshd.sftp.server;version="[2.11.0,2.12.0)", org.eclipse.jgit.annotations;version="[6.8.0,6.9.0)", org.eclipse.jgit.api;version="[6.8.0,6.9.0)", org.eclipse.jgit.api.errors;version="[6.8.0,6.9.0)", diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target index fb0baa659..28f1daa19 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.10.0 + 2.11.0 jar org.apache.sshd sshd-sftp - 2.10.0 + 2.11.0 jar @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-io - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-security - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-server - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-servlet - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util-ajax - 10.0.16 + 10.0.18 jar @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.76 + 1.77 jar @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target index e2939ff99..77b5872ad 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.10.0 + 2.11.0 jar org.apache.sshd sshd-sftp - 2.10.0 + 2.11.0 jar @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-io - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-security - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-server - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-servlet - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util-ajax - 10.0.16 + 10.0.18 jar @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.76 + 1.77 jar @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target index 4e1916ad1..1596cbc2a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.10.0 + 2.11.0 jar org.apache.sshd sshd-sftp - 2.10.0 + 2.11.0 jar @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-io - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-security - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-server - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-servlet - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util-ajax - 10.0.16 + 10.0.18 jar @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.76 + 1.77 jar @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target index 1ffa01420..fbe1a65c0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.10.0 + 2.11.0 jar org.apache.sshd sshd-sftp - 2.10.0 + 2.11.0 jar @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-io - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-security - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-server - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-servlet - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util-ajax - 10.0.16 + 10.0.18 jar @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.76 + 1.77 jar @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target index 0603842cb..684568c11 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.10.0 + 2.11.0 jar org.apache.sshd sshd-sftp - 2.10.0 + 2.11.0 jar @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-io - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-security - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-server - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-servlet - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util-ajax - 10.0.16 + 10.0.18 jar @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.76 + 1.77 jar @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target index f3e10bccf..8efa5db62 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.10.0 + 2.11.0 jar org.apache.sshd sshd-sftp - 2.10.0 + 2.11.0 jar @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-io - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-security - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-server - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-servlet - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util-ajax - 10.0.16 + 10.0.18 jar @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.76 + 1.77 jar @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target index 162eeff64..5c5dbaeb0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.10.0 + 2.11.0 jar org.apache.sshd sshd-sftp - 2.10.0 + 2.11.0 jar @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-io - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-security - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-server - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-servlet - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util-ajax - 10.0.16 + 10.0.18 jar @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.76 + 1.77 jar @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target index b0c996d0b..952deaeba 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.10.0 + 2.11.0 jar org.apache.sshd sshd-sftp - 2.10.0 + 2.11.0 jar @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-io - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-security - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-server - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-servlet - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util-ajax - 10.0.16 + 10.0.18 jar @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.76 + 1.77 jar @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target index 260c50c3e..dcfe7b7b6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.10.0 + 2.11.0 jar org.apache.sshd sshd-sftp - 2.10.0 + 2.11.0 jar @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-io - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-security - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-server - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-servlet - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util-ajax - 10.0.16 + 10.0.18 jar @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.76 + 1.77 jar @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target index 8abc1f1a3..bdb6f05c4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.10.0 + 2.11.0 jar org.apache.sshd sshd-sftp - 2.10.0 + 2.11.0 jar @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-io - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-security - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-server - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-servlet - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util-ajax - 10.0.16 + 10.0.18 jar @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.76 + 1.77 jar @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 6c8b1c041..645917e7d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.10.0 + 2.11.0 jar org.apache.sshd sshd-sftp - 2.10.0 + 2.11.0 jar @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-io - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-security - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-server - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-servlet - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util-ajax - 10.0.16 + 10.0.18 jar @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.76 + 1.77 jar @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index bde048c0f..aa4baa2a6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.10.0 + 2.11.0 jar org.apache.sshd sshd-sftp - 2.10.0 + 2.11.0 jar @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-io - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-security - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-server - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-servlet - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util-ajax - 10.0.16 + 10.0.18 jar @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.76 + 1.77 jar @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index d180721ed..7ee5cb20d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.10.0 + 2.11.0 jar org.apache.sshd sshd-sftp - 2.10.0 + 2.11.0 jar @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-io - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-security - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-server - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-servlet - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util-ajax - 10.0.16 + 10.0.18 jar @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.76 + 1.77 jar @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index c56778797..88f9ac999 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.10.0 + 2.11.0 jar org.apache.sshd sshd-sftp - 2.10.0 + 2.11.0 jar @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-io - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-security - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-server - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-servlet - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util - 10.0.16 + 10.0.18 jar org.eclipse.jetty jetty-util-ajax - 10.0.16 + 10.0.18 jar @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcprov-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcpkix-jdk18on - 1.76 + 1.77 jar org.bouncycastle bcutil-jdk18on - 1.76 + 1.77 jar @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.24.0 + 1.25.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd index b5c3b1ae4..10d707f3d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd @@ -15,7 +15,7 @@ maven apache dependency { groupId = "org.apache.commons" artifactId = "commons-compress" - version = "1.24.0" + version = "1.25.0" } dependency { groupId = "commons-logging" @@ -59,22 +59,22 @@ maven bouncycastle dependency { groupId = "org.bouncycastle" artifactId = "bcpg-jdk18on" - version = "1.76" + version = "1.77" } dependency { groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" - version = "1.76" + version = "1.77" } dependency { groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" - version = "1.76" + version = "1.77" } dependency { groupId = "org.bouncycastle" artifactId = "bcutil-jdk18on" - version = "1.76" + version = "1.77" } } @@ -144,37 +144,37 @@ maven jetty dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "10.0.16" + version = "10.0.18" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "10.0.16" + version = "10.0.18" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "10.0.16" + version = "10.0.18" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "10.0.16" + version = "10.0.18" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-servlet" - version = "10.0.16" + version = "10.0.18" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "10.0.16" + version = "10.0.18" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "10.0.16" + version = "10.0.18" } dependency { groupId = "jakarta.servlet" @@ -223,12 +223,12 @@ maven sshd dependency { groupId = "org.apache.sshd" artifactId = "sshd-osgi" - version = "2.10.0" + version = "2.11.0" } dependency { groupId = "org.apache.sshd" artifactId = "sshd-sftp" - version = "2.10.0" + version = "2.11.0" } } diff --git a/org.eclipse.jgit.ssh.apache.agent/bin/.project b/org.eclipse.jgit.ssh.apache.agent/bin/.project deleted file mode 100644 index 73358f4a6..000000000 --- a/org.eclipse.jgit.ssh.apache.agent/bin/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.eclipse.jgit.ssh.apache.agent - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.pde.PluginNature - org.eclipse.jdt.core.javanature - - diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 340cb246e..7f08043a2 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -8,20 +8,20 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" -Import-Package: org.apache.sshd.client.config.hosts;version="[2.10.0,2.11.0)", - org.apache.sshd.common;version="[2.10.0,2.11.0)", - org.apache.sshd.common.auth;version="[2.10.0,2.11.0)", - org.apache.sshd.common.config.keys;version="[2.10.0,2.11.0)", - org.apache.sshd.common.helpers;version="[2.10.0,2.11.0)", - org.apache.sshd.common.kex;version="[2.10.0,2.11.0)", - org.apache.sshd.common.keyprovider;version="[2.10.0,2.11.0)", - org.apache.sshd.common.session;version="[2.10.0,2.11.0)", - org.apache.sshd.common.signature;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.net;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.security;version="[2.10.0,2.11.0)", - org.apache.sshd.core;version="[2.10.0,2.11.0)", - org.apache.sshd.server;version="[2.10.0,2.11.0)", - org.apache.sshd.server.forward;version="[2.10.0,2.11.0)", +Import-Package: org.apache.sshd.client.config.hosts;version="[2.11.0,2.12.0)", + org.apache.sshd.common;version="[2.11.0,2.12.0)", + org.apache.sshd.common.auth;version="[2.11.0,2.12.0)", + org.apache.sshd.common.config.keys;version="[2.11.0,2.12.0)", + org.apache.sshd.common.helpers;version="[2.11.0,2.12.0)", + org.apache.sshd.common.kex;version="[2.11.0,2.12.0)", + org.apache.sshd.common.keyprovider;version="[2.11.0,2.12.0)", + org.apache.sshd.common.session;version="[2.11.0,2.12.0)", + org.apache.sshd.common.signature;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.net;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.security;version="[2.11.0,2.12.0)", + org.apache.sshd.core;version="[2.11.0,2.12.0)", + org.apache.sshd.server;version="[2.11.0,2.12.0)", + org.apache.sshd.server.forward;version="[2.11.0,2.12.0)", org.eclipse.jgit.api;version="[6.8.0,6.9.0)", org.eclipse.jgit.api.errors;version="[6.8.0,6.9.0)", org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.8.0,6.9.0)", diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 4316e31a9..2cdf60008 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -37,57 +37,57 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.8.0";x-inter org.eclipse.jgit.transport.sshd.agent;version="6.8.0", sun.security.x509 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", - org.apache.sshd.agent;version="[2.10.0,2.11.0)", - org.apache.sshd.client;version="[2.10.0,2.11.0)", - org.apache.sshd.client.auth;version="[2.10.0,2.11.0)", - org.apache.sshd.client.auth.keyboard;version="[2.10.0,2.11.0)", - org.apache.sshd.client.auth.password;version="[2.10.0,2.11.0)", - org.apache.sshd.client.auth.pubkey;version="[2.10.0,2.11.0)", - org.apache.sshd.client.channel;version="[2.10.0,2.11.0)", - org.apache.sshd.client.config.hosts;version="[2.10.0,2.11.0)", - org.apache.sshd.client.config.keys;version="[2.10.0,2.11.0)", - org.apache.sshd.client.future;version="[2.10.0,2.11.0)", - org.apache.sshd.client.keyverifier;version="[2.10.0,2.11.0)", - org.apache.sshd.client.session;version="[2.10.0,2.11.0)", - org.apache.sshd.client.session.forward;version="[2.10.0,2.11.0)", - org.apache.sshd.common;version="[2.10.0,2.11.0)", - org.apache.sshd.common.auth;version="[2.10.0,2.11.0)", - org.apache.sshd.common.channel;version="[2.10.0,2.11.0)", - org.apache.sshd.common.compression;version="[2.10.0,2.11.0)", - org.apache.sshd.common.config.keys;version="[2.10.0,2.11.0)", - org.apache.sshd.common.config.keys.loader;version="[2.10.0,2.11.0)", - org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.10.0,2.11.0)", - org.apache.sshd.common.config.keys.u2f;version="[2.10.0,2.11.0)", - org.apache.sshd.common.digest;version="[2.10.0,2.11.0)", - org.apache.sshd.common.forward;version="[2.10.0,2.11.0)", - org.apache.sshd.common.future;version="[2.10.0,2.11.0)", - org.apache.sshd.common.helpers;version="[2.10.0,2.11.0)", - org.apache.sshd.common.io;version="[2.10.0,2.11.0)", - org.apache.sshd.common.kex;version="[2.10.0,2.11.0)", - org.apache.sshd.common.kex.extension;version="[2.10.0,2.11.0)", - org.apache.sshd.common.kex.extension.parser;version="[2.10.0,2.11.0)", - org.apache.sshd.common.keyprovider;version="[2.10.0,2.11.0)", - org.apache.sshd.common.mac;version="[2.10.0,2.11.0)", - org.apache.sshd.common.random;version="[2.10.0,2.11.0)", - org.apache.sshd.common.session;version="[2.10.0,2.11.0)", - org.apache.sshd.common.session.helpers;version="[2.10.0,2.11.0)", - org.apache.sshd.common.signature;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.buffer;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.buffer.keys;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.closeable;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.io;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.io.der;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.io.functors;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.io.resource;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.logging;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.net;version="[2.10.0,2.11.0)", - org.apache.sshd.common.util.security;version="[2.10.0,2.11.0)", - org.apache.sshd.core;version="[2.10.0,2.11.0)", - org.apache.sshd.server.auth;version="[2.10.0,2.11.0)", - org.apache.sshd.sftp;version="[2.10.0,2.11.0)", - org.apache.sshd.sftp.client;version="[2.10.0,2.11.0)", - org.apache.sshd.sftp.common;version="[2.10.0,2.11.0)", + org.apache.sshd.agent;version="[2.11.0,2.12.0)", + org.apache.sshd.client;version="[2.11.0,2.12.0)", + org.apache.sshd.client.auth;version="[2.11.0,2.12.0)", + org.apache.sshd.client.auth.keyboard;version="[2.11.0,2.12.0)", + org.apache.sshd.client.auth.password;version="[2.11.0,2.12.0)", + org.apache.sshd.client.auth.pubkey;version="[2.11.0,2.12.0)", + org.apache.sshd.client.channel;version="[2.11.0,2.12.0)", + org.apache.sshd.client.config.hosts;version="[2.11.0,2.12.0)", + org.apache.sshd.client.config.keys;version="[2.11.0,2.12.0)", + org.apache.sshd.client.future;version="[2.11.0,2.12.0)", + org.apache.sshd.client.keyverifier;version="[2.11.0,2.12.0)", + org.apache.sshd.client.session;version="[2.11.0,2.12.0)", + org.apache.sshd.client.session.forward;version="[2.11.0,2.12.0)", + org.apache.sshd.common;version="[2.11.0,2.12.0)", + org.apache.sshd.common.auth;version="[2.11.0,2.12.0)", + org.apache.sshd.common.channel;version="[2.11.0,2.12.0)", + org.apache.sshd.common.compression;version="[2.11.0,2.12.0)", + org.apache.sshd.common.config.keys;version="[2.11.0,2.12.0)", + org.apache.sshd.common.config.keys.loader;version="[2.11.0,2.12.0)", + org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.11.0,2.12.0)", + org.apache.sshd.common.config.keys.u2f;version="[2.11.0,2.12.0)", + org.apache.sshd.common.digest;version="[2.11.0,2.12.0)", + org.apache.sshd.common.forward;version="[2.11.0,2.12.0)", + org.apache.sshd.common.future;version="[2.11.0,2.12.0)", + org.apache.sshd.common.helpers;version="[2.11.0,2.12.0)", + org.apache.sshd.common.io;version="[2.11.0,2.12.0)", + org.apache.sshd.common.kex;version="[2.11.0,2.12.0)", + org.apache.sshd.common.kex.extension;version="[2.11.0,2.12.0)", + org.apache.sshd.common.kex.extension.parser;version="[2.11.0,2.12.0)", + org.apache.sshd.common.keyprovider;version="[2.11.0,2.12.0)", + org.apache.sshd.common.mac;version="[2.11.0,2.12.0)", + org.apache.sshd.common.random;version="[2.11.0,2.12.0)", + org.apache.sshd.common.session;version="[2.11.0,2.12.0)", + org.apache.sshd.common.session.helpers;version="[2.11.0,2.12.0)", + org.apache.sshd.common.signature;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.buffer;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.buffer.keys;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.closeable;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.io;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.io.der;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.io.functors;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.io.resource;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.logging;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.net;version="[2.11.0,2.12.0)", + org.apache.sshd.common.util.security;version="[2.11.0,2.12.0)", + org.apache.sshd.core;version="[2.11.0,2.12.0)", + org.apache.sshd.server.auth;version="[2.11.0,2.12.0)", + org.apache.sshd.sftp;version="[2.11.0,2.12.0)", + org.apache.sshd.sftp.client;version="[2.11.0,2.12.0)", + org.apache.sshd.sftp.common;version="[2.11.0,2.12.0)", org.eclipse.jgit.annotations;version="[6.8.0,6.9.0)", org.eclipse.jgit.errors;version="[6.8.0,6.9.0)", org.eclipse.jgit.fnmatch;version="[6.8.0,6.9.0)", diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file.patch b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file.patch new file mode 100644 index 000000000..64f2b0068 Binary files /dev/null and b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file.patch differ diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file_PostImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file_PostImage new file mode 100644 index 000000000..72ef58f79 Binary files /dev/null and b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file_PostImage differ diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file_PreImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file_PreImage new file mode 100644 index 000000000..379a33cf2 Binary files /dev/null and b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file_PreImage differ diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/BranchCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/BranchCommandTest.java index 87be813c8..7c1cbc37d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/BranchCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/BranchCommandTest.java @@ -12,6 +12,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; import static org.junit.Assert.fail; import java.util.List; @@ -160,6 +161,20 @@ public void testCreateAndList() throws Exception { - allBefore); } + @Test + public void testExistingNameInBothBranchesAndTags() throws Exception { + git.branchCreate().setName("test").call(); + git.tag().setName("test").call(); + + // existing name not allowed w/o force + assertThrows("Create branch with existing ref name should fail", + RefAlreadyExistsException.class, + () -> git.branchCreate().setName("test").call()); + + // existing name allowed with force option + git.branchCreate().setName("test").setForce(true).call(); + } + @Test(expected = InvalidRefNameException.class) public void testInvalidBranchHEAD() throws Exception { git.branchCreate().setName("HEAD").call(); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcTestCase.java index 48f6e0638..8b27b829b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcTestCase.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcTestCase.java @@ -61,6 +61,7 @@ public void tearDown() throws Exception { * the depth of the commit chain. * @return the commit that is the tip of the commit chain * @throws Exception + * if an error occurred */ protected RevCommit commitChain(int depth) throws Exception { if (depth <= 0) @@ -93,6 +94,7 @@ protected RevCommit commitChain(int depth) throws Exception { * number of files added per commit * @return the commit that is the tip of the commit chain * @throws Exception + * if an error occurred */ protected RevCommit commitChain(int depth, int width) throws Exception { if (depth <= 0) { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackIndexTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackIndexTestCase.java index 67bba18e2..24bdc4a97 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackIndexTestCase.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackIndexTestCase.java @@ -66,7 +66,9 @@ public void setUp() throws Exception { * Verify CRC32 support. * * @throws MissingObjectException + * object is missing in the underlying index * @throws UnsupportedOperationException + * the index doesn't have CRC */ public abstract void testCRC32() throws MissingObjectException, UnsupportedOperationException; diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java index 92d47c296..2aac15bbb 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java @@ -496,6 +496,14 @@ public void testRemoveNewlineAtEnd() throws Exception { Result result = applyPatch(); verifyChange(result, "x_last_rm_nl"); } + + @Test + public void testVeryLongFile() throws Exception { + init("very_long_file"); + + Result result = applyPatch(); + verifyChange(result, "very_long_file"); + } } public static class WithWorktree extends Base { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/test/resources/SampleDataRepositoryTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/test/resources/SampleDataRepositoryTestCase.java index 578128326..4f5e35f12 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/test/resources/SampleDataRepositoryTestCase.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/test/resources/SampleDataRepositoryTestCase.java @@ -35,6 +35,7 @@ public void setUp() throws Exception { * @param repo * test repository to receive packfile copies * @throws IOException + * an error occurred */ public static void copyCGitTestPacks(FileRepository repo) throws IOException { final String[] packs = { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/RequestValidatorTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/RequestValidatorTestCase.java index cc910b3b9..f589a399a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/RequestValidatorTestCase.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/RequestValidatorTestCase.java @@ -70,20 +70,30 @@ public void setUp() throws Exception { } /** + * Check if the validator accepts a reachable commit + * * @return true if a commit reachable from a visible tip (but not directly * the tip) is valid */ protected abstract boolean isReachableCommitValid(); - /** @return true if a commit not reachable from any tip is valid */ + /** + * Check if the validator accepts an unreachable commit + * + * @return true if a commit not reachable from any tip is valid + **/ protected abstract boolean isUnreachableCommitValid(); /** + * Check if the validator accepts a previously advertised tip + * * @return true if the commit directly pointed by an advertised ref is valid */ protected abstract boolean isAdvertisedTipValid(); /** + * Check if the validator accepts a previous unadvertised tip + * * @return true if the object directly pointed by a non-advertised ref is * valid */ @@ -92,17 +102,23 @@ public void setUp() throws Exception { // UploadPack doesn't allow to ask for blobs when there is no // bitmap. Test both cases separately. /** + * Check if the validator accepts a reachable blob (repo with bitmaps) + * * @return true if a reachable blob is valid (and the repo has bitmaps) */ protected abstract boolean isReachableBlobValid_withBitmaps(); /** + * Check if the validator accepts a reachable blob (repo without bitmaps) + * * @return true if a reachable blob is valid (and the repo does NOT have * bitmaps) */ protected abstract boolean isReachableBlobValid_withoutBitmaps(); /** + * Check if the validator accepts an unreachable blob + * * @return true if a blob unreachable from any tip is valid */ protected abstract boolean isUnreachableBlobValid(); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java index e1efb86cd..013e0ff13 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java @@ -88,9 +88,7 @@ public Ref call() throws GitAPIException, RefAlreadyExistsException, checkCallable(); processOptions(); try (RevWalk revWalk = new RevWalk(repo)) { - Ref refToCheck = repo.findRef(name); - boolean exists = refToCheck != null - && refToCheck.getName().startsWith(R_HEADS); + boolean exists = repo.findRef(R_HEADS + name) != null; if (!force && exists) throw new RefAlreadyExistsException(MessageFormat.format( JGitText.get().refAlreadyExists1, name)); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java index b697edb60..1f1c35ac1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java @@ -261,7 +261,6 @@ private void writeFanoutTable(CancellableDigestOutputStream out) for (int n : fanout) { NB.encodeInt32(tmp, 0, n); out.write(tmp, 0, 4); - out.getWriteMonitor().update(1); } } @@ -272,7 +271,6 @@ private void writeOidLookUp(CancellableDigestOutputStream out) for (RevCommit c : graphCommits) { c.copyRawTo(tmp, 0); out.write(tmp, 0, hashsz); - out.getWriteMonitor().update(1); } } @@ -470,7 +468,6 @@ private void writeExtraEdges(CancellableDigestOutputStream out) } NB.encodeInt32(tmp, 0, edgeValue); out.write(tmp); - out.getWriteMonitor().update(1); } } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index aad1342fe..c7b4e4569 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -345,8 +345,9 @@ public final class ConfigConstants { public static final String CONFIG_KEY_STREAM_FILE_THRESHOLD = "streamFileThreshold"; /** - * @Deprecated typo, use CONFIG_KEY_STREAM_FILE_THRESHOLD instead + * @deprecated typo, use CONFIG_KEY_STREAM_FILE_THRESHOLD instead */ + @Deprecated(since = "6.8") public static final String CONFIG_KEY_STREAM_FILE_TRESHOLD = CONFIG_KEY_STREAM_FILE_THRESHOLD; /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java index 1edd85421..a327095c8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java @@ -88,6 +88,7 @@ import org.eclipse.jgit.util.TemporaryBuffer.LocalFile; import org.eclipse.jgit.util.io.BinaryDeltaInputStream; import org.eclipse.jgit.util.io.BinaryHunkInputStream; +import org.eclipse.jgit.util.io.CountingOutputStream; import org.eclipse.jgit.util.io.EolStreamTypeUtil; import org.eclipse.jgit.util.sha1.SHA1; @@ -1013,7 +1014,10 @@ && canApplyAt(hunkLines, newLines, 0)) { // We could check if old == new, but the short-circuiting complicates // logic for inCore patching, so just write the new thing regardless. TemporaryBuffer buffer = new TemporaryBuffer.LocalFile(null); - try (OutputStream out = buffer) { + // TemporaryBuffer::length reports incorrect length until the buffer + // is closed. To use it as input for ContentStreamLoader below, we + // need a wrapper with a reliable in-progress length. + try (CountingOutputStream out = new CountingOutputStream(buffer)) { for (Iterator l = newLines.iterator(); l.hasNext();) { ByteBuffer line = l.next(); if (line == null) { @@ -1026,7 +1030,7 @@ && canApplyAt(hunkLines, newLines, 0)) { } } return new ContentStreamLoader(buffer::openInputStream, - buffer.length()); + out.getCount()); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/BitmapWalker.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/BitmapWalker.java index 8cd5eb223..c0e41d644 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/BitmapWalker.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/BitmapWalker.java @@ -47,6 +47,64 @@ public final class BitmapWalker { private Bitmap prevBitmap; + /** + * Report commits found during the walk + * + * @since 6.8 + */ + public interface BitmapWalkListener { + /** + * The commit was already visited or is reachable from a visited commit + * + * @param oid + * objectId of the commit already visited directly or + * indirectly + */ + void onCommitSeen(ObjectId oid); + + /** + * The commit has a bitmap in the bitmap index + * + * @param oid + * objectId of the commit with a bitmap in the bitmap index + */ + void onCommitWithBitmap(ObjectId oid); + + /** + * The commit doesn't have bitmap + * + * @param oid + * objectId of the commit without a bitmap in the bitmap + * index + */ + void onCommitWithoutBitmap(ObjectId oid); + + } + + /** + * Empty listener + * + * @since 6.8 + */ + public static final BitmapWalkListener NOOP_LISTENER = new BitmapWalkListener() { + @Override + public void onCommitSeen(ObjectId oid) { + // Nothing to do + } + + @Override + public void onCommitWithBitmap(ObjectId oid) { + // Nothing to do + } + + @Override + public void onCommitWithoutBitmap(ObjectId oid) { + // Nothing to do + } + }; + + private final BitmapWalkListener listener; + /** * Create a BitmapWalker. * @@ -56,9 +114,30 @@ public final class BitmapWalker { */ public BitmapWalker( ObjectWalk walker, BitmapIndex bitmapIndex, ProgressMonitor pm) { + this(walker, bitmapIndex, pm, NOOP_LISTENER); + } + + /** + * Create a BitmapWalker. + * + * @param walker + * walker to use when traversing the object graph. + * @param bitmapIndex + * index to obtain bitmaps from. + * @param pm + * progress monitor to report progress on. + * @param listener + * listener of event happening during the walk. Use + * {@link BitmapWalker#NOOP_LISTENER} for a no-op listener. + * + * @since 6.8 + */ + public BitmapWalker(ObjectWalk walker, BitmapIndex bitmapIndex, + ProgressMonitor pm, BitmapWalkListener listener) { this.walker = walker; this.bitmapIndex = bitmapIndex; this.pm = (pm == null) ? NullProgressMonitor.INSTANCE : pm; + this.listener = listener; } /** @@ -140,6 +219,7 @@ public BitmapBuilder findObjects(Iterable start, BitmapBuild Bitmap bitmap = bitmapIndex.getBitmap(obj); if (bitmap != null) { result.or(bitmap); + listener.onCommitWithBitmap(obj); } } @@ -178,8 +258,10 @@ private BitmapBuilder findObjectsWalk(Iterable start, Bitmap for (ObjectId obj : start) { Bitmap bitmap = bitmapIndex.getBitmap(obj); - if (bitmap != null) + if (bitmap != null) { bitmapResult.or(bitmap); + listener.onCommitWithBitmap(obj); + } } boolean marked = false; @@ -208,7 +290,8 @@ private BitmapBuilder findObjectsWalk(Iterable start, Bitmap } walker.setObjectFilter(new BitmapObjectFilter(bitmapResult)); - while (walker.next() != null) { + ObjectId oid; + while ((oid = walker.next()) != null) { // Iterate through all of the commits. The BitmapRevFilter does // the work. // @@ -220,6 +303,7 @@ private BitmapBuilder findObjectsWalk(Iterable start, Bitmap // of bitmaps. pm.update(1); countOfBitmapIndexMisses++; + listener.onCommitWithoutBitmap(oid); } RevObject ro; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java index 842d8ba33..cab0e6a0a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java @@ -631,11 +631,11 @@ else if (!caseSensitive } /** - * Determine if an IOException is a Stale NFS File Handle + * Determine if an IOException is a stale NFS file handle * * @param ioe * an {@link java.io.IOException} object. - * @return a boolean true if the IOException is a Stale NFS FIle Handle + * @return a boolean true if the IOException is a stale NFS file handle * @since 4.1 */ public static boolean isStaleFileHandle(IOException ioe) { @@ -646,13 +646,13 @@ public static boolean isStaleFileHandle(IOException ioe) { } /** - * Determine if a throwable or a cause in its causal chain is a Stale NFS - * File Handle + * Determine if a throwable or a cause in its causal chain is a stale NFS + * file handle * * @param throwable * a {@link java.lang.Throwable} object. * @return a boolean true if the throwable or a cause in its causal chain is - * a Stale NFS File Handle + * a stale NFS file handle * @since 4.7 */ public static boolean isStaleFileHandleInCausalChain(Throwable throwable) { diff --git a/pom.xml b/pom.xml index c38bdbf8a..0e6190182 100644 --- a/pom.xml +++ b/pom.xml @@ -120,24 +120,24 @@ 6.7.0.202309050840-r 1.10.14 - 2.10.0 + 2.11.0 0.1.55 1.1.3 1.2.3 4.13.2 1C 2.33 - 1.24.0 + 1.25.0 6.0.0 4.0.4 - 10.0.16 + 10.0.18 0.17.2 4.5.14 4.4.16 1.7.36 3.5.0 2.10.1 - 1.76 + 1.77 4.7.3.4 3.4.3 3.3.0