From 1a1757cd12d893afde45ac10681b8759be31fe18 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 1 Feb 2019 04:24:54 +0000
Subject: [PATCH 01/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index 15b7dea..2685906 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.14
-Release:        1%{addver}%{?dist}
+Release:        2%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -973,6 +973,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* 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
+
 * Wed Dec 05 2018 Mat Booth <mat.booth@redhat.com> - 9.4.14-1.v20181114
 - Update to upstream version 9.4.14.v20181114
 - Stop building and obsolete the hazelcast module

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

---
 .gitignore |  1 +
 jetty.spec | 15 ++++++++++++---
 sources    |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

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

From 880203df1686f451fa86a0b3065851521adad06b Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 25 Apr 2019 16:13:05 +0100
Subject: [PATCH 03/43] Update to latest upstream release Stop building and
 obsolete the infinispan module

---
 .gitignore                                    |  1 +
 ...llow-building-with-ASM6-on-Fedora-29.patch | 53 -------------------
 jetty.spec                                    | 39 +++++++-------
 sources                                       |  2 +-
 4 files changed, 21 insertions(+), 74 deletions(-)
 delete mode 100644 0002-Allow-building-with-ASM6-on-Fedora-29.patch

diff --git a/.gitignore b/.gitignore
index f5d342b..89e48ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@ jetty-6.1.26-src.zip
 /jetty-9.4.11.v20180605.tar.gz
 /jetty-9.4.14.v20181114.tar.gz
 /jetty-9.4.15.v20190215.tar.gz
+/jetty-9.4.17.v20190418.tar.gz
diff --git a/0002-Allow-building-with-ASM6-on-Fedora-29.patch b/0002-Allow-building-with-ASM6-on-Fedora-29.patch
deleted file mode 100644
index 3bf22f2..0000000
--- a/0002-Allow-building-with-ASM6-on-Fedora-29.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 743dedbd36be295bcc4952611cc89c577ec0a693 Mon Sep 17 00:00:00 2001
-From: Mat Booth <mat.booth@redhat.com>
-Date: Thu, 6 Dec 2018 09:49:35 +0000
-Subject: [PATCH 2/2] Allow building with ASM6 on Fedora <= 29
-
----
- .../org/eclipse/jetty/annotations/AnnotationParser.java  | 9 ++-------
- .../eclipse/jetty/osgi/annotations/AnnotationParser.java | 2 +-
- 2 files changed, 3 insertions(+), 8 deletions(-)
-
-diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
-index a23b685..832ae20 100644
---- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
-+++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
-@@ -69,8 +69,8 @@ import org.objectweb.asm.Opcodes;
- public class AnnotationParser
- {
-     private static final Logger LOG = Log.getLogger(AnnotationParser.class);
--    private static final int ASM_OPCODE_VERSION = Opcodes.ASM7; //compatibility of api
--    private static final String ASM_OPCODE_VERSION_STR = "ASM7";
-+    private static final int ASM_OPCODE_VERSION = Opcodes.ASM6; //compatibility of api
-+    private static final String ASM_OPCODE_VERSION_STR = "ASM6";
-     
-     /**
-      * Map of classnames scanned and the first location from which scan occurred
-@@ -115,11 +115,6 @@ public class AnnotationParser
-                         asmVersion = Opcodes.ASM6;
-                         break;
-                     }
--                    case 7:
--                    {
--                        asmVersion = Opcodes.ASM7;
--                        break;
--                    }
-                     default:
-                     {
-                         LOG.warn("Unrecognized ASM version, assuming {}", ASM_OPCODE_VERSION_STR);
-diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
-index 00f0919..1350eb4 100644
---- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
-+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/annotations/AnnotationParser.java
-@@ -49,7 +49,7 @@ public class AnnotationParser extends org.eclipse.jetty.annotations.AnnotationPa
-     
-     public AnnotationParser(int javaPlatform)
-     {
--        super(javaPlatform, Opcodes.ASM7);
-+        super(javaPlatform, Opcodes.ASM6);
-     }
-     
-     /**
--- 
-2.19.1
-
diff --git a/jetty.spec b/jetty.spec
index 84ee61c..1cf19fc 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20190215
+%global addver  .v20190418
 
 # 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.15
+Version:        9.4.17
 Release:        1%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
@@ -64,7 +64,6 @@ Source5:        %{name}.service
 Source6:        LICENSE-MIT
 
 Patch1:         0001-Fedora-jetty.home.patch
-Patch2:         0002-Allow-building-with-ASM6-on-Fedora-29.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(javax.servlet:javax.servlet-api)
@@ -116,7 +115,6 @@ BuildRequires:  mvn(org.eclipse.jetty.toolchain:jetty-schemas)
 BuildRequires:  mvn(org.eclipse.jetty.toolchain:jetty-test-helper)
 BuildRequires:  mvn(org.eclipse.osgi:org.eclipse.osgi)
 BuildRequires:  mvn(org.eclipse.osgi:org.eclipse.osgi.services)
-BuildRequires:  mvn(org.infinispan:infinispan-core)
 BuildRequires:  mvn(org.jboss.weld.servlet:weld-servlet-core)
 BuildRequires:  mvn(org.mongodb:mongo-java-driver)
 BuildRequires:  mvn(org.ow2.asm:asm)
@@ -177,7 +175,6 @@ Requires:       %{name}-util = %{version}-%{release}
 Requires:       %{name}-util-ajax = %{version}-%{release}
 Requires:       %{name}-webapp = %{version}-%{release}
 Requires:       %{name}-xml = %{version}-%{release}
-Requires:       %{name}-infinispan = %{version}-%{release}
 Requires:       %{name}-cdi = %{version}-%{release}
 Requires:       %{name}-websocket-api = %{version}-%{release}
 Requires:       %{name}-websocket-client = %{version}-%{release}
@@ -220,8 +217,10 @@ Obsoletes:      %{name}-runner < 9.4.0-0.4
 Obsoletes:      %{name}-osgi-npn < 9.4.0-0.4
 Obsoletes:      %{name}-monitor < 9.4.0-0.4
 
-# Hazelcast in Fedora is too old for jetty to build against
-Obsoletes:      %{name}-hazelcast < 9.4.14-1
+# Hazelcast in Fedora is too old for jetty to build against (Added in F29)
+Obsoletes:      %{name}-hazelcast < %{version}-%{release}
+# Infinispan in Fedora is too old for jetty to build against (Added in F31)
+Obsoletes:      %{name}-infinispan < %{version}-%{release}
 
 %description
 %global desc \
@@ -377,12 +376,6 @@ Summary:        FastCGI client module for Jetty
 %description    fcgi-server
 %{extdesc} %{summary}.
 
-%package        infinispan
-Summary:        infinispan module for Jetty
-
-%description    infinispan
-%{extdesc} %{summary}.
-
 %package        jaspi
 Summary:        jaspi module for Jetty
 
@@ -602,11 +595,6 @@ License:        (ASL 2.0 or EPL) and MIT
 
 %patch1 -p1
 
-# ASM 7 is only available on F30+
-%if 0%{?fedora} > 0 && 0%{?fedora} < 30
-%patch2 -p1
-%endif
-
 find . -name "*.?ar" -exec rm {} \;
 find . -name "*.class" -exec rm {} \;
 
@@ -683,6 +671,15 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
 %pom_disable_module test-hazelcast-sessions tests/test-sessions
 %pom_remove_dep :jetty-hazelcast jetty-home
 
+# Infinispan in Fedora is too old to build against
+%pom_disable_module jetty-infinispan
+%pom_disable_module test-infinispan-sessions tests/test-sessions
+%pom_remove_dep :infinispan-embedded jetty-home
+%pom_remove_dep :infinispan-embedded-query jetty-home
+%pom_remove_dep :infinispan-remote jetty-home
+%pom_remove_dep :infinispan-remote-query jetty-home
+%pom_xpath_remove "pom:execution[pom:id='unpack-infinispan-config']" jetty-home
+
 # Not currently able to build tests, so can't build benchmarks
 %pom_disable_module jetty-jmh
 
@@ -731,7 +728,6 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 %pom_disable_module jetty-jaspi
 %pom_disable_module jetty-rewrite
 %pom_disable_module jetty-nosql
-%pom_disable_module jetty-infinispan
 %pom_disable_module jetty-unixsocket
 %pom_disable_module tests
 %pom_disable_module examples
@@ -937,7 +933,6 @@ exit 0
 %files fcgi-client -f .mfiles-fcgi-client
 %files fcgi-server -f .mfiles-fcgi-server
 %files http-spi -f .mfiles-jetty-http-spi
-%files infinispan -f .mfiles-jetty-infinispan
 %files jaspi -f .mfiles-jetty-jaspi
 %files jndi -f .mfiles-jetty-jndi
 %files jsp -f .mfiles-jetty-jsp
@@ -979,6 +974,10 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* 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
+
 * Tue Feb 19 2019 Mat Booth <mat.booth@redhat.com> - 9.4.15-1.v20190215
 - Update to latest upstream release
 
diff --git a/sources b/sources
index ca2fb2f..20d2f47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.15.v20190215.tar.gz) = 11fe7ae4997d1893ebcc6010c2330ec822444c86f55b0a58b0cccbc218582a3f6b4c34f389a1259f6ec5bbed3956c24c1df86b09786f2ab0aa82e29ee8f72402
+SHA512 (jetty-9.4.17.v20190418.tar.gz) = a5a122fcd076adbc46550eb0d66fba7d10a1c28202b20b5feff92acc6756e53171037842da242238da6a19721eb6b0375b46d71bdff6ab112dd1876872e4fd2c

From 1a1da813ef86fd5339dc833461c3705859806136 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Wed, 1 May 2019 12:42:44 +0100
Subject: [PATCH 04/43] Update to latest upstream release Remove some ancient
 obsoletes

---
 .gitignore |  1 +
 jetty.spec | 23 +++++++++--------------
 sources    |  2 +-
 3 files changed, 11 insertions(+), 15 deletions(-)

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

From 3fd9ee70e12707635506b6b86788ef3c0a2e1b29 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Sat, 4 May 2019 10:53:15 +0100
Subject: [PATCH 05/43] Remove dep on Eclipse since it's not available on all
 platforms, and don't   ship OSGi modules

---
 jetty.spec | 64 +++++++++++++++---------------------------------------
 1 file changed, 17 insertions(+), 47 deletions(-)

diff --git a/jetty.spec b/jetty.spec
index ff0c82b..51578c6 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.18
-Release:        1%{addver}%{?dist}
+Release:        2%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -106,15 +106,12 @@ BuildRequires:  mvn(org.apache.taglibs:taglibs-standard-spec)
 BuildRequires:  mvn(org.apache.tomcat:tomcat-jasper)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:exec-maven-plugin)
-BuildRequires:  mvn(org.eclipse.equinox.http:servlet)
 BuildRequires:  mvn(org.eclipse.jetty.alpn:alpn-api)
 BuildRequires:  mvn(org.eclipse.jetty.orbit:javax.mail.glassfish)
 BuildRequires:  mvn(org.eclipse.jetty.orbit:javax.security.auth.message)
 BuildRequires:  mvn(org.eclipse.jetty.toolchain:jetty-assembly-descriptors)
 BuildRequires:  mvn(org.eclipse.jetty.toolchain:jetty-schemas)
 BuildRequires:  mvn(org.eclipse.jetty.toolchain:jetty-test-helper)
-BuildRequires:  mvn(org.eclipse.osgi:org.eclipse.osgi)
-BuildRequires:  mvn(org.eclipse.osgi:org.eclipse.osgi.services)
 BuildRequires:  mvn(org.jboss.weld.servlet:weld-servlet-core)
 BuildRequires:  mvn(org.mongodb:mongo-java-driver)
 BuildRequires:  mvn(org.ow2.asm:asm)
@@ -184,11 +181,6 @@ Requires:       %{name}-websocket-servlet = %{version}-%{release}
 Requires:       %{name}-javax-websocket-client-impl = %{version}-%{release}
 Requires:       %{name}-javax-websocket-server-impl = %{version}-%{release}
 Requires:       %{name}-nosql = %{version}-%{release}
-Requires:       %{name}-httpservice = %{version}-%{release}
-Requires:       %{name}-osgi-boot = %{version}-%{release}
-Requires:       %{name}-osgi-boot-warurl = %{version}-%{release}
-Requires:       %{name}-osgi-boot-jsp = %{version}-%{release}
-Requires:       %{name}-osgi-alpn = %{version}-%{release}
 Requires:       %{name}-quickstart = %{version}-%{release}
 Requires:       %{name}-jstl = %{version}-%{release}
 Requires:       %{name}-alpn-client = %{version}-%{release}
@@ -213,6 +205,11 @@ Obsoletes:      %{name}-monitor < 9.4.0-0.4
 Obsoletes:      %{name}-hazelcast < 9.4.18-1
 # Infinispan in Fedora is too old for jetty to build against (Added in F31)
 Obsoletes:      %{name}-infinispan < 9.4.18-1
+# Eclipse no longer available (Added in F31)
+Obsoletes:      %{name}-osgi-alpn < 9.4.18-1
+Obsoletes:      %{name}-osgi-boot < 9.4.18-1
+Obsoletes:      %{name}-osgi-boot-jsp < 9.4.18-1
+Obsoletes:      %{name}-osgi-boot-warurl < 9.4.18-1
 
 %description
 %global desc \
@@ -288,6 +285,8 @@ Summary:        server module for Jetty
 
 %package        servlet
 Summary:        servlet module for Jetty
+# Eclipse no longer available (Added in F31)
+Obsoletes:      %{name}-httpservice < 9.4.18-1
 
 %description    servlet
 %{extdesc} %{summary}.
@@ -487,36 +486,6 @@ Summary:        nosql module for Jetty
 %description    nosql
 %{extdesc} %{summary}.
 
-%package        httpservice
-Summary:        httpservice module for Jetty
-
-%description    httpservice
-%{extdesc} %{summary}.
-
-%package        osgi-boot
-Summary:        osgi-boot module for Jetty
-
-%description    osgi-boot
-%{extdesc} %{summary}.
-
-%package        osgi-boot-warurl
-Summary:        osgi-boot-warurl module for Jetty
-
-%description    osgi-boot-warurl
-%{extdesc} %{summary}.
-
-%package        osgi-boot-jsp
-Summary:        osgi-boot-jsp module for Jetty
-
-%description    osgi-boot-jsp
-%{extdesc} %{summary}.
-
-%package        osgi-alpn
-Summary:        osgi-alpn module for Jetty
-
-%description    osgi-alpn
-%{extdesc} %{summary}.
-
 %package        quickstart
 Summary:        quickstart module for Jetty
 
@@ -618,6 +587,9 @@ find . -name "*.class" -exec rm {} \;
 
 %pom_add_dep 'org.junit.jupiter:junit-jupiter-engine:${junit.version}' tests/test-sessions/test-sessions-common
 
+# Old version of jetty not available for tests, so use this version
+%pom_change_dep 'org.eclipse.jetty:jetty-util' 'org.eclipse.jetty:jetty-util:${project.version}' tests/test-webapps/test-servlet-spec/test-spec-webapp
+
 # provided by glassfish-jsp-api that has newer version
 %pom_change_dep -r javax.servlet.jsp:jsp-api javax.servlet.jsp:javax.servlet.jsp-api
 
@@ -634,8 +606,8 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
 # only used for integration tests
 %pom_remove_plugin :maven-invoker-plugin jetty-jspc-maven-plugin
 
-# missing deps
-%pom_disable_module test-jetty-osgi jetty-osgi/pom.xml
+# These bundles have a dep on Eclipse that is not available on every arch
+%pom_disable_module jetty-osgi
 
 # We don't have asciidoctor-maven-plugin
 %pom_disable_module jetty-documentation
@@ -726,7 +698,6 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 %pom_disable_module jetty-distribution
 %pom_disable_module jetty-runner
 %pom_disable_module jetty-http-spi
-%pom_disable_module jetty-osgi
 %pom_disable_module jetty-alpn
 %pom_disable_module jetty-home
 
@@ -953,11 +924,6 @@ exit 0
 %files http2-http-client-transport -f .mfiles-http2-http-client-transport
 %files http2-server -f .mfiles-http2-server
 %files nosql -f .mfiles-jetty-nosql
-%files httpservice -f .mfiles-jetty-httpservice
-%files osgi-alpn -f .mfiles-jetty-osgi-alpn
-%files osgi-boot -f .mfiles-jetty-osgi-boot
-%files osgi-boot-warurl -f .mfiles-jetty-osgi-boot-warurl
-%files osgi-boot-jsp -f .mfiles-jetty-osgi-boot-jsp
 %files spring -f .mfiles-jetty-spring
 %endif # without jp_minimal
 
@@ -965,6 +931,10 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Fri May 03 2019 Mat Booth <mat.booth@redhat.com> - 9.4.18-2.v20190429
+- Remove dep on Eclipse since it's not available on all platforms, and don't
+  ship OSGi modules
+
 * Wed May 01 2019 Mat Booth <mat.booth@redhat.com> - 9.4.18-1.v20190429
 - Update to latest upstream release
 - Remove some ancient obsoletes

From 63a0c17090528fa2ad247510d8c557b8d9b45889 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Wed, 12 Jun 2019 00:22:46 +0100
Subject: [PATCH 06/43] Fix license tags

---
 jetty.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/jetty.spec b/jetty.spec
index 51578c6..770bf21 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.18
-Release:        2%{addver}%{?dist}
+Release:        3%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -294,7 +294,7 @@ Obsoletes:      %{name}-httpservice < 9.4.18-1
 %package        util
 Summary:        util module for Jetty
 # Utf8Appendable.java is additionally under MIT license
-License:        (ASL 2.0 or EPL) and MIT
+License:        (ASL 2.0 or EPL-1.0) and MIT
 
 %description    util
 %{extdesc} %{summary}.
@@ -545,7 +545,7 @@ Summary:        jstl module for Jetty
 %package        javadoc
 Summary:        Javadoc for %{name}
 # some MIT-licensed code (from Utf8Appendable) is used to generate javadoc
-License:        (ASL 2.0 or EPL) and MIT
+License:        (ASL 2.0 or EPL-1.0) and MIT
 
 %description    javadoc
 %{summary}.
@@ -931,6 +931,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Tue Jun 11 2019 Mat Booth <mat.booth@redhat.com> - 9.4.18-3.v20190429
+- Fix license tags
+
 * Fri May 03 2019 Mat Booth <mat.booth@redhat.com> - 9.4.18-2.v20190429
 - Remove dep on Eclipse since it's not available on all platforms, and don't
   ship OSGi modules

From 8fd3866356a1a5fb4ec33f1a992e130a6a495e1c Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Sat, 15 Jun 2019 17:14:11 +0100
Subject: [PATCH 07/43] Update to latest upstream release

---
 .gitignore | 1 +
 jetty.spec | 9 ++++++---
 sources    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 246e82c..f704b4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,4 @@ jetty-6.1.26-src.zip
 /jetty-9.4.15.v20190215.tar.gz
 /jetty-9.4.17.v20190418.tar.gz
 /jetty-9.4.18.v20190429.tar.gz
+/jetty-9.4.19.v20190610.tar.gz
diff --git a/jetty.spec b/jetty.spec
index 770bf21..04b53d9 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20190429
+%global addver  .v20190610
 
 # 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.18
-Release:        3%{addver}%{?dist}
+Version:        9.4.19
+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
@@ -931,6 +931,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Wed Jun 12 2019 Mat Booth <mat.booth@redhat.com> - 9.4.19-1.v20190610
+- Update to latest upstream release
+
 * Tue Jun 11 2019 Mat Booth <mat.booth@redhat.com> - 9.4.18-3.v20190429
 - Fix license tags
 
diff --git a/sources b/sources
index 75d6e58..8f83c6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.18.v20190429.tar.gz) = 2fa2f62cb091e3b13dfcdd9225fd578acfe733d87dfc834f6d0fbccce8c44730c026e0680e8ddf28ebd71449fad4102c900b7a2d6b99e1b4799c8865c1fcd358
+SHA512 (jetty-9.4.19.v20190610.tar.gz) = 76a17a3d45f3d26c82b4710a3ccad4bb65c89a521097dbac45a3a6d34583c4d4cab8b1f79d2e9d17b1a35d79602c93b406e3594d50fcae59c8abe3193856a025

From 9847c0b5f639dfeb81c438e00659242ab781d118 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jul 2019 10:27:49 +0000
Subject: [PATCH 08/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index 04b53d9..55c2256 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.19
-Release:        1%{addver}%{?dist}
+Release:        2%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -931,6 +931,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.19-2.v20190610
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Wed Jun 12 2019 Mat Booth <mat.booth@redhat.com> - 9.4.19-1.v20190610
 - Update to latest upstream release
 

From 3b5dbed6274fadfa08d91d18f3ec5612fffe1d4f Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mon, 9 Sep 2019 13:03:08 +0100
Subject: [PATCH 09/43] Update to latest upstream release Obsolete left-over
 packages that would have broken deps when built in minimal mode

---
 .gitignore                                    |  1 +
 ...home.patch => 0001-Distro-jetty.home.patch | 21 +++----
 jetty.spec                                    | 61 ++++++++++++++++++-
 sources                                       |  2 +-
 4 files changed, 70 insertions(+), 15 deletions(-)
 rename 0001-Fedora-jetty.home.patch => 0001-Distro-jetty.home.patch (60%)

diff --git a/.gitignore b/.gitignore
index f704b4d..d051319 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@ jetty-6.1.26-src.zip
 /jetty-9.4.17.v20190418.tar.gz
 /jetty-9.4.18.v20190429.tar.gz
 /jetty-9.4.19.v20190610.tar.gz
+/jetty-9.4.20.v20190813.tar.gz
diff --git a/0001-Fedora-jetty.home.patch b/0001-Distro-jetty.home.patch
similarity index 60%
rename from 0001-Fedora-jetty.home.patch
rename to 0001-Distro-jetty.home.patch
index 90b4743..7795ae2 100644
--- a/0001-Fedora-jetty.home.patch
+++ b/0001-Distro-jetty.home.patch
@@ -1,26 +1,25 @@
-From 46f7ec33b83c28459496739f4d8b91329fb82bc6 Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Tue, 2 Jun 2015 22:52:21 +0200
-Subject: [PATCH 1/2] Fedora jetty.home
+From 7e9bed1ca10901a3cf28775d9563570e94e2280b Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Mon, 9 Sep 2019 12:42:10 +0100
+Subject: [PATCH] Distro jetty.home
 
 ---
- .../eclipse/jetty/start/config/CommandLineConfigSource.java    | 3 +++
- 1 file changed, 3 insertions(+)
+ .../org/eclipse/jetty/start/config/CommandLineConfigSource.java | 2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java
-index f0c9e07..7d2ee3e 100644
+index 792413e..5e5cab9 100644
 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java
 +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java
-@@ -120,6 +120,9 @@ public class CommandLineConfigSource implements ConfigSource
+@@ -120,6 +120,8 @@ public class CommandLineConfigSource implements ConfigSource
                  try
                  {
                      Path home = new File(new URI(m.group(1))).getParentFile().toPath();
 +                    if (home.endsWith("/usr/share/java/jetty"))
 +                        home = new File(home.toString().replaceAll("java/jetty$", "jetty")).toPath();
-+
-                     setProperty(BaseHome.JETTY_HOME,home.toString(),ORIGIN_INTERNAL_FALLBACK);
+                     setProperty(BaseHome.JETTY_HOME, home.toString(), ORIGIN_INTERNAL_FALLBACK);
                      return home;
                  }
 -- 
-2.19.1
+2.20.1
 
diff --git a/jetty.spec b/jetty.spec
index 04b53d9..5bd514c 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20190610
+%global addver  .v20190813
 
 # 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.19
+Version:        9.4.20
 Release:        1%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
@@ -63,7 +63,7 @@ Source5:        %{name}.service
 # MIT license text taken from Utf8Appendable.java
 Source6:        LICENSE-MIT
 
-Patch1:         0001-Fedora-jetty.home.patch
+Patch1:         0001-Distro-jetty.home.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(javax.servlet:javax.servlet-api)
@@ -211,6 +211,48 @@ Obsoletes:      %{name}-osgi-boot < 9.4.18-1
 Obsoletes:      %{name}-osgi-boot-jsp < 9.4.18-1
 Obsoletes:      %{name}-osgi-boot-warurl < 9.4.18-1
 
+%if %{with jp_minimal}
+# Remove left-over packages that would have broken deps when built in minimal mode
+Obsoletes:      %{name}-project < 9.4.20-1
+Obsoletes:      %{name}-annotations < 9.4.20-1
+Obsoletes:      %{name}-ant < 9.4.20-1
+Obsoletes:      %{name}-cdi < 9.4.20-1
+Obsoletes:      %{name}-deploy < 9.4.20-1
+Obsoletes:      %{name}-fcgi-client < 9.4.20-1
+Obsoletes:      %{name}-fcgi-server < 9.4.20-1
+Obsoletes:      %{name}-http-spi < 9.4.20-1
+Obsoletes:      %{name}-jaspi < 9.4.20-1
+Obsoletes:      %{name}-jndi < 9.4.20-1
+Obsoletes:      %{name}-jsp < 9.4.20-1
+Obsoletes:      %{name}-jstl < 9.4.20-1
+Obsoletes:      %{name}-jspc-maven-plugin < 9.4.20-1
+Obsoletes:      %{name}-maven-plugin < 9.4.20-1
+Obsoletes:      %{name}-plus < 9.4.20-1
+Obsoletes:      %{name}-proxy < 9.4.20-1
+Obsoletes:      %{name}-quickstart < 9.4.20-1
+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
+Obsoletes:      %{name}-websocket-server < 9.4.20-1
+Obsoletes:      %{name}-websocket-servlet < 9.4.20-1
+Obsoletes:      %{name}-javax-websocket-client-impl < 9.4.20-1
+Obsoletes:      %{name}-javax-websocket-server-impl < 9.4.20-1
+Obsoletes:      %{name}-alpn-client < 9.4.20-1
+Obsoletes:      %{name}-alpn-server < 9.4.20-1
+Obsoletes:      %{name}-http2-client < 9.4.20-1
+Obsoletes:      %{name}-http2-common < 9.4.20-1
+Obsoletes:      %{name}-http2-hpack < 9.4.20-1
+Obsoletes:      %{name}-http2-http-client-transport < 9.4.20-1
+Obsoletes:      %{name}-http2-server < 9.4.20-1
+Obsoletes:      %{name}-nosql < 9.4.20-1
+Obsoletes:      %{name}-spring < 9.4.20-1
+%endif
+
 %description
 %global desc \
 Jetty is a 100% Java HTTP Server and Servlet Container. This means that you\
@@ -706,6 +748,7 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 %build
 %mvn_package :jetty-home __noinstall
 %mvn_package :jetty-distribution __noinstall
+%mvn_package :build-resources __noinstall
 
 # Separate package for POMs
 %if %{without jp_minimal}
@@ -869,6 +912,11 @@ exit 0
 %files http -f .mfiles-jetty-http
 %files security -f .mfiles-jetty-security
 
+%if %{with jp_minimal}
+%files
+# Empty metapackage in minimal mode
+%endif
+
 %if %{without jp_minimal}
 %files -f .mfiles
 %{_tmpfilesdir}/%{name}.conf
@@ -931,6 +979,13 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Mon Sep 02 2019 Mat Booth <mat.booth@redhat.com> - 9.4.20-1
+- Update to latest upstream release
+- Obsolete left-over packages that would have broken deps when built in minimal mode
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.19-2.v20190610
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Wed Jun 12 2019 Mat Booth <mat.booth@redhat.com> - 9.4.19-1.v20190610
 - Update to latest upstream release
 
diff --git a/sources b/sources
index 8f83c6b..ffdcd47 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.19.v20190610.tar.gz) = 76a17a3d45f3d26c82b4710a3ccad4bb65c89a521097dbac45a3a6d34583c4d4cab8b1f79d2e9d17b1a35d79602c93b406e3594d50fcae59c8abe3193856a025
+SHA512 (jetty-9.4.20.v20190813.tar.gz) = 442c2859b265804a792a7492cc165c571db7d8b3aac784be64b836b74b8ec89fdf24427f7af180f359b45e9512312d17b98ffc24c96832a1f85dcde37a7f7d05

From 284bfe775c33c80c0573c51935a7ad79c4c1209c Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 28 Nov 2019 23:29:00 +0000
Subject: [PATCH 10/43] Update to latest release Drop spring module due to
 missing deps

---
 .gitignore |  8 +-------
 jetty.spec | 42 ++++++++++++++++++------------------------
 sources    |  2 +-
 3 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index d051319..950ca5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,3 @@
-jetty-5.1.12.fedora.zip
-jetty-5.1.14.fedora.tgz
-jetty-5.1.15.fedora.tgz
-jetty-6.1.20-src.zip
-jetty-6.1.21-src.zip
-jetty-6.1.24-src.zip
-jetty-6.1.26-src.zip
 /jetty-8.1.0.RC4.tar.bz2
 /jetty-8.1.0.RC5.tar.bz2
 /jetty-8.1.0.v20120127.tar.bz2
@@ -68,3 +61,4 @@ jetty-6.1.26-src.zip
 /jetty-9.4.18.v20190429.tar.gz
 /jetty-9.4.19.v20190610.tar.gz
 /jetty-9.4.20.v20190813.tar.gz
+/jetty-9.4.24.v20191120.tar.gz
diff --git a/jetty.spec b/jetty.spec
index 5bd514c..06d90dd 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20190813
+%global addver  .v20191120
 
 # 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.20
+Version:        9.4.24
 Release:        1%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
@@ -117,7 +117,6 @@ BuildRequires:  mvn(org.mongodb:mongo-java-driver)
 BuildRequires:  mvn(org.ow2.asm:asm)
 BuildRequires:  mvn(org.ow2.asm:asm-commons)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
-BuildRequires:  mvn(org.springframework:spring-beans)
 
 BuildRequires:  mvn(org.mortbay.jetty.alpn:alpn-boot)
 BuildRequires:  mvn(org.eclipse.jetty.toolchain:jetty-artifact-remote-resources)
@@ -132,7 +131,7 @@ BuildRequires:  junit5
 # duplicate providers, choose one
 BuildRequires:  jboss-websocket-1.0-api
 Requires:       jboss-websocket-1.0-api
-%endif # without jp_minimal
+%endif
 
 BuildArch:      noarch
 
@@ -165,7 +164,6 @@ Requires:       %{name}-security = %{version}-%{release}
 Requires:       %{name}-server = %{version}-%{release}
 Requires:       %{name}-servlet = %{version}-%{release}
 Requires:       %{name}-servlets = %{version}-%{release}
-Requires:       %{name}-spring = %{version}-%{release}
 Requires:       %{name}-start = %{version}-%{release}
 Requires:       %{name}-unixsocket = %{version}-%{release}
 Requires:       %{name}-util = %{version}-%{release}
@@ -197,10 +195,8 @@ Requires(pre):    shadow-utils
 
 Provides:       group(%username) = %jtuid
 Provides:       user(%username)  = %jtuid
-%endif # without jp_minimal
+%endif
 
-# (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 < 9.4.18-1
 # Infinispan in Fedora is too old for jetty to build against (Added in F31)
@@ -210,6 +206,8 @@ Obsoletes:      %{name}-osgi-alpn < 9.4.18-1
 Obsoletes:      %{name}-osgi-boot < 9.4.18-1
 Obsoletes:      %{name}-osgi-boot-jsp < 9.4.18-1
 Obsoletes:      %{name}-osgi-boot-warurl < 9.4.18-1
+# Spring framework removed from Fedora (Added in F32)
+Obsoletes:      %{name}-spring < 9.4.24-1
 
 %if %{with jp_minimal}
 # Remove left-over packages that would have broken deps when built in minimal mode
@@ -250,7 +248,6 @@ Obsoletes:      %{name}-http2-hpack < 9.4.20-1
 Obsoletes:      %{name}-http2-http-client-transport < 9.4.20-1
 Obsoletes:      %{name}-http2-server < 9.4.20-1
 Obsoletes:      %{name}-nosql < 9.4.20-1
-Obsoletes:      %{name}-spring < 9.4.20-1
 %endif
 
 %description
@@ -456,12 +453,6 @@ Summary:        servlets module for Jetty
 %description    servlets
 %{extdesc} %{summary}.
 
-%package        spring
-Summary:        spring module for Jetty
-
-%description    spring
-%{extdesc} %{summary}.
-
 %package        start
 Summary:        start module for Jetty
 
@@ -582,7 +573,7 @@ Summary:        jstl module for Jetty
 %description    jstl
 %{extdesc} %{summary}.
 
-%endif # without jp_minimal
+%endif
 
 %package        javadoc
 Summary:        Javadoc for %{name}
@@ -629,9 +620,6 @@ find . -name "*.class" -exec rm {} \;
 
 %pom_add_dep 'org.junit.jupiter:junit-jupiter-engine:${junit.version}' tests/test-sessions/test-sessions-common
 
-# Old version of jetty not available for tests, so use this version
-%pom_change_dep 'org.eclipse.jetty:jetty-util' 'org.eclipse.jetty:jetty-util:${project.version}' tests/test-webapps/test-servlet-spec/test-spec-webapp
-
 # provided by glassfish-jsp-api that has newer version
 %pom_change_dep -r javax.servlet.jsp:jsp-api javax.servlet.jsp:javax.servlet.jsp-api
 
@@ -685,6 +673,9 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
 %pom_remove_dep :infinispan-remote-query jetty-home
 %pom_xpath_remove "pom:execution[pom:id='unpack-infinispan-config']" jetty-home
 
+# Springframework not available in Fedora
+%pom_disable_module jetty-spring
+
 # Not currently able to build tests, so can't build benchmarks
 %pom_disable_module jetty-jmh
 
@@ -728,7 +719,6 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 %pom_disable_module jetty-annotations
 %pom_disable_module jetty-jndi
 %pom_disable_module jetty-cdi
-%pom_disable_module jetty-spring
 %pom_disable_module jetty-proxy
 %pom_disable_module jetty-jaspi
 %pom_disable_module jetty-rewrite
@@ -742,8 +732,9 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 %pom_disable_module jetty-http-spi
 %pom_disable_module jetty-alpn
 %pom_disable_module jetty-home
+%pom_disable_module jetty-openid
 
-%endif # with jp_minimal
+%endif
 
 %build
 %mvn_package :jetty-home __noinstall
@@ -896,7 +887,7 @@ exit 0
 %systemd_postun_with_restart jetty.service
 
 
-%endif # without jp_minimal
+%endif
 
 %files client -f .mfiles-jetty-client
 %files continuation -f .mfiles-jetty-continuation
@@ -972,13 +963,16 @@ exit 0
 %files http2-http-client-transport -f .mfiles-http2-http-client-transport
 %files http2-server -f .mfiles-http2-server
 %files nosql -f .mfiles-jetty-nosql
-%files spring -f .mfiles-jetty-spring
-%endif # without jp_minimal
+%endif
 
 %files javadoc -f .mfiles-javadoc
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Thu Nov 28 2019 Mat Booth <mat.booth@redhat.com> - 9.4.24-1.v20191120
+- Update to latest release
+- Drop spring module due to missing deps
+
 * Mon Sep 02 2019 Mat Booth <mat.booth@redhat.com> - 9.4.20-1
 - Update to latest upstream release
 - Obsolete left-over packages that would have broken deps when built in minimal mode
diff --git a/sources b/sources
index ffdcd47..45229de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.20.v20190813.tar.gz) = 442c2859b265804a792a7492cc165c571db7d8b3aac784be64b836b74b8ec89fdf24427f7af180f359b45e9512312d17b98ffc24c96832a1f85dcde37a7f7d05
+SHA512 (jetty-9.4.24.v20191120.tar.gz) = 13204ca39a07cba2e4272559a9dc11636443a89e3a36ac4f5e0d49c4b403e20227a16a7ca86e3004ed8e5ba0b163039b32e6c625ba6d68a9911437969c47a6f2

From bbc291748fc0fcc27be30dc02a1302c1b64ecb35 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 12 Dec 2019 16:38:00 +0000
Subject: [PATCH 11/43] Switch to minimal build. There are too many missing
 deps for a full build

---
 jetty.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/jetty.spec b/jetty.spec
index 06d90dd..7f6060a 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -46,11 +46,11 @@
 # eclipse needs: util, server, http, continuation, io, security, servlet
 # thermostat needs: server, jaas, webapp
 # above modules need: jmx, xml
-%bcond_with     jp_minimal
+%bcond_without  jp_minimal
 
 Name:           jetty
 Version:        9.4.24
-Release:        1%{addver}%{?dist}
+Release:        2%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -969,6 +969,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Thu Dec 12 2019 Mat Booth <mat.booth@redhat.com> - 9.4.24-2.v20191120
+- Switch to minimal build. There are too many missing deps for a full build
+
 * Thu Nov 28 2019 Mat Booth <mat.booth@redhat.com> - 9.4.24-1.v20191120
 - Update to latest release
 - Drop spring module due to missing deps

From 05fa375cdb32909b13989a9b00a49d46bb7e8c0e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jan 2020 06:08:13 +0000
Subject: [PATCH 12/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index 7f6060a..610c702 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.24
-Release:        2%{addver}%{?dist}
+Release:        3%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -969,6 +969,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.24-3.v20191120
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Thu Dec 12 2019 Mat Booth <mat.booth@redhat.com> - 9.4.24-2.v20191120
 - Switch to minimal build. There are too many missing deps for a full build
 

From 7dc3a8fa434f511d6ce3f6128733937e4ec69476 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Fri, 20 Mar 2020 10:40:30 +0000
Subject: [PATCH 13/43] Update to latest upstream release

---
 .gitignore | 1 +
 jetty.spec | 9 ++++++---
 sources    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 950ca5f..e015175 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@
 /jetty-9.4.19.v20190610.tar.gz
 /jetty-9.4.20.v20190813.tar.gz
 /jetty-9.4.24.v20191120.tar.gz
+/jetty-9.4.27.v20200227.tar.gz
diff --git a/jetty.spec b/jetty.spec
index 610c702..f87784f 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20191120
+%global addver  .v20200227
 
 # 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.24
-Release:        3%{addver}%{?dist}
+Version:        9.4.27
+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
@@ -969,6 +969,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Fri Mar 20 2020 Mat Booth <mat.booth@redhat.com> - 9.4.27-1.v20200227
+- Update to latest upstream release
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.24-3.v20191120
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 45229de..08ac43d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.24.v20191120.tar.gz) = 13204ca39a07cba2e4272559a9dc11636443a89e3a36ac4f5e0d49c4b403e20227a16a7ca86e3004ed8e5ba0b163039b32e6c625ba6d68a9911437969c47a6f2
+SHA512 (jetty-9.4.27.v20200227.tar.gz) = 1b23411e1b4e98ac266478d323ac38b7b02610866f7421330ca863ba3a8cfac1055ea53e5bd23e2eb8e7487d4dad56728c891ff960ef652d47799e9dc1850fb1

From e6149bafb7c0611d1c730b7330063e4e8c1e9baa Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Fri, 20 Mar 2020 10:45:03 +0000
Subject: [PATCH 14/43] Remove usage of checkstyle plugin

---
 jetty.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jetty.spec b/jetty.spec
index f87784f..467e9f5 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -592,6 +592,7 @@ find . -name "*.?ar" -exec rm {} \;
 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 :maven-enforcer-plugin
 %pom_remove_plugin -r :clirr-maven-plugin

From 829231c7b08e122cc4fd54bf9ef57e8228e5beb8 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 18 Jun 2020 14:59:29 +0100
Subject: [PATCH 15/43] Update to latest upstream release

---
 .gitignore | 1 +
 jetty.spec | 7 +++++--
 sources    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e015175..6aec087 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@
 /jetty-9.4.20.v20190813.tar.gz
 /jetty-9.4.24.v20191120.tar.gz
 /jetty-9.4.27.v20200227.tar.gz
+/jetty-9.4.30.v20200611.tar.gz
diff --git a/jetty.spec b/jetty.spec
index 467e9f5..1434c69 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20200227
+%global addver  .v20200611
 
 # minimal version required to build eclipse and thermostat
 # eclipse needs: util, server, http, continuation, io, security, servlet
@@ -49,7 +49,7 @@
 %bcond_without  jp_minimal
 
 Name:           jetty
-Version:        9.4.27
+Version:        9.4.30
 Release:        1%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
@@ -970,6 +970,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Thu Jun 18 2020 Mat Booth <mat.booth@redhat.com> - 9.4.30-1.v20200611
+- Update to latest upstream release
+
 * Fri Mar 20 2020 Mat Booth <mat.booth@redhat.com> - 9.4.27-1.v20200227
 - Update to latest upstream release
 
diff --git a/sources b/sources
index 08ac43d..3f3140b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.27.v20200227.tar.gz) = 1b23411e1b4e98ac266478d323ac38b7b02610866f7421330ca863ba3a8cfac1055ea53e5bd23e2eb8e7487d4dad56728c891ff960ef652d47799e9dc1850fb1
+SHA512 (jetty-9.4.30.v20200611.tar.gz) = 3a1b8ca363a9d756bdec4b332f9a945196d1f7c7bd90cdafcab60191d14903d338730de8477f860c7bc68572ac95b70129ca92fc15d38ac8648b8e15c7f1fb3a

From 5f4a4ea1d15fc056978954dbdc51747295b17429 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Fri, 10 Jul 2020 23:58:01 +0200
Subject: [PATCH 16/43] Rebuilt for JDK-11

---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index 1434c69..4ea3dce 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.30
-Release:        1%{addver}%{?dist}
+Release:        2%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -970,6 +970,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 9.4.30-2.v20200611
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
 * Thu Jun 18 2020 Mat Booth <mat.booth@redhat.com> - 9.4.30-1.v20200611
 - Update to latest upstream release
 

From 61a948bfb2d43de67b58d9c53ab4c5d6f686c623 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jul 2020 02:21:05 +0000
Subject: [PATCH 17/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index 4ea3dce..8b2a0d0 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.30
-Release:        2%{addver}%{?dist}
+Release:        3%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -970,6 +970,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.30-3.v20200611
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 9.4.30-2.v20200611
 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
 

From 6d484ba54cdecb7b8554fc8533d79b728fcd4735 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Wed, 12 Aug 2020 17:47:16 +0100
Subject: [PATCH 18/43] Update to latest upstream release

---
 .gitignore | 1 +
 jetty.spec | 9 ++++++---
 sources    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6aec087..f6f1673 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@
 /jetty-9.4.24.v20191120.tar.gz
 /jetty-9.4.27.v20200227.tar.gz
 /jetty-9.4.30.v20200611.tar.gz
+/jetty-9.4.31.v20200723.tar.gz
diff --git a/jetty.spec b/jetty.spec
index 8b2a0d0..eb60da2 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20200611
+%global addver  .v20200723
 
 # 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.30
-Release:        3%{addver}%{?dist}
+Version:        9.4.31
+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
@@ -970,6 +970,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Wed Aug 12 2020 Mat Booth <mat.booth@redhat.com> - 9.4.31-1
+- Update to latest upstream release
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.30-3.v20200611
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 3f3140b..0cd681e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.30.v20200611.tar.gz) = 3a1b8ca363a9d756bdec4b332f9a945196d1f7c7bd90cdafcab60191d14903d338730de8477f860c7bc68572ac95b70129ca92fc15d38ac8648b8e15c7f1fb3a
+SHA512 (jetty-9.4.31.v20200723.tar.gz) = dad579fc6db1e3ed202077cf389b8114e7e1e0774969e0b2ecf097976ac28cabece0f8573ab5211358d25ff8e38bb281633224636687774f7d4e8d699e546856

From 70a52833e555875d35fd7e30838742b3da64d66a Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 13 Aug 2020 16:42:46 +0100
Subject: [PATCH 19/43] Reflective use of classes that might not be present in
 the JDK should be   optional when expressed as OSGi dependencies

---
 jetty.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index eb60da2..fedc6c2 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.31
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -612,6 +612,10 @@ find . -name "*.class" -exec rm {} \;
 
 %pom_disable_module aggregates/jetty-all
 
+# Reflective use of classes that might not be present in the JDK should be optional OSGi-wise
+%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
 
@@ -970,6 +974,10 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Thu Aug 13 2020 Mat Booth <mat.booth@redhat.com> - 9.4.31-2
+- Reflective use of classes that might not be present in the JDK should be
+  optional when expressed as OSGi dependencies
+
 * Wed Aug 12 2020 Mat Booth <mat.booth@redhat.com> - 9.4.31-1
 - Update to latest upstream release
 

From 4a4a7cb9c02b06f43d09abd790b80c3c1b0decef Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Wed, 19 Aug 2020 15:06:04 +0100
Subject: [PATCH 20/43] Rebuild to regenerate OSGi metadata for dependency on
 servlet-api Add patch to build against new APIs in servlet 4

---
 0001-Distro-jetty.home.patch       |  8 ++--
 0002-Port-to-servlet-api-4-5.patch | 76 ++++++++++++++++++++++++++++++
 jetty.spec                         |  8 +++-
 3 files changed, 87 insertions(+), 5 deletions(-)
 create mode 100644 0002-Port-to-servlet-api-4-5.patch

diff --git a/0001-Distro-jetty.home.patch b/0001-Distro-jetty.home.patch
index 7795ae2..269e227 100644
--- a/0001-Distro-jetty.home.patch
+++ b/0001-Distro-jetty.home.patch
@@ -1,14 +1,14 @@
-From 7e9bed1ca10901a3cf28775d9563570e94e2280b Mon Sep 17 00:00:00 2001
+From 29d160bf916b4ab358a01496029f9aaa5fba66b3 Mon Sep 17 00:00:00 2001
 From: Mat Booth <mat.booth@redhat.com>
 Date: Mon, 9 Sep 2019 12:42:10 +0100
-Subject: [PATCH] Distro jetty.home
+Subject: [PATCH 1/2] Distro jetty.home
 
 ---
  .../org/eclipse/jetty/start/config/CommandLineConfigSource.java | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java
-index 792413e..5e5cab9 100644
+index 30440c4..cb0ed3d 100644
 --- a/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java
 +++ b/jetty-start/src/main/java/org/eclipse/jetty/start/config/CommandLineConfigSource.java
 @@ -120,6 +120,8 @@ public class CommandLineConfigSource implements ConfigSource
@@ -21,5 +21,5 @@ index 792413e..5e5cab9 100644
                      return home;
                  }
 -- 
-2.20.1
+2.26.2
 
diff --git a/0002-Port-to-servlet-api-4-5.patch b/0002-Port-to-servlet-api-4-5.patch
new file mode 100644
index 0000000..5078549
--- /dev/null
+++ b/0002-Port-to-servlet-api-4-5.patch
@@ -0,0 +1,76 @@
+From 65b5de2ef9ffc5eacb23c6c4834cc1c513f0eafa Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Wed, 19 Aug 2020 13:14:37 +0100
+Subject: [PATCH 2/2] Port to servlet-api 4/5
+
+---
+ .../jetty/server/handler/ContextHandler.java  | 46 +++++++++++++++++++
+ 1 file changed, 46 insertions(+)
+
+diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
+index 7960b0f..4981755 100644
+--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
++++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
+@@ -2760,6 +2760,13 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
+             return null;
+         }
+ 
++        public ServletRegistration.Dynamic addJspFile(String servletName, String jspFile)
++        {
++            // TODO new in 4.0
++            LOG.warn(UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER, "addJspFile(String, String)");
++            return null;
++        }
++
+         @Override
+         public javax.servlet.ServletRegistration.Dynamic addServlet(String servletName, Class<? extends Servlet> servletClass)
+         {
+@@ -2930,6 +2937,45 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
+         {
+             return null;
+         }
++
++        public int getSessionTimeout()
++        {
++            // TODO new in 4.0
++            LOG.warn(UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER, "getSessionTimeout()");
++            return 0;
++        }
++
++        public void setSessionTimeout(int sessionTimeout)
++        {
++            // TODO new in 4.0
++            LOG.warn(UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER, "setSessionTimeout(int)");
++        }
++
++        public String getRequestCharacterEncoding()
++        {
++            // TODO new in 4.0
++            LOG.warn(UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER, "getRequestCharacterEncoding()");
++            return null;
++        }
++
++        public void setRequestCharacterEncoding(String encoding)
++        {
++            // TODO new in 4.0
++            LOG.warn(UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER, "setRequestCharacterEncoding(String)");
++        }
++
++        public String getResponseCharacterEncoding()
++        {
++            // TODO new in 4.0
++            LOG.warn(UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER, "getResponseCharacterEncoding()");
++            return null;
++        }
++
++        public void setResponseCharacterEncoding(String encoding)
++        {
++            // TODO new in 4.0
++            LOG.warn(UNIMPLEMENTED_USE_SERVLET_CONTEXT_HANDLER, "setResponseCharacterEncoding(String)");
++        }
+     }
+ 
+     /**
+-- 
+2.26.2
+
diff --git a/jetty.spec b/jetty.spec
index fedc6c2..a2a1eea 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.31
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -64,6 +64,7 @@ Source5:        %{name}.service
 Source6:        LICENSE-MIT
 
 Patch1:         0001-Distro-jetty.home.patch
+Patch2:         0002-Port-to-servlet-api-4-5.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(javax.servlet:javax.servlet-api)
@@ -587,6 +588,7 @@ License:        (ASL 2.0 or EPL-1.0) and MIT
 %setup -q -n %{name}.project-%{name}-%{version}%{addver}
 
 %patch1 -p1
+%patch2 -p1
 
 find . -name "*.?ar" -exec rm {} \;
 find . -name "*.class" -exec rm {} \;
@@ -974,6 +976,10 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* 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
+
 * Thu Aug 13 2020 Mat Booth <mat.booth@redhat.com> - 9.4.31-2
 - Reflective use of classes that might not be present in the JDK should be
   optional when expressed as OSGi dependencies

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

---
 .gitignore |  1 +
 jetty.spec | 12 ++++++------
 sources    |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

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

From 442e36d01bcc0363705a1153960d64e2cd98f673 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Fri, 30 Oct 2020 17:47:08 +0000
Subject: [PATCH 22/43] Fix changelog timestamp

---
 jetty.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index ccf69e4..b457708 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -973,7 +973,7 @@ 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
+* 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

From e441c1ffb3dcb7f71d93ebf4fe65a034a7a27bb1 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Mon, 18 Jan 2021 21:30:27 +0000
Subject: [PATCH 23/43] Update to latest upstream release

---
 .gitignore |  1 +
 jetty.spec | 26 +++++++++++++-------------
 sources    |  2 +-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7951491..f681396 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,3 +66,4 @@
 /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 b457708..94de261 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20201020
+%global addver  .v20210114
 
 # minimal version required to build eclipse and thermostat
 # eclipse needs: util, server, http, continuation, io, security, servlet
@@ -49,7 +49,7 @@
 %bcond_without  jp_minimal
 
 Name:           jetty
-Version:        9.4.33
+Version:        9.4.36
 Release:        1%{?dist}
 Summary:        Java Webserver and Servlet Container
 
@@ -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
@@ -712,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
@@ -901,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
@@ -951,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
@@ -973,6 +970,9 @@ 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
 
diff --git a/sources b/sources
index a830edc..3ff5250 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.33.v20201020.tar.gz) = ab53c0006e3b2a4a121fc6de3687e15010d25e9066aa278712966f3723e8fe525bc3e1d466ed6e877d71783fda97b607a58414c5052667afde54acfa23b61f3e
+SHA512 (jetty-9.4.36.v20210114.tar.gz) = f05be126a3a2e2956103f2eb4838dfbe65db12b0288bfc78dfb40fd307afed24f885ab8a3bb5b60421ee69678cc9a6f3b3e6ba10873c06053b60cca0ba834300

From 0ad7d9b846033b64098d6fdb82d2f7be70b00a21 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 14:52:33 +0000
Subject: [PATCH 24/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index 94de261..04dd4a1 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.36
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -970,6 +970,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.36-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Mon Jan 18 2021 Mat Booth <mat.booth@redhat.com> - 9.4.36-1
 - Update to latest upstream release
 

From 1461fc841a58efa54597e82afc6761fdaed94e8d Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 29 Mar 2021 23:18:59 +0300
Subject: [PATCH 25/43] Update to Jetty 9.4.38

---
 .gitignore |  1 +
 jetty.spec | 10 ++++++----
 sources    |  2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index f681396..6975d60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@
 /jetty-9.4.31.v20200723.tar.gz
 /jetty-9.4.33.v20201020.tar.gz
 /jetty-9.4.36.v20210114.tar.gz
+/jetty-9.4.38.v20210224.tar.gz
diff --git a/jetty.spec b/jetty.spec
index 04dd4a1..dae0d5c 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20210114
+%global addver  .v20210224
 
 # 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.36
-Release:        2%{?dist}
+Version:        9.4.38
+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
@@ -597,7 +597,6 @@ find . -name "*.class" -exec rm {} \;
 %pom_remove_plugin -r :spotbugs-maven-plugin
 %pom_remove_plugin -r :maven-enforcer-plugin
 %pom_remove_plugin -r :maven-eclipse-plugin
-%pom_remove_plugin -r :maven-pmd-plugin
 %pom_remove_plugin -r :license-maven-plugin
 %pom_remove_plugin -r :maven-site-plugin
 %pom_remove_plugin -r :maven-source-plugin
@@ -970,6 +969,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Mon Mar 29 2021 Alexander Kurtakov <akurtako@redhat.com> 9.4.38-1
+- Update to Jetty 9.4.38
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.36-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 3ff5250..2c1e1d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.36.v20210114.tar.gz) = f05be126a3a2e2956103f2eb4838dfbe65db12b0288bfc78dfb40fd307afed24f885ab8a3bb5b60421ee69678cc9a6f3b3e6ba10873c06053b60cca0ba834300
+SHA512 (jetty-9.4.38.v20210224.tar.gz) = c713941703312f3ae34663ed8d1fcecb4ee2dc8d17927a787f38fd49d9bc7eb21de70106b52f6ed23f466adc29c85b938a7e58939c2014046adbb5e31df4963b

From 857b582a008e2a60d3e33deddc18ed0ff2ab48cb Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Wed, 21 Apr 2021 17:14:03 +0300
Subject: [PATCH 26/43] Update to Jetty 9.4.40 (fixes multiple CVEs)

---
 .gitignore | 1 +
 jetty.spec | 7 +++++--
 sources    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6975d60..115c1db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,4 @@
 /jetty-9.4.33.v20201020.tar.gz
 /jetty-9.4.36.v20210114.tar.gz
 /jetty-9.4.38.v20210224.tar.gz
+/jetty-9.4.40.v20210413.tar.gz
diff --git a/jetty.spec b/jetty.spec
index dae0d5c..fa854b7 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20210224
+%global addver  .v20210413
 
 # minimal version required to build eclipse and thermostat
 # eclipse needs: util, server, http, continuation, io, security, servlet
@@ -49,7 +49,7 @@
 %bcond_without  jp_minimal
 
 Name:           jetty
-Version:        9.4.38
+Version:        9.4.40
 Release:        1%{?dist}
 Summary:        Java Webserver and Servlet Container
 
@@ -969,6 +969,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Wed Apr 21 2021 Alexander Kurtakov <akurtako@redhat.com> 9.4.40-1
+- Update to Jetty 9.4.40 (fixes multiple CVEs)
+
 * Mon Mar 29 2021 Alexander Kurtakov <akurtako@redhat.com> 9.4.38-1
 - Update to Jetty 9.4.38
 
diff --git a/sources b/sources
index 2c1e1d7..d2eb426 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.38.v20210224.tar.gz) = c713941703312f3ae34663ed8d1fcecb4ee2dc8d17927a787f38fd49d9bc7eb21de70106b52f6ed23f466adc29c85b938a7e58939c2014046adbb5e31df4963b
+SHA512 (jetty-9.4.40.v20210413.tar.gz) = ea821c925a05da692d88c614b8ceb440bb82aecd3729adfd3caeb27625d6d1f7e6c85a3503e2bb6da1723264879bd7865ed48421465271cb208f8590b868cfc7

From 8ab39929068d0802c5808359f7aad215190136e8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 22 Jul 2021 09:06:13 +0000
Subject: [PATCH 27/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index fa854b7..995342e 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -969,6 +969,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Wed Apr 21 2021 Alexander Kurtakov <akurtako@redhat.com> 9.4.40-1
 - Update to Jetty 9.4.40 (fixes multiple CVEs)
 

From 943e076dc06d5c87c2d17572da0fad1e72f0c189 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 13:48:49 +0000
Subject: [PATCH 28/43] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index 995342e..2aded6a 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -969,6 +969,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From ef48c67be57f4294c55430667400f0dade6e0133 Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Sat, 5 Feb 2022 21:44:01 +0100
Subject: [PATCH 29/43] Rebuilt for java-17-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java17
---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index 2aded6a..d27a880 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -969,6 +969,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 9.4.40-4
+- Rebuilt for java-17-openjdk as system jdk
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 477f992ae247f0085bd393930de0234cea97e55e Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Fri, 8 Jul 2022 15:50:00 +0200
Subject: [PATCH 30/43] Rebuilt for Drop i686 JDKs

https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
---
 jetty.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index d27a880..6174368 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -135,6 +135,7 @@ Requires:       jboss-websocket-1.0-api
 %endif
 
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 # jp_minimal doesn't have main package
 %if %{without jp_minimal}
@@ -969,6 +970,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 9.4.40-5
+- Rebuilt for Drop i686 JDKs
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 9.4.40-4
 - Rebuilt for java-17-openjdk as system jdk
 

From 6b573d9d914663f8eb41f042d2608a74e299a7fc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 21 Jul 2022 15:14:51 +0000
Subject: [PATCH 31/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index 6174368..c9a5333 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -970,6 +970,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 9.4.40-5
 - Rebuilt for Drop i686 JDKs
 

From 61fbe8005ab282863ab1d03a9a42ba27f2763602 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 13:44:59 +0000
Subject: [PATCH 32/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index c9a5333..94fd29b 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -970,6 +970,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 570ec50e7e957d39e1e5eaa2ad0ac556cb3793d5 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jul 2023 08:03:22 +0000
Subject: [PATCH 33/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index 94fd29b..945c390 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -970,6 +970,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From 2e833dc37f888419bc8ae2bcb1d137d03b53a01a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jan 2024 23:39:24 +0000
Subject: [PATCH 34/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index 945c390..1671a45 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -970,6 +970,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 7f12a5b9c55760364419211cb0c0e53076d1fc30 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jan 2024 23:19:17 +0000
Subject: [PATCH 35/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index 1671a45..dcf5f9f 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -970,6 +970,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From e66f59db8c375a7a0b39962a9a5d8c6bc0641cf1 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 27 Feb 2024 16:27:46 +0100
Subject: [PATCH 36/43] Rebuilt for java-21-openjdk as system jdk

https://fedoraproject.org/wiki/Changes/Java21
---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index dcf5f9f..7a70c73 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -970,6 +970,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 9.4.40-11
+- Rebuilt for java-21-openjdk as system jdk
+
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 21901f63867835a27c5e19c868a16276fccfe5c8 Mon Sep 17 00:00:00 2001
From: Software Management Team <packaging-team-maint@redhat.com>
Date: Thu, 30 May 2024 12:46:47 +0200
Subject: [PATCH 37/43] Eliminate use of obsolete %patchN syntax (#2283636)

---
 jetty.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jetty.spec b/jetty.spec
index 7a70c73..e8252ef 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -587,8 +587,8 @@ License:        (ASL 2.0 or EPL-1.0) and MIT
 %prep
 %setup -q -n %{name}.project-%{name}-%{version}%{addver}
 
-%patch1 -p1
-%patch2 -p1
+%patch -P1 -p1
+%patch -P2 -p1
 
 find . -name "*.?ar" -exec rm {} \;
 find . -name "*.class" -exec rm {} \;

From 52ebd9456334bf743439aa65e7e4caa6970ceeb0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 11:00:15 +0000
Subject: [PATCH 38/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index e8252ef..c50da80 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -970,6 +970,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 9.4.40-11
 - Rebuilt for java-21-openjdk as system jdk
 

From 6ed256ad9e959d57ff2185f28993b20372645d15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Mon, 2 Sep 2024 09:03:21 +0200
Subject: [PATCH 39/43] convert license to SPDX

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
---
 jetty.spec | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/jetty.spec b/jetty.spec
index c50da80..0f24dc9 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,11 +50,12 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
-License:        ASL 2.0 or EPL-1.0
+# Automatically converted from old format: ASL 2.0 or EPL-1.0 - review is highly recommended.
+License:        Apache-2.0 OR EPL-1.0
 URL:            http://www.eclipse.org/jetty/
 Source0:        https://github.com/eclipse/%{name}.project/archive/%{name}-%{version}%{addver}.tar.gz
 Source1:        jetty.sh
@@ -334,7 +335,8 @@ Obsoletes:      %{name}-httpservice < 9.4.18-1
 %package        util
 Summary:        util module for Jetty
 # Utf8Appendable.java is additionally under MIT license
-License:        (ASL 2.0 or EPL-1.0) and MIT
+# Automatically converted from old format: (ASL 2.0 or EPL-1.0) and MIT - review is highly recommended.
+License:        (Apache-2.0 OR EPL-1.0) AND LicenseRef-Callaway-MIT
 
 %description    util
 %{extdesc} %{summary}.
@@ -579,7 +581,8 @@ Summary:        jstl module for Jetty
 %package        javadoc
 Summary:        Javadoc for %{name}
 # some MIT-licensed code (from Utf8Appendable) is used to generate javadoc
-License:        (ASL 2.0 or EPL-1.0) and MIT
+# Automatically converted from old format: (ASL 2.0 or EPL-1.0) and MIT - review is highly recommended.
+License:        (Apache-2.0 OR EPL-1.0) AND LicenseRef-Callaway-MIT
 
 %description    javadoc
 %{summary}.
@@ -970,6 +973,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 9.4.40-13
+- convert license to SPDX
+
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From b16b4fcea64940c0869ccee862ed74cef17faa4b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jan 2025 07:52:09 +0000
Subject: [PATCH 40/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index 0f24dc9..8a785fd 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -973,6 +973,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 9.4.40-13
 - convert license to SPDX
 

From 52be2db170d1045393f70ff82780d8ef1a5f7355 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 23 Jan 2025 19:39:44 +0100
Subject: [PATCH 41/43] Add sysusers.d config file to allow rpm to create
 users/groups automatically

---
 jetty.spec | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/jetty.spec b/jetty.spec
index 8a785fd..4a9bfd7 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -192,7 +192,6 @@ Requires:       %{name}-http2-hpack = %{version}-%{release}
 Requires:       %{name}-http2-http-client-transport = %{version}-%{release}
 Requires:       %{name}-http2-server = %{version}-%{release}
 
-Requires(pre):    shadow-utils
 %{?systemd_ordering}
 
 
@@ -740,6 +739,11 @@ sed -i '/<SystemProperty name="jetty.state"/d' \
 
 %endif
 
+# Create a sysusers.d config file
+cat >jetty.sysusers.conf <<EOF
+u jetty %jtuid 'Jetty web server' %homedir -
+EOF
+
 %build
 %mvn_package :jetty-home __noinstall
 %mvn_package :jetty-distribution __noinstall
@@ -867,19 +871,7 @@ cp -p %{SOURCE1} %{buildroot}%{homedir}/bin/jetty.sh
 
 # NOTE: %if %{without jp_minimal} still in effect
 
-%pre
-# Add the "jetty" user and group
-getent group %username >/dev/null || groupadd -f -g %jtuid -r %username
-if ! getent passwd %username >/dev/null ; then
-    if ! getent passwd %jtuid >/dev/null ; then
-      useradd -r -u %jtuid -g %username -d %homedir -s /sbin/nologin \
-      -c "Jetty web server" %username
-    else
-      useradd -r -g %username -d %homedir -s /sbin/nologin \
-      -c "Jetty web server" %username
-    fi
-fi
-exit 0
+install -m0644 -D jetty.sysusers.conf %{buildroot}%{_sysusersdir}/jetty.conf
 
 %post
 %systemd_post jetty.service
@@ -927,6 +919,7 @@ exit 0
 %ghost %dir %attr(755, jetty, jetty) %{rundir}
 %{appdir}
 %{_unitdir}/%{name}.service
+%{_sysusersdir}/jetty.conf
 
 %files project -f .mfiles-project
 %doc README.md VERSION.txt
@@ -973,6 +966,9 @@ exit 0
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 9.4.40-15
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
 * Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From eeff239ce7c41d007fe385d5559c918c4534f462 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 24 Jul 2025 18:00:43 +0000
Subject: [PATCH 42/43] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 jetty.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty.spec b/jetty.spec
index 4a9bfd7..3758df8 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -966,6 +966,9 @@ install -m0644 -D jetty.sysusers.conf %{buildroot}%{_sysusersdir}/jetty.conf
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 9.4.40-15
 - Add sysusers.d config file to allow rpm to create users/groups automatically
 

From 120903cd510cd8a7f7ab2793d3611591b78075e5 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Tue, 29 Jul 2025 21:38:20 +0200
Subject: [PATCH 43/43] Rebuilt for java-25-openjdk as preffered jdk

https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.
---
 jetty.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/jetty.spec b/jetty.spec
index 3758df8..1306fdf 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.40
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -67,7 +67,7 @@ Source6:        LICENSE-MIT
 Patch1:         0001-Distro-jetty.home.patch
 Patch2:         0002-Port-to-servlet-api-4-5.patch
 
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(javax.servlet:javax.servlet-api)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin)
@@ -75,7 +75,7 @@ BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 
 %if %{without jp_minimal}
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(com.github.jnr:jnr-unixsocket)
 BuildRequires:  mvn(javax.annotation:javax.annotation-api)
 BuildRequires:  mvn(javax.enterprise:cdi-api)
@@ -966,6 +966,9 @@ install -m0644 -D jetty.sysusers.conf %{buildroot}%{_sysusersdir}/jetty.conf
 %license LICENSE NOTICE.txt LICENSE-MIT
 
 %changelog
+* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 9.4.40-17
+- Rebuilt for java-25-openjdk as preffered jdk
+
 * Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.40-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild