Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@Library('global-jenkins-library@support/2.7.4') _
buildJavaProject(
shouldPublishJars: true,
shouldPublishJars: false,
shouldPublishDockerImages: true)
28 changes: 10 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ ext {
springCloudVersion = '2025.0.2'
jjwtVersion = '0.11.5'
mongockVersion = '5.4.0'
testContainersVersion = '1.20.4'
}

allprojects {
Expand All @@ -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 {
Expand All @@ -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')

Expand Down Expand Up @@ -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'
}
}
}
Expand Down Expand Up @@ -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 : ''
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions iexec-core-library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 : ''
}
}
}
10 changes: 5 additions & 5 deletions iexec-task-api/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 : ''
}
}
}
2 changes: 2 additions & 0 deletions jitpack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
jdk:
- openjdk21
Loading