From 1a1da813ef86fd5339dc833461c3705859806136 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: May 01 2019 11:42:44 +0000
Subject: Update to latest upstream release

Remove some ancient obsoletes

---

diff --git a/.gitignore b/.gitignore
index 89e48ab..246e82c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@ jetty-6.1.26-src.zip
 /jetty-9.4.14.v20181114.tar.gz
 /jetty-9.4.15.v20190215.tar.gz
 /jetty-9.4.17.v20190418.tar.gz
+/jetty-9.4.18.v20190429.tar.gz
diff --git a/jetty.spec b/jetty.spec
index 1cf19fc..ff0c82b 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20190418
+%global addver  .v20190429
 
 # minimal version required to build eclipse and thermostat
 # eclipse needs: util, server, http, continuation, io, security, servlet
@@ -49,7 +49,7 @@
 %bcond_with     jp_minimal
 
 Name:           jetty
-Version:        9.4.17
+Version:        9.4.18
 Release:        1%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
@@ -207,20 +207,12 @@ Provides:       group(%username) = %jtuid
 Provides:       user(%username)  = %jtuid
 %endif # without jp_minimal
 
-Obsoletes:      %{name}-manual < 9.4.0-0.4
-Obsoletes:      %{name}-ajp < 9.4.0-0.4
-Obsoletes:      %{name}-nested < 9.4.0-0.4
-Obsoletes:      %{name}-overlay-deployer < 9.4.0-0.4
-Obsoletes:      %{name}-policy < 9.4.0-0.4
-Obsoletes:      %{name}-websocket-mux-extension < 9.4.0-0.4
-Obsoletes:      %{name}-runner < 9.4.0-0.4
-Obsoletes:      %{name}-osgi-npn < 9.4.0-0.4
+# (Added in F25)
 Obsoletes:      %{name}-monitor < 9.4.0-0.4
-
 # Hazelcast in Fedora is too old for jetty to build against (Added in F29)
-Obsoletes:      %{name}-hazelcast < %{version}-%{release}
+Obsoletes:      %{name}-hazelcast < 9.4.18-1
 # Infinispan in Fedora is too old for jetty to build against (Added in F31)
-Obsoletes:      %{name}-infinispan < %{version}-%{release}
+Obsoletes:      %{name}-infinispan < 9.4.18-1
 
 %description
 %global desc \
@@ -265,7 +257,6 @@ Summary:        http-spi module for Jetty
 
 %package        io
 Summary:        io module for Jetty
-Obsoletes:      %{name}-websocket < 9.4.0-0.4
 
 %description    io
 %{extdesc} %{summary}.
@@ -974,6 +965,10 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Wed May 01 2019 Mat Booth <mat.booth@redhat.com> - 9.4.18-1.v20190429
+- Update to latest upstream release
+- Remove some ancient obsoletes
+
 * Thu Apr 25 2019 Mat Booth <mat.booth@redhat.com> - 9.4.17-1.v20190418
 - Update to latest upstream release
 - Stop building and obsolete the infinispan module
diff --git a/sources b/sources
index 20d2f47..75d6e58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.17.v20190418.tar.gz) = a5a122fcd076adbc46550eb0d66fba7d10a1c28202b20b5feff92acc6756e53171037842da242238da6a19721eb6b0375b46d71bdff6ab112dd1876872e4fd2c
+SHA512 (jetty-9.4.18.v20190429.tar.gz) = 2fa2f62cb091e3b13dfcdd9225fd578acfe733d87dfc834f6d0fbccce8c44730c026e0680e8ddf28ebd71449fad4102c900b7a2d6b99e1b4799c8865c1fcd358