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

SLCORE-1029: Shade/relocate JGit into OSGi bundle #1151

Merged
merged 2 commits into from
Nov 7, 2024

Conversation

thahnen
Copy link
Member

@thahnen thahnen commented Nov 6, 2024

SLCORE-1029

Shading/relocating JGit (and its required dependency SLF4J) into the OSGi bundle in order to work properly on Eclipse again for the patch release 10.9.1 planned, see SonarSource/sonarlint-eclipse#761.
On SonarLint for Eclipse the incompatible dependency with EGit/JGit (bundled with the IDE, not from us, requiring Java 17 now) is dropped and replaced by this.

In order to satisfy the pipeline gods a test was fixed in a separate cherry-picked commit for ITs against SQ DEV.

thahnen and others added 2 commits November 6, 2024 16:43
In order for SonarLint for Eclipse to make use of the same JGit version as SonarLint CORE uses, we shade/relocate it into the OSGi bundle as well.
Copy link

sonarqube-next bot commented Nov 6, 2024

@thahnen thahnen marked this pull request as ready for review November 7, 2024 10:25
Copy link
Member

@nquinquenel nquinquenel left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@kirill-knize-sonarsource kirill-knize-sonarsource left a comment

Choose a reason for hiding this comment

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

LGTM

@thahnen thahnen merged commit 4c58564 into branch-10.7 Nov 7, 2024
15 checks passed
@thahnen thahnen deleted the fix/tha/SLCORE-1029_JGit branch November 7, 2024 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants