Merge pull request #36 from iExecBlockchainComputing/release/1.2.1

Release/1.2.1

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [[1.2.1]](https://github.com/iExecBlockchainComputing/iexec-commons-containers/releases/tag/v1.2.1) 2023-12-19
+
+### Dependency Upgrades
+
+- Upgrade to Spring Boot 2.7.17. (#35)
+- Upgrade to `jenkins-library` 2.7.4. (#33)
+- Upgrade to `docker-java` 3.3.4. (#34)
+
 ## [[1.2.0]](https://github.com/iExecBlockchainComputing/iexec-commons-containers/releases/tag/v1.2.0) 2023-11-06
 
 ### New Features

Jenkinsfile

@@ -1,7 +1,5 @@
-@Library('[email protected].3') _
+@Library('[email protected].4') _
 buildJavaProject(
-    buildInfo: getBuildInfo(),
-    integrationTestsEnvVars: [],
     shouldPublishJars: true,
     shouldPublishDockerImages: false
 )

build.gradle

@@ -11,10 +11,10 @@ group = 'com.iexec.commons'
 ext {
     gitBranch = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim()
 
-    dockerJavaVersion = '3.2.12'
+    dockerJavaVersion = '3.3.4'
 }
 
-if (gitBranch != 'main' && gitBranch != 'master' && ! (gitBranch ==~ '(release|hotfix|support)/.*')) {
+if (gitBranch != 'main' && gitBranch != 'master' && !(gitBranch ==~ '(release|hotfix|support)/.*')) {
     version += '-NEXT-SNAPSHOT'
 }
 
@@ -34,10 +34,10 @@ repositories {
 // 'api' configuration allows to expose dependencies with 'compile' scope in pom
 // 'implementation' configuration allows to expose dependencies with 'runtime' scope in pom
 dependencies {
-    implementation platform('org.springframework.boot:spring-boot-dependencies:2.7.14')
+    implementation platform('org.springframework.boot:spring-boot-dependencies:2.7.17')
 
     // docker
-    implementation "com.github.docker-java:docker-java:${dockerJavaVersion}"
+    api "com.github.docker-java:docker-java:${dockerJavaVersion}"
     // Using zerodep until docker client stops blocking after having called
     // listContainersCmd() over httpclient5
     implementation "com.github.docker-java:docker-java-transport-zerodep:${dockerJavaVersion}"
@@ -64,8 +64,10 @@ dependencies {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
+    sourceCompatibility = "11"
+    targetCompatibility = "11"
     withJavadocJar()
     withSourcesJar()
 }

gradle.properties

@@ -1,4 +1,4 @@
-version=1.2.0
+version=1.2.1
 
 nexusUser
 nexusPassword