diff --git a/backend/commons/pom.xml b/backend/commons/pom.xml index b085b6dffc..81b92f019c 100644 --- a/backend/commons/pom.xml +++ b/backend/commons/pom.xml @@ -23,7 +23,7 @@ org.eclipse.jgit org.eclipse.jgit - ${jgit7.version} + ${jgit.version} commons-io diff --git a/client/java-client-dependencies/pom.xml b/client/java-client-dependencies/pom.xml index b25aca5486..960e8f91f6 100644 --- a/client/java-client-dependencies/pom.xml +++ b/client/java-client-dependencies/pom.xml @@ -33,7 +33,7 @@ org.eclipse.jgit org.eclipse.jgit - ${jgit6.version} + ${jgit.version} org.slf4j diff --git a/client/java-client-osgi/java-client-osgi.bnd b/client/java-client-osgi/java-client-osgi.bnd index 863386556c..87b289891c 100644 --- a/client/java-client-osgi/java-client-osgi.bnd +++ b/client/java-client-osgi/java-client-osgi.bnd @@ -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, diff --git a/client/java-client-utils/pom.xml b/client/java-client-utils/pom.xml index a2f7a9a520..a319c0db10 100644 --- a/client/java-client-utils/pom.xml +++ b/client/java-client-utils/pom.xml @@ -28,7 +28,7 @@ org.eclipse.jgit org.eclipse.jgit - ${jgit6.version} + ${jgit.version} provided true diff --git a/medium-tests/pom.xml b/medium-tests/pom.xml index bc141c1213..edbdad60d0 100644 --- a/medium-tests/pom.xml +++ b/medium-tests/pom.xml @@ -83,7 +83,7 @@ org.eclipse.jgit org.eclipse.jgit - ${jgit7.version} + ${jgit.version} test diff --git a/pom.xml b/pom.xml index d1475586c1..19d7cd15f2 100644 --- a/pom.xml +++ b/pom.xml @@ -76,8 +76,7 @@ 2.1.7 - 6.10.1.202505221210-r - 7.2.1.202505142326-r + 7.2.1.202505142326-r 8.13.2