Skip to content

SLCORE-1512 Remove JGit 6 #1403

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.

Sign up for GitHub

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

SLCORE-1512 Remove JGit 6 #1403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/commons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>${jgit7.version}</version>
<version>${jgit.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down
2 changes: 1 addition & 1 deletion client/java-client-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>${jgit6.version}</version>
<version>${jgit.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
2 changes: 1 addition & 1 deletion client/java-client-osgi/java-client-osgi.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Export-Package: org.sonarsource.sonarlint.core.client.utils.*;version="${project
org.sonarsource.sonarlint.core.rpc.protocol.*;version="${project.version}",\
org.sonarsource.sonarlint.shaded.com.google.gson.*;version="${gson.version}",\
org.sonarsource.sonarlint.shaded.org.eclipse.lsp4j.jsonrpc.*;version="${lsp4j.version}",\
org.sonarsource.sonarlint.shaded.org.eclipse.jgit.*;version="${jgit6.version}",\
org.sonarsource.sonarlint.shaded.org.eclipse.jgit.*;version="${jgit.version}",\
org.sonarsource.sonarlint.shaded.org.slf4j.*;version="${slf4j.version}",\
org.sonarsource.sonarlint.shaded.io.sentry.*;version="${sentry.version}",
Import-Package: javax.annotation.*;resolution:=optional,
2 changes: 1 addition & 1 deletion client/java-client-utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>${jgit6.version}</version>
<version>${jgit.version}</version>
<!-- The core doesn't provide JGit, since some IDEs (like Eclipse) will provide it -->
<scope>provided</scope>
<optional>true</optional>
Expand Down
2 changes: 1 addition & 1 deletion medium-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
<version>${jgit7.version}</version>
<version>${jgit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
3 changes: 1 addition & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@
<system.stubs.version>2.1.7</system.stubs.version>

<!-- JGit 7 rely on Java 17 and only used by the backend, JGit 6 relying on Java 11 for the Java clients -->
<jgit6.version>6.10.1.202505221210-r</jgit6.version>
<jgit7.version>7.2.1.202505142326-r</jgit7.version>
<jgit.version>7.2.1.202505142326-r</jgit.version>
<sentry.version>8.13.2</sentry.version>

<!-- Not only used as a plug-in but also as a dependency for 'maven-shade-ext-bnd-transformer' -->
Expand Down
Loading