Merge pull request #107 from iExecBlockchainComputing/feature/jenkins-library-2.7.4

Use `jenkins-library` 2.7.4

Author: jbern0rd

CHANGELOG.md

@@ -8,6 +8,10 @@ All notable changes to this project will be documented in this file.
 
 - Add and use a non-root user in the dockerfile. (#106)
 
+### Dependency Upgrades
+
+- Upgrade to `jenkins-library` 2.7.4. (#107)
+
 ## [[8.2.0]](https://github.com/iExecBlockchainComputing/iexec-result-proxy/releases/tag/v8.2.0) 2023-09-28
 
 ### New Features

Jenkinsfile

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

build.gradle

@@ -38,8 +38,10 @@ allprojects {
     }
     java {
         toolchain {
-            languageVersion.set(JavaLanguageVersion.of(11))
+            languageVersion.set(JavaLanguageVersion.of(17))
         }
+        sourceCompatibility = "11"
+        targetCompatibility = "11"
     }
 }
 
@@ -130,14 +132,13 @@ publishing {
     }
 }
 
-ext.jarPathForOCI  = relativePath(tasks.bootJar.outputs.files.singleFile)
+ext.jarPathForOCI = relativePath(tasks.bootJar.outputs.files.singleFile)
 ext.gitShortCommit = 'git rev-parse --short=8 HEAD'.execute().text.trim()
-ext.ociImageName   = 'local/' + ['bash', '-c', 'basename $(git config --get remote.origin.url) .git'].execute().text.trim()
+ext.ociImageName = 'local/' + ['bash', '-c', 'basename $(git config --get remote.origin.url) .git'].execute().text.trim()
 
 tasks.register('buildImage', Exec) {
-    group       'Build'
+    group 'Build'
     description 'Builds an OCI image from a Dockerfile.'
-    dependsOn   tasks.bootJar
-    commandLine ("sh", "-c", "docker build --build-arg jar=$jarPathForOCI -t $ociImageName:$gitShortCommit ."
-            + " && docker tag $ociImageName:$gitShortCommit $ociImageName:dev")
+    dependsOn tasks.bootJar
+    commandLine 'docker', 'build', '--build-arg', 'jar=' + jarPathForOCI, '-t', ociImageName + ':dev', '.'
 }

iexec-result-proxy-library/build.gradle

@@ -13,6 +13,8 @@ dependencies {
 }
 
 java {
+    sourceCompatibility = "11"
+    targetCompatibility = "11"
     withJavadocJar()
     withSourcesJar()
 }