From 4a2ee83d0c3293e639f23629e3580a362533b782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Mon, 18 Nov 2024 11:10:05 +0100 Subject: [PATCH] Use the version of hibernate-jenkins-pipeline-helpers configured on CI Don't configure the version in Jenkinsfile so that it's easier to upgrade next time. See https://ci.hibernate.org/manage/configure#global-untrusted-pipeline-libraries to change the (default) version globally for all projects. --- Jenkinsfile | 2 +- ci/jpa-3.2-tck.Jenkinsfile | 2 +- ci/release/Jenkinsfile | 2 +- ci/snapshot-publish.Jenkinsfile | 2 +- nightly.Jenkinsfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 63eca23c0e..4e006655e6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ import org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper /* * See https://github.com/hibernate/hibernate-jenkins-pipeline-helpers */ -@Library('hibernate-jenkins-pipeline-helpers@1.18') _ +@Library('hibernate-jenkins-pipeline-helpers') _ import org.hibernate.jenkins.pipeline.helpers.job.JobHelper @Field final String DEFAULT_JDK_VERSION = '17' diff --git a/ci/jpa-3.2-tck.Jenkinsfile b/ci/jpa-3.2-tck.Jenkinsfile index 007cc7844e..e4506d6861 100644 --- a/ci/jpa-3.2-tck.Jenkinsfile +++ b/ci/jpa-3.2-tck.Jenkinsfile @@ -1,4 +1,4 @@ -@Library('hibernate-jenkins-pipeline-helpers@1.18') _ +@Library('hibernate-jenkins-pipeline-helpers') _ // Avoid running the pipeline on branch indexing if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) { diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile index f6ffbae094..210759fc39 100644 --- a/ci/release/Jenkinsfile +++ b/ci/release/Jenkinsfile @@ -9,7 +9,7 @@ /* * See https://github.com/hibernate/hibernate-jenkins-pipeline-helpers */ -@Library('hibernate-jenkins-pipeline-helpers@1.18') _ +@Library('hibernate-jenkins-pipeline-helpers') _ import org.hibernate.jenkins.pipeline.helpers.version.Version diff --git a/ci/snapshot-publish.Jenkinsfile b/ci/snapshot-publish.Jenkinsfile index 9d831ab6c1..66b12a61d4 100644 --- a/ci/snapshot-publish.Jenkinsfile +++ b/ci/snapshot-publish.Jenkinsfile @@ -1,7 +1,7 @@ /* * See https://github.com/hibernate/hibernate-jenkins-pipeline-helpers */ -@Library('hibernate-jenkins-pipeline-helpers@1.18') _ +@Library('hibernate-jenkins-pipeline-helpers') _ // Avoid running the pipeline on branch indexing if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) { diff --git a/nightly.Jenkinsfile b/nightly.Jenkinsfile index a7f74e2a14..420122403e 100644 --- a/nightly.Jenkinsfile +++ b/nightly.Jenkinsfile @@ -13,7 +13,7 @@ import org.jenkinsci.plugins.workflow.support.steps.build.RunWrapper /* * See https://github.com/hibernate/hibernate-jenkins-pipeline-helpers */ -@Library('hibernate-jenkins-pipeline-helpers@1.18') _ +@Library('hibernate-jenkins-pipeline-helpers') _ import org.hibernate.jenkins.pipeline.helpers.job.JobHelper @Field final String DEFAULT_JDK_VERSION = '17'