From 69b30ffb3ba3faf8310f1f7b908d78bfd9b83b17 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Oct 28 2020 17:40:21 +0000
Subject: Update to latest upstream release


---

diff --git a/.gitignore b/.gitignore
index f6f1673..7951491 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,4 @@
 /jetty-9.4.27.v20200227.tar.gz
 /jetty-9.4.30.v20200611.tar.gz
 /jetty-9.4.31.v20200723.tar.gz
+/jetty-9.4.33.v20201020.tar.gz
diff --git a/jetty.spec b/jetty.spec
index a2a1eea..ccf69e4 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20200723
+%global addver  .v20201020
 
 # minimal version required to build eclipse and thermostat
 # eclipse needs: util, server, http, continuation, io, security, servlet
@@ -49,8 +49,8 @@
 %bcond_without  jp_minimal
 
 Name:           jetty
-Version:        9.4.31
-Release:        3%{?dist}
+Version:        9.4.33
+Release:        1%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -618,9 +618,6 @@ find . -name "*.class" -exec rm {} \;
 %pom_xpath_inject "pom:configuration/pom:instructions" \
 "<Import-Package>sun.misc;resolution:=optional,com.sun.nio.file;resolution:=optional,*</Import-Package>"
 
-# Use proper groupId for apache ant
-%pom_xpath_replace "pom:groupId[text()='ant']" "<groupId>org.apache.ant</groupId>" jetty-ant/pom.xml
-
 %pom_remove_dep "com.sun.net.httpserver:http" jetty-http-spi
 
 %pom_change_dep -r org.mortbay.jasper:apache-jsp org.apache.tomcat:tomcat-jasper
@@ -976,6 +973,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Wed Oct 28 17:01:59 GMT 2020 Mat Booth <mat.booth@redhat.com> - 9.4.33-1
+- Update to latest upstream release
+
 * Wed Aug 19 2020 Mat Booth <mat.booth@redhat.com> - 9.4.31-3
 - Rebuild to regenerate OSGi metadata for dependency on servlet-api
 - Add patch to build against new APIs in servlet 4
diff --git a/sources b/sources
index 0cd681e..a830edc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.31.v20200723.tar.gz) = dad579fc6db1e3ed202077cf389b8114e7e1e0774969e0b2ecf097976ac28cabece0f8573ab5211358d25ff8e38bb281633224636687774f7d4e8d699e546856
+SHA512 (jetty-9.4.33.v20201020.tar.gz) = ab53c0006e3b2a4a121fc6de3687e15010d25e9066aa278712966f3723e8fe525bc3e1d466ed6e877d71783fda97b607a58414c5052667afde54acfa23b61f3e