From e3c03308dbd7179fbcd3fc0e4a19fed5792748a7 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Feb 20 2019 00:10:21 +0000
Subject: Update to latest upstream release


---

diff --git a/.gitignore b/.gitignore
index fbab2db..f5d342b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ jetty-6.1.26-src.zip
 /jetty-9.4.10.v20180503.tar.gz
 /jetty-9.4.11.v20180605.tar.gz
 /jetty-9.4.14.v20181114.tar.gz
+/jetty-9.4.15.v20190215.tar.gz
diff --git a/jetty.spec b/jetty.spec
index 2685906..84ee61c 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20181114
+%global addver  .v20190215
 
 # minimal version required to build eclipse and thermostat
 # eclipse needs: util, server, http, continuation, io, security, servlet
@@ -49,8 +49,8 @@
 %bcond_with     jp_minimal
 
 Name:           jetty
-Version:        9.4.14
-Release:        2%{addver}%{?dist}
+Version:        9.4.15
+Release:        1%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -625,6 +625,9 @@ find . -name "*.class" -exec rm {} \;
 %pom_remove_plugin -r :buildnumber-maven-plugin
 %pom_remove_plugin -r :h2spec-maven-plugin
 
+# Unnecessary pom flattening can be skipped
+%pom_remove_plugin -r :flatten-maven-plugin jetty-bom
+
 %pom_disable_module aggregates/jetty-all
 
 # Use proper groupId for apache ant
@@ -683,6 +686,9 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
 # Not currently able to build tests, so can't build benchmarks
 %pom_disable_module jetty-jmh
 
+# Distribution tests require internet access, so disable
+%pom_disable_module test-distribution tests
+
 # missing conscrypt
 %pom_disable_module jetty-alpn-conscrypt-server jetty-alpn
 %pom_disable_module jetty-alpn-conscrypt-client jetty-alpn
@@ -973,6 +979,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Tue Feb 19 2019 Mat Booth <mat.booth@redhat.com> - 9.4.15-1.v20190215
+- Update to latest upstream release
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.14-2.v20181114
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 807990a..ca2fb2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.14.v20181114.tar.gz) = 0cd0df14da6767ef67a1fa02ffdd06aa017c76c5371a055b12c82177c4931d9c5b825a18e1a7d03b556b561e6978938d229de4c11a952918e732df105999fc92
+SHA512 (jetty-9.4.15.v20190215.tar.gz) = 11fe7ae4997d1893ebcc6010c2330ec822444c86f55b0a58b0cccbc218582a3f6b4c34f389a1259f6ec5bbed3956c24c1df86b09786f2ab0aa82e29ee8f72402