From fb8c8270b323092838ec6a617b6f576896f6109b Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 16 Apr 2020 11:19:47 +1000 Subject: [PATCH] upgrade spifly to 1.2.4 and replace jdk13 build with jdk14 (#4780) Signed-off-by: olivier lamy --- Jenkinsfile | 4 ++-- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2e5ab191b26b..270223b42975 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -52,11 +52,11 @@ pipeline { } } - stage("Build / Test - JDK13") { + stage("Build / Test - JDK14") { agent { node { label 'linux' } } steps { timeout(time: 120, unit: 'MINUTES') { - mavenBuild("jdk13", "-T3 -Pmongodb clean install", "maven3", true) + mavenBuild("jdk14", "-T3 -Pmongodb clean install", "maven3", true) warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']] junit testResults: '**/target/surefire-reports/*.xml,**/target/invoker-reports/TEST*.xml' } diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 48d65d94c39e..4bfcd4ea4f83 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -159,7 +159,7 @@ org.apache.aries.spifly org.apache.aries.spifly.dynamic.bundle - 1.2.3 + 1.2.4 test