From b113d42e84921d99b76d2e1fc6978571fe71680ea309dc73e125f6a1f9eebe9d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 29 Mar 2022 08:08:35 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=47 --- jetty-websocket.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/jetty-websocket.spec b/jetty-websocket.spec index 5bacd39..5f44f20 100644 --- a/jetty-websocket.spec +++ b/jetty-websocket.spec @@ -304,11 +304,7 @@ sed -i '/= 9}%{!?pkg_vcmp:0} - -Dmaven.compiler.release=8 \ -%endif - -Dsource=8 +%{mvn_build} -f -s -- -Dsource=8 %install %mvn_install From b13dc472f8d8daca5517db8cc74bcb683d7e1b6989b2aa04a7951f4d35a8b73a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 29 Mar 2022 13:38:11 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=48 --- jetty-minimal.spec | 6 ++++-- jetty-unixsocket.spec | 6 ++++-- jetty-websocket.spec | 6 ++++-- jetty.project-jetty-9.4.43.v20210629.tar.gz | 3 --- jetty.project-jetty-9.4.46.v20220328.tar.gz | 3 +++ 5 files changed, 15 insertions(+), 9 deletions(-) delete mode 100644 jetty.project-jetty-9.4.43.v20210629.tar.gz create mode 100644 jetty.project-jetty-9.4.46.v20220328.tar.gz diff --git a/jetty-minimal.spec b/jetty-minimal.spec index dc79909..b1f2e26 100644 --- a/jetty-minimal.spec +++ b/jetty-minimal.spec @@ -18,10 +18,10 @@ %global base_name jetty -%global addver .v20210629 +%global addver .v20220328 %define src_name %{base_name}.project-%{base_name}-%{version}%{addver} Name: %{base_name}-minimal -Version: 9.4.43 +Version: 9.4.46 Release: 0 Summary: Java Webserver and Servlet Container License: Apache-2.0 OR EPL-1.0 @@ -276,6 +276,8 @@ Group: Productivity/Networking/Web/Servers find . -name "*.?ar" -exec rm {} \; find . -name "*.class" -exec rm {} \; +%pom_remove_dep :::import + # Plugins irrelevant or harmful to building the package %pom_remove_plugin -r :maven-checkstyle-plugin %pom_remove_plugin -r :maven-enforcer-plugin diff --git a/jetty-unixsocket.spec b/jetty-unixsocket.spec index d46783e..79a5873 100644 --- a/jetty-unixsocket.spec +++ b/jetty-unixsocket.spec @@ -18,10 +18,10 @@ %global base_name jetty -%global addver .v20210629 +%global addver .v20220328 %define src_name %{base_name}.project-%{base_name}-%{version}%{addver} Name: %{base_name}-unixsocket -Version: 9.4.43 +Version: 9.4.46 Release: 0 Summary: The unixsocket modules for Jetty License: Apache-2.0 OR EPL-1.0 @@ -65,6 +65,8 @@ Summary: Javadoc for %{name} find . -name "*.?ar" -exec rm {} \; find . -name "*.class" -exec rm {} \; +%pom_remove_dep :::pom:import + # Plugins irrelevant or harmful to building the package %pom_remove_plugin -r :maven-checkstyle-plugin %pom_remove_plugin -r :maven-enforcer-plugin diff --git a/jetty-websocket.spec b/jetty-websocket.spec index 5f44f20..aee8f6d 100644 --- a/jetty-websocket.spec +++ b/jetty-websocket.spec @@ -18,10 +18,10 @@ %global base_name jetty -%global addver .v20210629 +%global addver .v20220328 %define src_name %{base_name}.project-%{base_name}-%{version}%{addver} Name: %{base_name}-websocket -Version: 9.4.43 +Version: 9.4.46 Release: 0 Summary: The websocket modules for Jetty License: Apache-2.0 OR EPL-1.0 @@ -118,6 +118,8 @@ Summary: Javadoc for %{name} find . -name "*.?ar" -exec rm {} \; find . -name "*.class" -exec rm {} \; +%pom_remove_dep :::import + # Plugins irrelevant or harmful to building the package %pom_remove_plugin -r :maven-checkstyle-plugin %pom_remove_plugin -r :maven-enforcer-plugin diff --git a/jetty.project-jetty-9.4.43.v20210629.tar.gz b/jetty.project-jetty-9.4.43.v20210629.tar.gz deleted file mode 100644 index 622cdaf..0000000 --- a/jetty.project-jetty-9.4.43.v20210629.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc9ec605947b5cd0c4038a4e85b321408fd6992f99bda920cdf98d67d4a1e086 -size 19275305 diff --git a/jetty.project-jetty-9.4.46.v20220328.tar.gz b/jetty.project-jetty-9.4.46.v20220328.tar.gz new file mode 100644 index 0000000..f42e552 --- /dev/null +++ b/jetty.project-jetty-9.4.46.v20220328.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:835199f75dc4f11844441445dd7ce877e5d62d0bcdc9741adcd8075674dad7fb +size 19312390 From f7fb2fd87a6777c591ad27f81c2038f376d4d1c98a6e399a4166284d801379cf Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 29 Mar 2022 13:41:51 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=49 --- jetty-unixsocket.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-unixsocket.spec b/jetty-unixsocket.spec index 79a5873..c443d4e 100644 --- a/jetty-unixsocket.spec +++ b/jetty-unixsocket.spec @@ -65,7 +65,7 @@ Summary: Javadoc for %{name} find . -name "*.?ar" -exec rm {} \; find . -name "*.class" -exec rm {} \; -%pom_remove_dep :::pom:import +%pom_remove_dep :::import # Plugins irrelevant or harmful to building the package %pom_remove_plugin -r :maven-checkstyle-plugin From 6052c0c3f89f42cf8a0e575817a404a0f04cbc653c24c92008de5593efa25a28 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 29 Mar 2022 14:11:19 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=50 --- jetty-websocket.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jetty-websocket.spec b/jetty-websocket.spec index aee8f6d..3997540 100644 --- a/jetty-websocket.spec +++ b/jetty-websocket.spec @@ -306,7 +306,11 @@ sed -i '/= 9}%{!?pkg_vcmp:0} + -Dmaven.compiler.release=8 \ +%endif + -Dsource=8 %install %mvn_install From c276ca8210efa7cfc7a6a0c494cbe472978536359a873dfcb62ed89e47853584 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 29 Mar 2022 14:16:45 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=51 --- jetty-minimal.changes | 16 ++++++++++++++++ jetty-unixsocket.changes | 16 ++++++++++++++++ jetty-websocket.changes | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/jetty-minimal.changes b/jetty-minimal.changes index 5cd38e9..489bb46 100644 --- a/jetty-minimal.changes +++ b/jetty-minimal.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Mar 29 14:13:33 UTC 2022 - Fridrich Strba + +- Upgrade to version 9.4.46.v20220328 + * Changes + + Option --write-module-graph produces wrong .dot file + + ArrayTrie getBest fails to match the empty string entry in + certain cases + + Interrupt flag is not always cleared in between requests + + Gzip compression not working for multipart/form-data when + added to the allowed list using addIncludedMimeTypes. + + Miconfigured headerCacheSize in can result in + IllegalArgumentException + + HttpServletResponse.encodeURL not working for URLs starting + with ../ + ------------------------------------------------------------------- Tue Mar 22 15:49:28 UTC 2022 - Fridrich Strba diff --git a/jetty-unixsocket.changes b/jetty-unixsocket.changes index b9232aa..640315b 100644 --- a/jetty-unixsocket.changes +++ b/jetty-unixsocket.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Mar 29 14:13:33 UTC 2022 - Fridrich Strba + +- Upgrade to version 9.4.46.v20220328 + * Changes + + Option --write-module-graph produces wrong .dot file + + ArrayTrie getBest fails to match the empty string entry in + certain cases + + Interrupt flag is not always cleared in between requests + + Gzip compression not working for multipart/form-data when + added to the allowed list using addIncludedMimeTypes. + + Miconfigured headerCacheSize in can result in + IllegalArgumentException + + HttpServletResponse.encodeURL not working for URLs starting + with ../ + ------------------------------------------------------------------- Tue Mar 22 15:49:28 UTC 2022 - Fridrich Strba diff --git a/jetty-websocket.changes b/jetty-websocket.changes index dafbb6e..6442cd1 100644 --- a/jetty-websocket.changes +++ b/jetty-websocket.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Mar 29 14:13:33 UTC 2022 - Fridrich Strba + +- Upgrade to version 9.4.46.v20220328 + * Changes + + Option --write-module-graph produces wrong .dot file + + ArrayTrie getBest fails to match the empty string entry in + certain cases + + Interrupt flag is not always cleared in between requests + + Gzip compression not working for multipart/form-data when + added to the allowed list using addIncludedMimeTypes. + + Miconfigured headerCacheSize in can result in + IllegalArgumentException + + HttpServletResponse.encodeURL not working for URLs starting + with ../ + ------------------------------------------------------------------- Tue Mar 22 15:49:28 UTC 2022 - Fridrich Strba