Skip to content

Update jgit from 7.0.0 to 7.2.0#8383

Merged
mbien merged 2 commits into
apache:masterfrom
mbien:jgit720
Apr 9, 2025
Merged

Update jgit from 7.0.0 to 7.2.0#8383
mbien merged 2 commits into
apache:masterfrom
mbien:jgit720

Conversation

@mbien

@mbien mbien commented Apr 1, 2025

Copy link
Copy Markdown
Member
  • Update jgit from 7.0.0 to 7.2.0
  • Update gson from 2.11.0 to 2.12.1

skipped bouncycastle since NB osgi failed to load it the last time I tried #7569

dep trees:

Details
mvn eu.maveniverse.maven.plugins:toolbox:gav-tree -Dgav=org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.0.0.202409031743-r
[INFO] org.eclipse.jgit:org.eclipse.jgit.gpg.bc:jar:7.0.0.202409031743-r
[INFO] ├─org.eclipse.jgit:org.eclipse.jgit:jar:7.0.0.202409031743-r [compile]
[INFO] │ ├─com.googlecode.javaewah:JavaEWAH:jar:1.2.3 [compile]
[INFO] │ ╰─commons-codec:commons-codec:jar:1.17.1 [compile]
[INFO] ├─org.bouncycastle:bcpg-jdk18on:jar:1.78.1 [compile]
[INFO] ├─org.bouncycastle:bcprov-jdk18on:jar:1.78.1 [compile]
[INFO] ├─org.bouncycastle:bcutil-jdk18on:jar:1.78.1 [compile]
[INFO] ├─org.bouncycastle:bcpkix-jdk18on:jar:1.78.1 [compile]
[INFO] ╰─org.slf4j:slf4j-api:jar:1.7.36 [compile]

mvn eu.maveniverse.maven.plugins:toolbox:gav-tree -Dgav=org.eclipse.jgit:org.eclipse.jgit.gpg.bc:7.2.0.202503040940-r
[INFO] org.eclipse.jgit:org.eclipse.jgit.gpg.bc:jar:7.2.0.202503040940-r
[INFO] ├─org.eclipse.jgit:org.eclipse.jgit:jar:7.2.0.202503040940-r [compile]
[INFO] │ ├─com.googlecode.javaewah:JavaEWAH:jar:1.2.3 [compile]
[INFO] │ ╰─commons-codec:commons-codec:jar:1.18.0 [compile]
[INFO] ├─org.bouncycastle:bcpg-jdk18on:jar:1.80 [compile]
[INFO] ├─org.bouncycastle:bcprov-jdk18on:jar:1.80 [compile]
[INFO] ├─org.bouncycastle:bcutil-jdk18on:jar:1.80 [compile]
[INFO] ├─org.bouncycastle:bcpkix-jdk18on:jar:1.80 [compile]
[INFO] ╰─org.slf4j:slf4j-api:jar:1.7.36 [compile]
mvn eu.maveniverse.maven.plugins:toolbox:gav-tree -Dgav=org.eclipse.jgit:org.eclipse.jgit.lfs:7.0.0.202409031743-r
[INFO] org.eclipse.jgit:org.eclipse.jgit.lfs:jar:7.0.0.202409031743-r
[INFO] ├─org.eclipse.jgit:org.eclipse.jgit:jar:7.0.0.202409031743-r [compile]
[INFO] │ ├─com.googlecode.javaewah:JavaEWAH:jar:1.2.3 [compile]
[INFO] │ ├─org.slf4j:slf4j-api:jar:1.7.36 [compile]
[INFO] │ ╰─commons-codec:commons-codec:jar:1.17.1 [compile]
[INFO] ╰─com.google.code.gson:gson:jar:2.11.0 [compile]
[INFO]   ╰─com.google.errorprone:error_prone_annotations:jar:2.27.0 [compile]

mvn eu.maveniverse.maven.plugins:toolbox:gav-tree -Dgav=org.eclipse.jgit:org.eclipse.jgit.lfs:7.2.0.202503040940-r
[INFO] org.eclipse.jgit:org.eclipse.jgit.lfs:jar:7.2.0.202503040940-r
[INFO] ├─org.eclipse.jgit:org.eclipse.jgit:jar:7.2.0.202503040940-r [compile]
[INFO] │ ├─com.googlecode.javaewah:JavaEWAH:jar:1.2.3 [compile]
[INFO] │ ├─org.slf4j:slf4j-api:jar:1.7.36 [compile]
[INFO] │ ╰─commons-codec:commons-codec:jar:1.18.0 [compile]
[INFO] ╰─com.google.code.gson:gson:jar:2.12.1 [compile]
[INFO]   ╰─com.google.errorprone:error_prone_annotations:jar:2.36.0 [compile]
mvn eu.maveniverse.maven.plugins:toolbox:gav-tree -Dgav=org.eclipse.jgit:org.eclipse.jgit:7.0.0.202409031743-r
[INFO] org.eclipse.jgit:org.eclipse.jgit:jar:7.0.0.202409031743-r
[INFO] ├─com.googlecode.javaewah:JavaEWAH:jar:1.2.3 [compile]
[INFO] ├─org.slf4j:slf4j-api:jar:1.7.36 [compile]
[INFO] ╰─commons-codec:commons-codec:jar:1.17.1 [compile]

