Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrading jgit to 7.0.0.202409031743-r #7851

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from

Conversation

lahodaj
Copy link
Contributor

@lahodaj lahodaj commented Oct 8, 2024

As a draft for now, needs testing. The main reason for the upgrade is that it seems this version supports git worktrees, at least partially.

@lahodaj lahodaj added Upgrade Library Library (Dependency) Upgrade git [ci] enable versioning job labels Oct 8, 2024
@lahodaj lahodaj added this to the NB24 milestone Oct 8, 2024
@lahodaj lahodaj requested a review from mbien October 8, 2024 20:26
@mbien mbien added the ci:dev-build [ci] produce a dev-build zip artifact (7 days expiration, see link on workflow summary page) label Oct 8, 2024
@mbien
Copy link
Member

mbien commented Oct 8, 2024

thanks, I read the release notes for jgit 7.0.0 a while ago but never got into updating it.

comparing it with 151d4d2, the project.xmls and ignore-overlaps needs to be updated too I believe. We removed a lot of deprecations in past - if the 7.0 release applies without code changes, it means we didn't overlook anything which would be great.

note: since this bumps the lang level of the lib wrappers to JDK 17, we might want to bump ide/git and ide/libs.git too for informational purposes which are at 11 atm (since they directly depend on the wrappers and are plain old nb modules which have to declare javac.release explicitly).

@mbien mbien added the Upgrade JDK Upgrade to the JDK requirements of a module. label Oct 8, 2024
@mbien
Copy link
Member

mbien commented Oct 8, 2024

for future reference the dependency trees:

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.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.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.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]

note: last time I tried, I couldn't update bouncycastle #7569, the jsch is locked too and tracked tracked via #7572

jgit 6.10:

mvn eu.maveniverse.maven.plugins:toolbox:gav-tree -Dgav=org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r                                                                                                  
[INFO] org.eclipse.jgit:org.eclipse.jgit:jar:6.10.0.202406032230-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.0 [compile]
mvn eu.maveniverse.maven.plugins:toolbox:gav-tree -Dgav=org.eclipse.jgit:org.eclipse.jgit.gpg.bc:6.10.0.202406032230-r
[INFO] org.eclipse.jgit:org.eclipse.jgit.gpg.bc:jar:6.10.0.202406032230-r
[INFO] ├─org.eclipse.jgit:org.eclipse.jgit:jar:6.10.0.202406032230-r [compile]
[INFO] │ ├─com.googlecode.javaewah:JavaEWAH:jar:1.2.3 [compile]
[INFO] │ ╰─commons-codec:commons-codec:jar:1.17.0 [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.lfs:6.10.0.202406032230-r 
[INFO] org.eclipse.jgit:org.eclipse.jgit.lfs:jar:6.10.0.202406032230-r
[INFO] ├─org.eclipse.jgit:org.eclipse.jgit:jar:6.10.0.202406032230-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.0 [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.ssh.jsch:6.10.0.202406032230-r 
[INFO] org.eclipse.jgit:org.eclipse.jgit.ssh.jsch:jar:6.10.0.202406032230-r
[INFO] ├─org.eclipse.jgit:org.eclipse.jgit:jar:6.10.0.202406032230-r [compile]
[INFO] │ ├─com.googlecode.javaewah:JavaEWAH:jar:1.2.3 [compile]
[INFO] │ ╰─commons-codec:commons-codec:jar:1.17.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]

@lahodaj
Copy link
Contributor Author

lahodaj commented Oct 9, 2024

(As a note to myself - Git/Diff/To HEAD does not seem to work with worktrees, even with this upgrade. It is a bit surprising to me, as the line marks in the editor do work.)

Copy link
Member

@mbien mbien left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changes look good to me, I did also run some smoke testing e.g git init, commits, history, diff, cherry pick and clone and everything worked fine

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 JDK Upgrade to the JDK requirements of a module. Upgrade Library Library (Dependency) Upgrade
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants