This is an automated email from the ASF dual-hosted git repository.
fmariani pushed a commit to branch camel-spring-boot-4.14.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/camel-spring-boot-4.14.x by
this push:
new 4d4122ea2b8 Handle Jenkins JDK Version on each branch
4d4122ea2b8 is described below
commit 4d4122ea2b869f7587c6fbcf50efab7a7360f8af
Author: Croway <[email protected]>
AuthorDate: Thu Mar 5 11:01:47 2026 +0100
Handle Jenkins JDK Version on each branch
---
Jenkinsfile.sb | 2 +-
Jenkinsfile.sb.deploy | 4 +--
Jenkinsfile.sb.jdk17 | 89 ---------------------------------------------------
3 files changed, 2 insertions(+), 93 deletions(-)
diff --git a/Jenkinsfile.sb b/Jenkinsfile.sb
index c65b88af2f8..f6f5e33e6e5 100644
--- a/Jenkinsfile.sb
+++ b/Jenkinsfile.sb
@@ -19,7 +19,7 @@
def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?:
'/home/jenkins/jenkins-slave/maven-repositories/0'
def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
-def JDK_NAME = env.JDK_NAME ?: 'jdk_11_latest'
+def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
def MAVEN_PARAMS = '-U -B -e -fae -V
-Dmaven.repo.local=/home/jenkins/.m2/repository -Dmaven.compiler.fork=true'
diff --git a/Jenkinsfile.sb.deploy b/Jenkinsfile.sb.deploy
index c0302898706..b496976a95e 100644
--- a/Jenkinsfile.sb.deploy
+++ b/Jenkinsfile.sb.deploy
@@ -55,9 +55,7 @@ pipeline {
stage('Build & Deploy') {
when {
anyOf {
- branch 'main'
- branch 'camel-spring-boot-4.8.x'
- branch 'camel-spring-boot-4.4.x'
+ branch 'camel-spring-boot-4.14.x'
}
}
steps {
diff --git a/Jenkinsfile.sb.jdk17 b/Jenkinsfile.sb.jdk17
deleted file mode 100644
index f6f5e33e6e5..00000000000
--- a/Jenkinsfile.sb.jdk17
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?:
'/home/jenkins/jenkins-slave/maven-repositories/0'
-def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
-def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest'
-
-def MAVEN_PARAMS = '-U -B -e -fae -V
-Dmaven.repo.local=/home/jenkins/.m2/repository -Dmaven.compiler.fork=true'
-
-def spring_boot_itests_result
-
-pipeline {
-
- agent {
- label AGENT_LABEL
- }
-
- triggers {
- cron('@daily')
- }
-
- tools {
- jdk JDK_NAME
- }
-
- environment {
- MAVEN_SKIP_RC = true
- }
-
- options {
- buildDiscarder(
- logRotator(artifactNumToKeepStr: '5', numToKeepStr: '10')
- )
- disableConcurrentBuilds()
- }
-
- parameters {
- booleanParam(name: 'CLEAN', defaultValue: true, description: 'Perform
the build in clean workspace')
- }
-
- stages {
-
- stage('Clean workspace') {
- when {
- expression { params.CLEAN }
- }
- steps {
- sh 'git clean -fdx'
- }
- }
-
- stage('Build') {
- steps {
- script {
- spring_boot_itests_result = sh script: "./mvnw
$MAVEN_PARAMS -Dmaven.test.failure.ignore=true clean install", returnStatus:
true
- }
- }
- post {
- always {
- junit allowEmptyResults: true, testResults:
'**/target/surefire-reports/*.xml'
- }
- }
- }
- }
-
- post {
- always {
- script {
- currentBuild.result = spring_boot_itests_result == 0 ?
'SUCCESS' : 'FAILURE'
- }
- }
- }
-}
