diff --git a/Jenkinsfile b/Jenkinsfile index 90d1fd8d..c09c58e1 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 d0f1b9bc..06e6a2b5 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,6 @@ ext { springCloudVersion = '2025.0.2' jjwtVersion = '0.11.5' mongockVersion = '5.4.0' - testContainersVersion = '1.20.4' } allprojects { @@ -24,13 +23,6 @@ allprojects { repositories { mavenLocal() mavenCentral() - maven { - url = "https://docker-regis-adm.iex.ec/repository/maven-public/" - credentials { - username = nexusUser - password = nexusPassword - } - } maven { url = "https://jitpack.io" } } java { @@ -54,11 +46,11 @@ dependencyManagement { dependencies { // iexec - implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion" - implementation "com.iexec.common:iexec-common:$iexecCommonVersion" - implementation "com.iexec.blockchain:iexec-blockchain-adapter-api-library:$iexecBlockchainAdapterVersion" - implementation "com.iexec.result-proxy:iexec-result-proxy-library:$iexecResultVersion" - implementation "com.iexec.sms:iexec-sms-library:$iexecSmsVersion" + implementation "com.github.iexecblockchaincomputing:iexec-commons-poco:$iexecCommonsPocoVersion" + implementation "com.github.iexecblockchaincomputing:iexec-common:$iexecCommonVersion" + implementation "com.github.iexecblockchaincomputing.iexec-blockchain-adapter-api:iexec-blockchain-adapter-api-library:$iexecBlockchainAdapterVersion" + implementation "com.github.iexecblockchaincomputing.iexec-result-proxy:iexec-result-proxy-library:$iexecResultVersion" + implementation "com.github.iexecblockchaincomputing.iexec-sms:iexec-sms-library:$iexecSmsVersion" implementation project(':iexec-core-library') implementation project(':iexec-task-api') @@ -125,8 +117,8 @@ testing { implementation 'org.springframework.boot:spring-boot-starter-test' // mongo - implementation "org.testcontainers:junit-jupiter:$testContainersVersion" - implementation "org.testcontainers:mongodb:$testContainersVersion" + implementation 'org.testcontainers:junit-jupiter' + implementation 'org.testcontainers:mongodb' } } } @@ -160,10 +152,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 36a2b19a..c0317e89 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ # x-release-please-start-version version=9.3.0 # x-release-please-end -iexecCommonsPocoVersion=5.4.1 -iexecCommonVersion=9.2.0 -iexecBlockchainAdapterVersion=9.0.4 -iexecResultVersion=9.1.0 -iexecSmsVersion=9.3.0 -nexusUser -nexusPassword +iexecCommonsPocoVersion=5.5.0 +iexecCommonVersion=9.3.0 +iexecBlockchainAdapterVersion=9.1.0 +iexecResultVersion=9.2.0 +iexecSmsVersion=9.4.0 +mvnRepositoryUsername +mvnRepositoryPassword diff --git a/iexec-core-library/build.gradle b/iexec-core-library/build.gradle index c24706bb..8e10f773 100644 --- a/iexec-core-library/build.gradle +++ b/iexec-core-library/build.gradle @@ -8,8 +8,8 @@ plugins { dependencies { implementation platform("org.springframework.boot:spring-boot-dependencies:3.5.8") - implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion" - implementation "com.iexec.common:iexec-common:$iexecCommonVersion" + implementation "com.github.iexecblockchaincomputing:iexec-commons-poco:$iexecCommonsPocoVersion" + implementation "com.github.iexecblockchaincomputing:iexec-common:$iexecCommonVersion" } java { @@ -54,10 +54,10 @@ publishing { repositories { maven { credentials { - username = nexusUser - password = nexusPassword + username = mvnRepositoryUsername + password = mvnRepositoryPassword } - url = project.hasProperty("nexusUrl") ? project.nexusUrl : '' + url = project.hasProperty("mvnRepositoryUrl") ? mvnRepositoryUrl : '' } } } diff --git a/iexec-task-api/build.gradle b/iexec-task-api/build.gradle index 95e68fe5..3e834632 100644 --- a/iexec-task-api/build.gradle +++ b/iexec-task-api/build.gradle @@ -8,8 +8,8 @@ plugins { dependencies { implementation platform("org.springframework.boot:spring-boot-dependencies:3.5.8") - implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion" - implementation "com.iexec.common:iexec-common:$iexecCommonVersion" + implementation "com.github.iexecblockchaincomputing:iexec-commons-poco:$iexecCommonsPocoVersion" + implementation "com.github.iexecblockchaincomputing:iexec-common:$iexecCommonVersion" } java { @@ -51,10 +51,10 @@ publishing { repositories { maven { credentials { - username = nexusUser - password = nexusPassword + username = mvnRepositoryUsername + password = mvnRepositoryPassword } - url = project.hasProperty("nexusUrl") ? project.nexusUrl : '' + url = project.hasProperty("mvnRepositoryUrl") ? mvnRepositoryUrl : '' } } } diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 00000000..727c9abd --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,2 @@ +jdk: + - openjdk21