Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
def JDK_NAME = env.JDK_NAME ?: 'JDK 1.8 (latest)'
def JDK_NAME = env.JDK_NAME ?: 'JDK 21'

def MAVEN_PARAMS = "-U -B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2"

Expand Down
60 changes: 3 additions & 57 deletions Jenkinsfile.daily
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@

def LOCAL_REPOSITORY = env.LOCAL_REPOSITORY ?: '/home/jenkins/jenkins-slave/maven-repositories/0'
def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
def BUILD_JDK_NAME = env.JDK_NAME ?: 'JDK 1.8 (latest)'
def BUILD_JDK_NAME = env.JDK_NAME ?: 'JDK 21'

def MAVEN_PARAMS = "-U -B -e -fae -V -Dmaven.repo.local=${LOCAL_REPOSITORY} -Dnoassembly -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2"

def jdk9_result, jdk10_result, jdk11_result, karaf_itests_result, spring_boot_itests_result
def karaf_itests_result, spring_boot_itests_result

pipeline {

Expand Down Expand Up @@ -84,68 +84,14 @@ pipeline {
}
}

stage('Test JDK 9') {
tools {
jdk 'JDK 1.9 (latest)'
}
steps {
script {
jdk9_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
}
}
post {
always {
junit allowEmptyResults: true, testResults: '**/target/surefire-reports/*.xml'
junit allowEmptyResults: true, testResults: '**/target/failsafe-reports/*.xml'
sh "find . -path '*/target/surefire-reports/*' -delete -o -path '*/target/failsafe-reports/*' -delete"
}
}
}

stage('Test JDK 10') {
tools {
jdk 'JDK 10 (latest)'
}
steps {
script {
jdk10_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
}
}
post {
always {
junit allowEmptyResults: true, testResults: '**/target/surefire-reports/*.xml'
junit allowEmptyResults: true, testResults: '**/target/failsafe-reports/*.xml'
sh "find . -path '*/target/surefire-reports/*' -delete -o -path '*/target/failsafe-reports/*' -delete"
}
}
}

stage('Test JDK 11') {
tools {
jdk 'JDK 11 (latest)'
}
steps {
script {
jdk11_result = sh script: "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true test", returnStatus: true
}
}
post {
always {
junit allowEmptyResults: true, testResults: '**/target/surefire-reports/*.xml'
junit allowEmptyResults: true, testResults: '**/target/failsafe-reports/*.xml'
sh "find . -path '*/target/surefire-reports/*' -delete -o -path '*/target/failsafe-reports/*' -delete"
}
}
}

}

post {
always {
script {
echo "Karaf Itests result is ${karaf_itests_result}"
echo "Spring-boot Itests result is ${spring_boot_itests_result}"
currentBuild.result = jdk9_result == 0 && jdk10_result == 0 && jdk11_result == 0 ? 'SUCCESS' : 'FAILURE'
currentBuild.result = karaf_itests_result == 0 && spring_boot_itests_result == 0 ? 'SUCCESS' : 'FAILURE'
}
}
}
Expand Down
92 changes: 0 additions & 92 deletions Jenkinsfile.jdk12

This file was deleted.

2 changes: 1 addition & 1 deletion Jenkinsfile.jdk11 → Jenkinsfile.jdk21
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu'
def JDK_NAME = env.JDK_NAME ?: 'JDK 11 (latest)'
def JDK_NAME = env.JDK_NAME ?: 'JDK 21'

def MAVEN_PARAMS = "-U -B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2"

Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile.karaf
Original file line number Diff line number Diff line change
Expand Up @@ -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 1.8 (latest)'
def JDK_NAME = env.JDK_NAME ?: 'JDK 21'

def MAVEN_PARAMS = '-U -B -e -fae -V -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2'

Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile.karaf.jdk11 → Jenkinsfile.karaf.jdk21
Original file line number Diff line number Diff line change
Expand Up @@ -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 21'

def MAVEN_PARAMS = '-U -B -e -fae -V -Dmaven.repo.local=/home/jenkins/.m2/repository -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2'

Expand Down
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,12 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<site-repo-url>scpexe://people.apache.org/www/camel.apache.org/maven/</site-repo-url>
<jdk.version>1.8</jdk.version>
<jdk.version>21</jdk.version>
<compiler.fork>false</compiler.fork>

<maven-compiler-plugin-version>3.8.1</maven-compiler-plugin-version>
<maven-compiler-plugin-version>3.11.0</maven-compiler-plugin-version>
<maven-javadoc-plugin-version>3.0.1</maven-javadoc-plugin-version>
<maven-surefire-plugin-version>3.0.0-M4</maven-surefire-plugin-version>
<maven-surefire-plugin-version>3.1.2</maven-surefire-plugin-version>
<!-- we need to override the version inherited from Apache POM for modules that use this POM as parent -->
<surefire.version>${maven-surefire-plugin-version}</surefire.version>

Expand Down