From 757ed4ab0f6d313d305d697e65d07773b516dac0 Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Fri, 18 Sep 2026 15:36:22 +0200 Subject: [PATCH] ci: resolve iExec JARs from jitpack.io --- Jenkinsfile | 2 +- build.gradle | 28 ++++++++++------------------ gradle.properties | 16 ++++++++-------- jitpack.yml | 2 ++ 4 files changed, 21 insertions(+), 27 deletions(-) create mode 100644 jitpack.yml diff --git a/Jenkinsfile b/Jenkinsfile index 90d1fd8df..c09c58e10 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ @Library('global-jenkins-library@support/2.7.4') _ buildJavaProject( - shouldPublishJars: true, + shouldPublishJars: false, shouldPublishDockerImages: true) diff --git a/build.gradle b/build.gradle index fb79fb25c..c25086192 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,6 @@ ext { gitTag = 'git tag --points-at HEAD'.execute().text.trim() springCloudVersion = '2025.0.2' commonsMathsVersion = '3.6.1' - testContainersVersion = '1.20.4' } if (gitTag.isEmpty()) { @@ -24,13 +23,6 @@ if (gitTag.isEmpty()) { repositories { mavenLocal() mavenCentral() - maven { - url = "https://docker-regis-adm.iex.ec/repository/maven-public/" - credentials { - username = nexusUser - password = nexusPassword - } - } maven { url = "https://jitpack.io" } @@ -44,12 +36,12 @@ dependencyManagement { dependencies { // iexec - implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion" - implementation "com.iexec.common:iexec-common:$iexecCommonVersion" - implementation "com.iexec.commons:iexec-commons-containers:$iexecCommonsContainersVersion" - implementation "com.iexec.result-proxy:iexec-result-proxy-library:$iexecResultVersion" - implementation "com.iexec.sms:iexec-sms-library:$iexecSmsVersion" - implementation "com.iexec.core:iexec-core-library:$iexecCoreVersion" + implementation "com.github.iexecblockchaincomputing:iexec-commons-poco:$iexecCommonsPocoVersion" + implementation "com.github.iexecblockchaincomputing:iexec-common:$iexecCommonVersion" + implementation "com.github.iexecblockchaincomputing:iexec-commons-containers:$iexecCommonsContainersVersion" + implementation "com.github.iexecblockchaincomputing.iexec-result-proxy:iexec-result-proxy-library:$iexecResultVersion" + implementation "com.github.iexecblockchaincomputing.iexec-sms:iexec-sms-library:$iexecSmsVersion" + implementation "com.github.iexecblockchaincomputing.iexec-core:iexec-core-library:$iexecCoreVersion" // spring implementation "org.springframework.boot:spring-boot-starter" @@ -116,7 +108,7 @@ testing { implementation "org.springframework.boot:spring-boot-starter-test" // testcontainers - implementation "org.testcontainers:junit-jupiter:$testContainersVersion" + implementation 'org.testcontainers:junit-jupiter' } } } @@ -149,10 +141,10 @@ publishing { repositories { maven { credentials { - username = nexusUser - password = nexusPassword + username = mvnRepositoryUsername + password = mvnRepositoryPassword } - url = project.hasProperty('nexusUrl') ? nexusUrl : '' + url = project.hasProperty('mvnRepositoryUrl') ? mvnRepositoryUrl : '' } } } diff --git a/gradle.properties b/gradle.properties index 58048c527..105b5bd5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,11 +1,11 @@ # x-release-please-start-version version=9.3.0 # x-release-please-end -iexecCommonsPocoVersion=5.4.0 -iexecCommonVersion=9.2.0 -iexecCommonsContainersVersion=2.0.0 -iexecResultVersion=9.1.0 -iexecSmsVersion=9.3.0 -iexecCoreVersion=9.2.1 -nexusUser -nexusPassword +iexecCommonsPocoVersion=5.5.0 +iexecCommonVersion=9.3.0 +iexecCommonsContainersVersion=2.1.0 +iexecResultVersion=9.2.0 +iexecSmsVersion=9.4.0 +iexecCoreVersion=9.4.0 +mvnRepositoryUsername +mvnRepositoryPassword diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 000000000..727c9abd3 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +jdk: + - openjdk21