diff options
| -rw-r--r-- | build.gradle | 9 | ||||
| -rw-r--r-- | gradle.properties | 2 | ||||
| -rw-r--r-- | server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle index c8688dd5d0c..8b33f890c46 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,11 @@ allprojects { apply plugin: 'com.jfrog.artifactory' apply plugin: 'maven-publish' + // Global exclusion of eddsa dependency + configurations.all { + exclude group: 'net.i2p.crypto', module: 'eddsa' + } + ext.versionInSources = version ext.buildNumber = System.getProperty("buildNumber") // when no buildNumber is provided, then project version must end with '-SNAPSHOT' @@ -478,9 +483,7 @@ subprojects { dependency 'org.eclipse.jgit:org.eclipse.jgit:7.3.0.202506031305-r' dependency "org.codelibs.elasticsearch.module:analysis-common:7.17.22" dependency "org.codelibs.elasticsearch.module:reindex:7.17.22" - dependency('org.tmatesoft.svnkit:svnkit:1.10.11') { - exclude 'net.i2p.crypto:eddsa' - } + dependency('org.tmatesoft.svnkit:svnkit:1.10.11') dependency 'org.hamcrest:hamcrest:3.0' dependency 'org.jsoup:jsoup:1.20.1' // JUnit 5 diff --git a/gradle.properties b/gradle.properties index 281074ace9e..25600d23909 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,4 +16,4 @@ elasticSearchServerVersion=8.16.3 projectType=application artifactoryUrl=https://repox.jfrog.io/repox jre_release_name=jdk-17.0.13+11 -webappVersion=2025.5.0.23692 +webappVersion=2025.5.0.23948 diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java index 26f81b3b706..dfb87f7290d 100644 --- a/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java +++ b/server/sonar-server-common/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java @@ -234,9 +234,8 @@ public class WebhookCallerImplTest { @Test public void silently_catch_error_when_url_is_localhost(){ - String url = server.url("/").toString(); Webhook webhook = new Webhook(WEBHOOK_UUID, PROJECT_UUID, CE_TASK_UUID, - secure().nextAlphanumeric(40), "my-webhook", url, null); + secure().nextAlphanumeric(40), "my-webhook", "http://localhost", null); WebhookDelivery delivery = newSender(true).call(webhook, PAYLOAD); |