mvn eu.maveniverse.maven.plugins:toolbox:gav-tree -Dgav=org.eclipse.jgit:org.eclipse.jgit:7.2.0.202503040940-r
[INFO] org.eclipse.jgit:org.eclipse.jgit:jar:7.2.0.202503040940-r
[INFO] ├─com.googlecode.javaewah:JavaEWAH:jar:1.2.3 [compile]
[INFO] ├─org.slf4j:slf4j-api:jar:1.7.36 [compile]
[INFO] ╰─commons-codec:commons-codec:jar:1.18.0 [compile]
mvn eu.maveniverse.maven.plugins:toolbox:gav-tree -Dgav=org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:7.0.0.202409031743-r
[INFO] org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:jar:7.0.0.202409031743-r
[INFO] ├─org.eclipse.jgit:org.eclipse.jgit:jar:7.0.0.202409031743-r [compile]
[INFO] │ ├─com.googlecode.javaewah:JavaEWAH:jar:1.2.3 [compile]
[INFO] │ ╰─commons-codec:commons-codec:jar:1.17.1 [compile]
[INFO] ├─com.jcraft:jsch:jar:0.1.55 [compile]
[INFO] ├─com.jcraft:jzlib:jar:1.1.3 [compile]
[INFO] ╰─org.slf4j:slf4j-api:jar:1.7.36 [compile]

mvn eu.maveniverse.maven.plugins:toolbox:gav-tree -Dgav=org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:7.2.0.202503040940-r
[INFO] org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:jar:7.2.0.202503040940-r
[INFO] ├─org.eclipse.jgit:org.eclipse.jgit:jar:7.2.0.202503040940-r [compile]
[INFO] │ ├─com.googlecode.javaewah:JavaEWAH:jar:1.2.3 [compile]
[INFO] │ ╰─commons-codec:commons-codec:jar:1.18.0 [compile]
[INFO] ├─com.jcraft:jsch:jar:0.1.55 [compile]
[INFO] ├─com.jcraft:jzlib:jar:1.1.3 [compile]
[INFO] ╰─org.slf4j:slf4j-api:jar:1.7.36 [compile]

@mbien mbien added Upgrade Library Library (Dependency) Upgrade git [ci] enable versioning job ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) labels Apr 1, 2025
@mbien mbien added this to the NB26 milestone Apr 1, 2025
@mbien

mbien commented Apr 1, 2025

Copy link
Copy Markdown
Member Author

interesting, some versioning tests failed

 testMoveMergeRef: org.netbeans.libs.git.jgit.commands.UpdateRefTest
 testMoveMergeCommit: org.netbeans.libs.git.jgit.commands.UpdateRefTest

can reproduce locally

@mbien mbien marked this pull request as draft April 1, 2025 10:12
@mbien mbien added the do not merge Don't merge this PR, it is not ready or just demonstration purposes. label Apr 1, 2025
@neilcsmith-net

Copy link
Copy Markdown
Member

Both these use repository.getReflogReader("master"); Is JGit now picking up the default branch name from the environment?

@mbien

mbien commented Apr 1, 2025

Copy link
Copy Markdown
Member Author

Both these use repository.getReflogReader("master"); Is JGit now picking up the default branch name from the environment?

i had the same suspicion, but I believe this is still the git default. My global settings don't change it either.

@neilcsmith-net

neilcsmith-net commented Apr 1, 2025

Copy link
Copy Markdown
Member

It looks like that there are some changes with that method in 7.2 anyway, and it's deprecated although does call through to the recommended replacement. I guess the name resolution might have tightened up somehow?!

Maybe eclipse-jgit/jgit@7b8ddc2 ???

@mbien

mbien commented Apr 1, 2025

Copy link
Copy Markdown
Member Author

using findRef does work.

        Ref ref = repository.findRef("master");
        ReflogReader reflogReader = repository.getRefDatabase().getReflogReader(ref);
        assertEquals("merge " + info.getRevision() + ": Fast-forward", reflogReader.getLastEntry().getComment());

this would work too:

repository.getReflogReader("refs/heads/master")

it expects the full path now.

@mbien mbien removed the do not merge Don't merge this PR, it is not ready or just demonstration purposes. label Apr 1, 2025
@mbien mbien marked this pull request as ready for review April 1, 2025 11:39
mbien added 2 commits April 2, 2025 02:14
 - deprecation fixes
 - updated UpdateRefTest to use findRef() before calling
   getReflogReader() to avoid null. Method expects the full path now.
@mbien

mbien commented Apr 2, 2025

Copy link
Copy Markdown
Member Author

refreshing this PR so that I don't have to test two branches at the same time

@mbien

mbien commented Apr 9, 2025

Copy link
Copy Markdown
Member Author
repository.getReflogReader("refs/heads/master")

it expects the full path now.

btw getRefLogReader() was only used in this one test. Hopefully this doesn't cause other problems but everything seems to work still.

@mbien mbien merged commit bda2ccf into apache:master Apr 9, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) git [ci] enable versioning job Upgrade Library Library (Dependency) Upgrade

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants