From 756d17d5429ced57e0798dd9f60f90d36eb0b9c3 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Mon, 18 Jan 2021 21:48:21 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/jetty.git#e441c1ffb3dcb7f71d93ebf4fe65a034a7a27bb1
---
 .gitignore |  2 ++
 jetty.spec | 34 +++++++++++++++++-----------------
 sources    |  2 +-
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index f6f1673..f681396 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,3 +65,5 @@
 /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
+/jetty-9.4.36.v20210114.tar.gz
diff --git a/jetty.spec b/jetty.spec
index a2a1eea..94de261 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20200723
+%global addver  .v20210114
 
 # 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.36
+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
@@ -233,7 +233,6 @@ Obsoletes:      %{name}-rewrite < 9.4.20-1
 Obsoletes:      %{name}-servlets < 9.4.20-1
 Obsoletes:      %{name}-start < 9.4.20-1
 Obsoletes:      %{name}-unixsocket < 9.4.20-1
-Obsoletes:      %{name}-util-ajax < 9.4.20-1
 Obsoletes:      %{name}-websocket-api < 9.4.20-1
 Obsoletes:      %{name}-websocket-client < 9.4.20-1
 Obsoletes:      %{name}-websocket-common < 9.4.20-1
@@ -339,6 +338,12 @@ License:        (ASL 2.0 or EPL-1.0) and MIT
 %description    util
 %{extdesc} %{summary}.
 
+%package        util-ajax
+Summary:        util-ajax module for Jetty
+
+%description    util-ajax
+%{extdesc} %{summary}.
+
 %package        webapp
 Summary:        webapp module for Jetty
 
@@ -466,12 +471,6 @@ Summary:        unixsocket module for Jetty
 %description    unixsocket
 %{extdesc} %{summary}.
 
-%package        util-ajax
-Summary:        util-ajax module for Jetty
-
-%description    util-ajax
-%{extdesc} %{summary}.
-
 %package        websocket-api
 Summary:        websocket-api module for Jetty
 
@@ -595,9 +594,8 @@ find . -name "*.class" -exec rm {} \;
 
 # Plugins irrelevant or harmful to building the package
 %pom_remove_plugin -r :maven-checkstyle-plugin
-%pom_remove_plugin -r :findbugs-maven-plugin
+%pom_remove_plugin -r :spotbugs-maven-plugin
 %pom_remove_plugin -r :maven-enforcer-plugin
-%pom_remove_plugin -r :clirr-maven-plugin
 %pom_remove_plugin -r :maven-eclipse-plugin
 %pom_remove_plugin -r :maven-pmd-plugin
 %pom_remove_plugin -r :license-maven-plugin
@@ -618,9 +616,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
@@ -715,7 +710,6 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 %pom_disable_module jetty-fcgi
 %pom_disable_module jetty-websocket
 %pom_disable_module jetty-servlets
-%pom_disable_module jetty-util-ajax
 %pom_disable_module apache-jsp
 %pom_disable_module apache-jstl
 %pom_disable_module jetty-maven-plugin
@@ -904,6 +898,7 @@ exit 0
 %files servlet -f .mfiles-jetty-servlet
 %files util -f .mfiles-jetty-util
 %license LICENSE NOTICE.txt LICENSE-MIT
+%files util-ajax -f .mfiles-jetty-util-ajax
 %files webapp -f .mfiles-jetty-webapp
 %files jmx -f .mfiles-jetty-jmx
 %files xml -f .mfiles-jetty-xml
@@ -954,7 +949,6 @@ exit 0
 %files servlets -f .mfiles-jetty-servlets
 %files start -f .mfiles-jetty-start
 %files unixsocket -f .mfiles-jetty-unixsocket
-%files util-ajax -f .mfiles-jetty-util-ajax
 %files websocket-api -f .mfiles-websocket-api
 %files websocket-client -f .mfiles-websocket-client
 %files websocket-common -f .mfiles-websocket-common
@@ -976,6 +970,12 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Mon Jan 18 2021 Mat Booth <mat.booth@redhat.com> - 9.4.36-1
+- Update to latest upstream release
+
+* Wed Oct 28 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..3ff5250 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.31.v20200723.tar.gz) = dad579fc6db1e3ed202077cf389b8114e7e1e0774969e0b2ecf097976ac28cabece0f8573ab5211358d25ff8e38bb281633224636687774f7d4e8d699e546856
+SHA512 (jetty-9.4.36.v20210114.tar.gz) = f05be126a3a2e2956103f2eb4838dfbe65db12b0288bfc78dfb40fd307afed24f885ab8a3bb5b60421ee69678cc9a6f3b3e6ba10873c06053b60cca0ba834300