From 05fa375cdb32909b13989a9b00a49d46bb7e8c0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 06:08:13 +0000 Subject: [PATCH 01/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 9.4.24-3.v20191120 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Dec 12 2019 Mat Booth - 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 Date: Fri, 20 Mar 2020 10:40:30 +0000 Subject: [PATCH 02/32] 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 - 9.4.27-1.v20200227 +- Update to latest upstream release + * Wed Jan 29 2020 Fedora Release Engineering - 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 Date: Fri, 20 Mar 2020 10:45:03 +0000 Subject: [PATCH 03/32] 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 Date: Thu, 18 Jun 2020 14:59:29 +0100 Subject: [PATCH 04/32] 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 - 9.4.30-1.v20200611 +- Update to latest upstream release + * Fri Mar 20 2020 Mat Booth - 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 Date: Fri, 10 Jul 2020 23:58:01 +0200 Subject: [PATCH 05/32] 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 - 9.4.30-2.v20200611 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Thu Jun 18 2020 Mat Booth - 9.4.30-1.v20200611 - Update to latest upstream release From 61a948bfb2d43de67b58d9c53ab4c5d6f686c623 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 02:21:05 +0000 Subject: [PATCH 06/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 9.4.30-3.v20200611 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 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 Date: Wed, 12 Aug 2020 17:47:16 +0100 Subject: [PATCH 07/32] 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 - 9.4.31-1 +- Update to latest upstream release + * Tue Jul 28 2020 Fedora Release Engineering - 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 Date: Thu, 13 Aug 2020 16:42:46 +0100 Subject: [PATCH 08/32] 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" \ +"sun.misc;resolution:=optional,com.sun.nio.file;resolution:=optional,*" + # Use proper groupId for apache ant %pom_xpath_replace "pom:groupId[text()='ant']" "org.apache.ant" jetty-ant/pom.xml @@ -970,6 +974,10 @@ exit 0 %license LICENSE NOTICE.txt LICENSE-MIT %changelog +* Thu Aug 13 2020 Mat Booth - 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 - 9.4.31-1 - Update to latest upstream release From 4a4a7cb9c02b06f43d09abd790b80c3c1b0decef Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 19 Aug 2020 15:06:04 +0100 Subject: [PATCH 09/32] 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 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 +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 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 - 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 - 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 Date: Wed, 28 Oct 2020 17:40:21 +0000 Subject: [PATCH 10/32] 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" \ "sun.misc;resolution:=optional,com.sun.nio.file;resolution:=optional,*" -# Use proper groupId for apache ant -%pom_xpath_replace "pom:groupId[text()='ant']" "org.apache.ant" 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 - 9.4.33-1 +- Update to latest upstream release + * Wed Aug 19 2020 Mat Booth - 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 Date: Fri, 30 Oct 2020 17:47:08 +0000 Subject: [PATCH 11/32] 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 - 9.4.33-1 +* Wed Oct 28 2020 Mat Booth - 9.4.33-1 - Update to latest upstream release * Wed Aug 19 2020 Mat Booth - 9.4.31-3 From e441c1ffb3dcb7f71d93ebf4fe65a034a7a27bb1 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 18 Jan 2021 21:30:27 +0000 Subject: [PATCH 12/32] 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 '/ - 9.4.36-1 +- Update to latest upstream release + * Wed Oct 28 2020 Mat Booth - 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 Date: Tue, 26 Jan 2021 14:52:33 +0000 Subject: [PATCH 13/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 9.4.36-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jan 18 2021 Mat Booth - 9.4.36-1 - Update to latest upstream release From 1461fc841a58efa54597e82afc6761fdaed94e8d Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Mon, 29 Mar 2021 23:18:59 +0300 Subject: [PATCH 14/32] 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 9.4.38-1 +- Update to Jetty 9.4.38 + * Tue Jan 26 2021 Fedora Release Engineering - 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 Date: Wed, 21 Apr 2021 17:14:03 +0300 Subject: [PATCH 15/32] 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 9.4.40-1 +- Update to Jetty 9.4.40 (fixes multiple CVEs) + * Mon Mar 29 2021 Alexander Kurtakov 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 Date: Thu, 22 Jul 2021 09:06:13 +0000 Subject: [PATCH 16/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 9.4.40-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Apr 21 2021 Alexander Kurtakov 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 Date: Thu, 20 Jan 2022 13:48:49 +0000 Subject: [PATCH 17/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 9.4.40-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 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 Date: Sat, 5 Feb 2022 21:44:01 +0100 Subject: [PATCH 18/32] 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 - 9.4.40-4 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 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 Date: Fri, 8 Jul 2022 15:50:00 +0200 Subject: [PATCH 19/32] 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 - 9.4.40-5 +- Rebuilt for Drop i686 JDKs + * Sat Feb 05 2022 Jiri Vanek - 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 Date: Thu, 21 Jul 2022 15:14:51 +0000 Subject: [PATCH 20/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 9.4.40-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 08 2022 Jiri Vanek - 9.4.40-5 - Rebuilt for Drop i686 JDKs From 61fbe8005ab282863ab1d03a9a42ba27f2763602 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:44:59 +0000 Subject: [PATCH 21/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 9.4.40-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 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 Date: Thu, 20 Jul 2023 08:03:22 +0000 Subject: [PATCH 22/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 - 9.4.40-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 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 Date: Sat, 20 Jan 2024 23:39:24 +0000 Subject: [PATCH 23/32] 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 - 9.4.40-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 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 Date: Wed, 24 Jan 2024 23:19:17 +0000 Subject: [PATCH 24/32] 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 - 9.4.40-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 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 Date: Tue, 27 Feb 2024 16:27:46 +0100 Subject: [PATCH 25/32] 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 - 9.4.40-11 +- Rebuilt for java-21-openjdk as system jdk + * Wed Jan 24 2024 Fedora Release Engineering - 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 Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 26/32] 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 Date: Thu, 18 Jul 2024 11:00:15 +0000 Subject: [PATCH 27/32] 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 - 9.4.40-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 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?= Date: Mon, 2 Sep 2024 09:03:21 +0200 Subject: [PATCH 28/32] 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ý - 9.4.40-13 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 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 Date: Fri, 17 Jan 2025 07:52:09 +0000 Subject: [PATCH 29/32] 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 - 9.4.40-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 02 2024 Miroslav Suchý - 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?= Date: Thu, 23 Jan 2025 19:39:44 +0100 Subject: [PATCH 30/32] 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 '/jetty.sysusers.conf </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 - 9.4.40-15 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Fri Jan 17 2025 Fedora Release Engineering - 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 Date: Thu, 24 Jul 2025 18:00:43 +0000 Subject: [PATCH 31/32] 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 - 9.4.40-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 23 2025 Zbigniew Jędrzejewski-Szmek - 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 Date: Tue, 29 Jul 2025 21:38:20 +0200 Subject: [PATCH 32/32] 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 - 9.4.40-17 +- Rebuilt for java-25-openjdk as preffered jdk + * Thu Jul 24 2025 Fedora Release Engineering - 9.4.40-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild