From 29ccd97d0333454b636e38c4a4abc45aa4491652 Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Tue, 5 Jul 2022 11:54:01 +0200 Subject: [PATCH 01/11] Use jenkins-library 2.0.2 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3ccccc3fc..cfc197f49 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('global-jenkins-library@2.0.1') _ +@Library('global-jenkins-library@2.0.2') _ buildJavaProject( buildInfo: getBuildInfo(), integrationTestsEnvVars: [], From 7968ae022f613230a4be3fa4139c3b185f6fe90d Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Wed, 13 Jul 2022 12:55:16 +0200 Subject: [PATCH 02/11] Use jenkins-library 2.1.0 --- Jenkinsfile | 2 +- src/test/resources/{logback.xml => logback-spring.xml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/test/resources/{logback.xml => logback-spring.xml} (100%) diff --git a/Jenkinsfile b/Jenkinsfile index cfc197f49..b84353611 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('global-jenkins-library@2.0.2') _ +@Library('global-jenkins-library@2.1.0') _ buildJavaProject( buildInfo: getBuildInfo(), integrationTestsEnvVars: [], diff --git a/src/test/resources/logback.xml b/src/test/resources/logback-spring.xml similarity index 100% rename from src/test/resources/logback.xml rename to src/test/resources/logback-spring.xml From 69a3992f6901b04baf6bab6bfbef7f6c75fd74b6 Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Wed, 13 Jul 2022 13:08:35 +0200 Subject: [PATCH 03/11] Add docker-regis maven-public repository for dependencies resolution --- build.gradle | 11 +++++++++-- gradle.properties | 5 +++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 666ee9a52..069983aef 100644 --- a/build.gradle +++ b/build.gradle @@ -25,6 +25,13 @@ if (gitBranch != 'main' && gitBranch != 'master' && ! (gitBranch ==~ '(release|h repositories { mavenLocal() mavenCentral() + maven { + url "https://docker-regis-adm.iex.ec/repository/maven-public/" + credentials { + username nexusUser + password nexusPassword + } + } maven { url "https://nexus.intra.iex.ec/repository/maven-public/" } @@ -150,8 +157,8 @@ publishing { repositories { maven { credentials { - username project.hasProperty('nexusUser') ? nexusUser : '' - password project.hasProperty('nexusPassword') ? nexusPassword : '' + username nexusUser + password nexusPassword } url project.hasProperty('nexusUrl') ? nexusUrl : '' } diff --git a/gradle.properties b/gradle.properties index d88755550..a72872aca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,5 +3,6 @@ iexecCommonVersion=6.0.0 iexecBlockchainAdapterVersion=7.1.1 iexecResultVersion=7.1.0 iexecSmsVersion=7.1.0 -nexusUser=fake -nexusPassword=fake + +nexusUser +nexusPassword From e5eba8e1bdbce43f309658b7454c0b157a4ecc0b Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Fri, 5 Aug 2022 15:36:22 +0200 Subject: [PATCH 04/11] Use jenkins-library 2.1.1 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b84353611..ef0e319cf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('global-jenkins-library@2.1.0') _ +@Library('global-jenkins-library@2.1.1') _ buildJavaProject( buildInfo: getBuildInfo(), integrationTestsEnvVars: [], From da5d9c92702ae4ccc35fc940f12ef1b8aa441d8e Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Tue, 30 Aug 2022 14:29:46 +0200 Subject: [PATCH 05/11] Use jenkins-library 2.2.0 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ef0e319cf..eb58c6040 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('global-jenkins-library@2.1.1') _ +@Library('global-jenkins-library@2.2.0') _ buildJavaProject( buildInfo: getBuildInfo(), integrationTestsEnvVars: [], From a54c85219e9c9ebe8b447a390a41eb23eb45f11e Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Thu, 8 Dec 2022 11:28:49 +0100 Subject: [PATCH 06/11] Use iexec-common version 6.1.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a72872aca..39dcdb3d6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ version=7.1.0 -iexecCommonVersion=6.0.0 +iexecCommonVersion=6.1.0 iexecBlockchainAdapterVersion=7.1.1 iexecResultVersion=7.1.0 iexecSmsVersion=7.1.0 From d844b71b1a689b68db5e5f818f11a5aa006355e0 Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Thu, 8 Dec 2022 11:29:27 +0100 Subject: [PATCH 07/11] Use jenkins-library 2.2.3 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index eb58c6040..89896be81 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library('global-jenkins-library@2.2.0') _ +@Library('global-jenkins-library@2.2.3') _ buildJavaProject( buildInfo: getBuildInfo(), integrationTestsEnvVars: [], From 6aba67200bc8b52339ac7a33a364eedd9063017c Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Thu, 8 Dec 2022 13:46:31 +0100 Subject: [PATCH 08/11] Release version 7.2.0-rc1 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fa4ff9789..a60ec4410 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=7.1.3 +version=7.2.0-rc1 iexecCommonVersion=6.1.0 iexecBlockchainAdapterVersion=7.1.1 iexecResultVersion=7.1.0 From 7e5d34820ce858eb519cea70bfa780507d770cb1 Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Fri, 9 Dec 2022 13:22:08 +0100 Subject: [PATCH 09/11] Add CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 050aa1626..0e5febc70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this project will be documented in this file. +## [[7.2.0]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v7.2.0) 2022-11-29 + +* Increments of jenkins-library up to version 2.2.3. Enable SonarCloud analyses on branches and Pull Requests. +* Update `iexec-common` version to [6.1.0](https://github.com/iExecBlockchainComputing/iexec-common/releases/tag/v6.1.0). + ## [[7.1.2]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v7.1.2) 2022-11-29 * Update README and add CHANGELOG. From 40bc0612b682a9577bb72b30aae7b37ae607ad1c Mon Sep 17 00:00:00 2001 From: Jeremy Bernard Date: Fri, 9 Dec 2022 13:22:45 +0100 Subject: [PATCH 10/11] Set version to 7.2.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a60ec4410..d0def54f0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=7.2.0-rc1 +version=7.2.0 iexecCommonVersion=6.1.0 iexecBlockchainAdapterVersion=7.1.1 iexecResultVersion=7.1.0 From 8c9583ed64e3668faf7e352ec08c470acb45cd3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20James=20Toussaint?= <33313130+jeremyjams@users.noreply.github.com> Date: Fri, 9 Dec 2022 14:44:12 +0100 Subject: [PATCH 11/11] Add missing release in changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e5febc70..9fe942c88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ All notable changes to this project will be documented in this file. * Increments of jenkins-library up to version 2.2.3. Enable SonarCloud analyses on branches and Pull Requests. * Update `iexec-common` version to [6.1.0](https://github.com/iExecBlockchainComputing/iexec-common/releases/tag/v6.1.0). +## [[7.1.3]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v7.1.3) 2022-11-29 + +* Bump version to 7.1.3. + ## [[7.1.2]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v7.1.2) 2022-11-29 * Update README and add CHANGELOG.