From d681f108536442f29b6bde54042e56220ad2bc82 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <oliver.lamy@gmail.com>
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 <oliver.lamy@gmail.com>
---
 Jenkinsfile                        | 4 ++--
 jetty-osgi/test-jetty-osgi/pom.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4477293c51e..2f39121af28 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,11 +40,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 01be0b6dfdb..18f4c1d8c9b 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -182,7 +182,7 @@
     <dependency>
       <groupId>org.apache.aries.spifly</groupId>
       <artifactId>org.apache.aries.spifly.dynamic.bundle</artifactId>
-      <version>1.2.3</version>
+      <version>1.2.4</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>