From 64b0d88d833fce1df5308b795736f1a3b6a64c51 Mon Sep 17 00:00:00 2001
From: thenatog <thenatog@gmail.com>
Date: Mon, 10 Jun 2019 14:55:29 -0400
Subject: [PATCH] NIFI-6330 - This closes #3534.Updated Jetty version to
 9.4.18.v20190429

NIFI-6330 - Removed jetty.version property declaration in nifi-prometheus-reporting-task pom.xml. This version should be inherited from the root pom.

NIFI-6330 - New release of Jetty came out 2 days ago. Upgraded and verified NiFi functionality again with smoke tests including ListenHTTP, secure clustering, site-to-site

Signed-off-by: Joe Witt <joewitt@apache.org>
---
 .../nifi-prometheus-reporting-task/pom.xml                      | 1 -
 pom.xml                                                         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/pom.xml b/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/pom.xml
index 55c9266f04..780d522332 100644
--- a/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/pom.xml
+++ b/nifi-nar-bundles/nifi-prometheus-bundle/nifi-prometheus-reporting-task/pom.xml
@@ -21,7 +21,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 <properties>
         <prometheus.version>0.3.0</prometheus.version>
         <yammer.metrics.version>2.2.0</yammer.metrics.version>
-        <jetty.version>9.3.8.v20160314</jetty.version>
 </properties>
 
 <artifactId>nifi-prometheus-reporting-task</artifactId>
diff --git a/pom.xml b/pom.xml
index 8d81f7f0b0..fb8301d42f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,7 +94,7 @@
         <inceptionYear>2014</inceptionYear>
         <org.slf4j.version>1.7.26</org.slf4j.version>
         <ranger.version>1.0.0</ranger.version>
-        <jetty.version>9.4.15.v20190215</jetty.version>
+        <jetty.version>9.4.19.v20190610</jetty.version>
         <jackson.version>2.9.8</jackson.version>
         <nifi.registry.version>0.4.0</nifi.registry.version>
     </properties>