From 69ae0b51a1525f0cf24f99f6c663c7434bddd58a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 14:24:09 +0000 Subject: [PATCH 01/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- jetty.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jetty.spec b/jetty.spec index d8906da..5da20a5 100644 --- a/jetty.spec +++ b/jetty.spec @@ -50,7 +50,7 @@ Name: jetty Version: 9.4.6 -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 @@ -949,6 +949,9 @@ exit 0 %license LICENSE-eplv10-aslv20.html LICENSE-MIT %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 9.4.6-2.v20170531 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Jun 15 2017 Michael Simacek - 9.4.6-1.v20170531 - Update to upstream version 9.4.6.v20170531 From b4eec77423bd441d9b1cee1069e2774754aabdf0 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 14 Sep 2017 17:30:24 +0300 Subject: [PATCH 02/59] Update to upstream version 9.4.7.RC0 --- .gitignore | 1 + 0001-Fedora-jetty.home.patch | 4 ++-- jetty.spec | 25 ++++++++++++++++++++++--- sources | 2 +- 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index dd49057..cfbf97e 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ jetty-6.1.26-src.zip /jetty-9.4.4.v20170414.tar.gz /jetty-9.4.5.v20170502.tar.gz /jetty-9.4.6.v20170531.tar.gz +/jetty-9.4.7.RC0.tar.gz diff --git a/0001-Fedora-jetty.home.patch b/0001-Fedora-jetty.home.patch index 5eea859..6515306 100644 --- a/0001-Fedora-jetty.home.patch +++ b/0001-Fedora-jetty.home.patch @@ -1,4 +1,4 @@ -From 7e5f12832e4d87dda7cde9b073b2a382b1cdcb9d Mon Sep 17 00:00:00 2001 +From 4cdbf3c62c7b21f5e7bcea51f232085ab50bf242 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 2 Jun 2015 22:52:21 +0200 Subject: [PATCH] Fedora jetty.home @@ -22,5 +22,5 @@ index d1facfe..70f0366 100644 return home; } -- -2.9.3 +2.13.5 diff --git a/jetty.spec b/jetty.spec index 5da20a5..7e5489b 100644 --- a/jetty.spec +++ b/jetty.spec @@ -40,7 +40,7 @@ %global appdir %{jettylibdir}/webapps -%global addver .v20170531 +%global addver .RC0 # 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.6 -Release: 2%{addver}%{?dist} +Version: 9.4.7 +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 @@ -76,6 +76,8 @@ BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: maven-local BuildRequires: mvn(com.github.jnr:jnr-unixsocket) BuildRequires: mvn(com.google.guava:guava) +BuildRequires: mvn(com.hazelcast:hazelcast) +BuildRequires: mvn(com.hazelcast:hazelcast-client) BuildRequires: mvn(javax.annotation:javax.annotation-api) BuildRequires: mvn(javax.enterprise:cdi-api) BuildRequires: mvn(javax.servlet:javax.servlet-api) @@ -172,6 +174,7 @@ Requires: %{name}-util-ajax = %{version}-%{release} Requires: %{name}-webapp = %{version}-%{release} Requires: %{name}-xml = %{version}-%{release} Requires: %{name}-infinispan = %{version}-%{release} +Requires: %{name}-hazelcast = %{version}-%{release} Requires: %{name}-cdi = %{version}-%{release} Requires: %{name}-websocket-api = %{version}-%{release} Requires: %{name}-websocket-client = %{version}-%{release} @@ -358,6 +361,12 @@ Summary: Jetty CDI Configuration %description cdi %{extdesc} %{summary}. +%package hazelcast +Summary: hazelcast module for Jetty + +%description hazelcast +%{extdesc} %{summary}. + %package fcgi-client Summary: FastCGI client module for Jetty @@ -659,6 +668,11 @@ sed -i 's#;##' jetty-http2/http2-common/pom.xm %pom_disable_module test-memcached-sessions tests/test-sessions %pom_remove_dep :jetty-memcached-sessions jetty-home +# missing test deps for jetty-hazelcast +rm -r jetty-hazelcast/src/test +%pom_remove_dep :::test jetty-hazelcast +%pom_xpath_remove 'pom:dependency[pom:type="test-jar"]' jetty-hazelcast + cp %{SOURCE6} . # the default location is not allowed by SELinux @@ -695,6 +709,7 @@ sed -i '/ - 9.4.7.RC0-1 +- Update to upstream version 9.4.7.RC0 + * Wed Jul 26 2017 Fedora Release Engineering - 9.4.6-2.v20170531 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index 2815a58..754fce4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jetty-9.4.6.v20170531.tar.gz) = d11687cb844e241812d72e43aabd792054309e702ceea10c8dd22dad7099886d097f4b6acfd5229fc27674ba519de34b55fcf24c89a83f5719d94ae5ab149bd8 +SHA512 (jetty-9.4.7.RC0.tar.gz) = ab3d5f8536a5e6ece126ce9893f2f810bfabaa57fc582ed5d3cd78143f2f627d6d70bb5c6328895b1fd4bb70af6593360060e34983c014647214c61c3a116712 From 147fe39f690d53dbd91258dd62d370e9092963d1 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 20 Sep 2017 10:10:27 +0300 Subject: [PATCH 03/59] Update to upstream version 9.4.7.v20170914 --- .gitignore | 1 + jetty.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cfbf97e..d8796b6 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ jetty-6.1.26-src.zip /jetty-9.4.5.v20170502.tar.gz /jetty-9.4.6.v20170531.tar.gz /jetty-9.4.7.RC0.tar.gz +/jetty-9.4.7.v20170914.tar.gz diff --git a/jetty.spec b/jetty.spec index 7e5489b..27cacf3 100644 --- a/jetty.spec +++ b/jetty.spec @@ -40,7 +40,7 @@ %global appdir %{jettylibdir}/webapps -%global addver .RC0 +%global addver .v20170914 # minimal version required to build eclipse and thermostat # eclipse needs: util, server, http, continuation, io, security, servlet @@ -965,6 +965,9 @@ exit 0 %license LICENSE-eplv10-aslv20.html LICENSE-MIT %changelog +* Wed Sep 20 2017 Michael Simacek - 9.4.7-1.v20170914 +- Update to upstream version 9.4.7.v20170914 + * Wed Sep 13 2017 Michael Simacek - 9.4.7.RC0-1 - Update to upstream version 9.4.7.RC0 diff --git a/sources b/sources index 754fce4..81948b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jetty-9.4.7.RC0.tar.gz) = ab3d5f8536a5e6ece126ce9893f2f810bfabaa57fc582ed5d3cd78143f2f627d6d70bb5c6328895b1fd4bb70af6593360060e34983c014647214c61c3a116712 +SHA512 (jetty-9.4.7.v20170914.tar.gz) = f2a38ca7422887a2d731ea411670e4ff6c4302e604e00e2e76f1f7d6a6fbd039216d1ed1542279a5dc6df8d80ee6afc687cfd60ff53b9fb716d030c1d7a6921c From 7f635e2d7e3c3fbb9483cbb2fb761ab72d31782b Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 6 Dec 2017 12:40:39 +0200 Subject: [PATCH 04/59] Update to upstream version 9.4.8.v20171121 --- .gitignore | 1 + jetty.spec | 27 +++++++++++++++++++++------ sources | 2 +- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d8796b6..41b71d4 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ jetty-6.1.26-src.zip /jetty-9.4.6.v20170531.tar.gz /jetty-9.4.7.RC0.tar.gz /jetty-9.4.7.v20170914.tar.gz +/jetty-9.4.8.v20171121.tar.gz diff --git a/jetty.spec b/jetty.spec index 27cacf3..4e78030 100644 --- a/jetty.spec +++ b/jetty.spec @@ -40,7 +40,7 @@ %global appdir %{jettylibdir}/webapps -%global addver .v20170914 +%global addver .v20171121 # 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.7 +Version: 9.4.8 Release: 1%{addver}%{?dist} Summary: Java Webserver and Servlet Container @@ -75,7 +75,6 @@ BuildRequires: mvn(org.slf4j:slf4j-api) %if %{without jp_minimal} BuildRequires: maven-local BuildRequires: mvn(com.github.jnr:jnr-unixsocket) -BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(com.hazelcast:hazelcast) BuildRequires: mvn(com.hazelcast:hazelcast-client) BuildRequires: mvn(javax.annotation:javax.annotation-api) @@ -85,6 +84,7 @@ BuildRequires: mvn(javax.servlet.jsp:javax.servlet.jsp-api) BuildRequires: mvn(javax.servlet:jstl) BuildRequires: mvn(javax.transaction:javax.transaction-api) BuildRequires: mvn(javax.websocket:javax.websocket-api) +BuildRequires: mvn(javax.websocket:javax.websocket-client-api) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.ant:ant-launcher) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) @@ -100,17 +100,19 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-war-plugin) +BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-api) +BuildRequires: mvn(org.apache.maven.shared:maven-artifact-transfer) BuildRequires: mvn(org.apache.taglibs:taglibs-standard-impl) 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.jdt.core.compiler:ecj) 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) @@ -126,7 +128,6 @@ BuildRequires: mvn(org.springframework:spring-beans) BuildRequires: mvn(org.mortbay.jetty.alpn:alpn-boot) BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-artifact-remote-resources) BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-distribution-remote-resources) -BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-assembly-descriptors) BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-test-policy) #BuildRequires: mvn(org.eclipse.jetty.toolchain.setuid:jetty-setuid-java) BuildRequires: maven-javadoc-plugin @@ -619,6 +620,7 @@ find . -name "*.class" -exec rm {} \; %pom_remove_plugin -r :maven-deploy-plugin %pom_remove_plugin -r :jacoco-maven-plugin %pom_remove_plugin -r :maven-release-plugin +%pom_remove_plugin -r :buildnumber-maven-plugin %pom_disable_module aggregates/jetty-all @@ -673,6 +675,12 @@ rm -r jetty-hazelcast/src/test %pom_remove_dep :::test jetty-hazelcast %pom_xpath_remove 'pom:dependency[pom:type="test-jar"]' jetty-hazelcast +# missing conscrypt +%pom_disable_module jetty-alpn-conscrypt-server jetty-alpn +%pom_disable_module jetty-alpn-conscrypt-client jetty-alpn +%pom_remove_dep -r :jetty-alpn-conscrypt-server +%pom_remove_dep -r :jetty-alpn-conscrypt-client + cp %{SOURCE6} . # the default location is not allowed by SELinux @@ -752,6 +760,10 @@ sed -i '/ - 9.4.8-1.v20171121 +- Update to upstream version 9.4.8.v20171121 + * Wed Sep 20 2017 Michael Simacek - 9.4.7-1.v20170914 - Update to upstream version 9.4.7.v20170914 diff --git a/sources b/sources index 81948b9..9c57a6a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jetty-9.4.7.v20170914.tar.gz) = f2a38ca7422887a2d731ea411670e4ff6c4302e604e00e2e76f1f7d6a6fbd039216d1ed1542279a5dc6df8d80ee6afc687cfd60ff53b9fb716d030c1d7a6921c +SHA512 (jetty-9.4.8.v20171121.tar.gz) = f52a3363cf9d3f643b84fb9e3ed60b74ad0c0c7d8a197e6bfd61ef1881b784a940f26295229b2e153505f1765b5a8c2a89adbddcd8695e01d59dc2b72afb1f75 From a0bc6315106c18f44e6288cba7705ab58c1dd1f7 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 25 Jan 2018 16:46:39 +0100 Subject: [PATCH 05/59] Remove obsolete systemd conversion scriptlet --- jetty.spec | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/jetty.spec b/jetty.spec index 4e78030..d5afcd0 100644 --- a/jetty.spec +++ b/jetty.spec @@ -50,7 +50,7 @@ Name: jetty Version: 9.4.8 -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 @@ -132,7 +132,7 @@ BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-test-policy) #BuildRequires: mvn(org.eclipse.jetty.toolchain.setuid:jetty-setuid-java) BuildRequires: maven-javadoc-plugin BuildRequires: glassfish-el -BuildRequires: systemd-units +BuildRequires: systemd # duplicate providers, choose one BuildRequires: jboss-websocket-1.0-api @@ -201,9 +201,7 @@ Requires: %{name}-http2-http-client-transport = %{version}-%{release} Requires: %{name}-http2-server = %{version}-%{release} Requires(pre): shadow-utils -Requires(post): systemd-units, systemd-sysv -Requires(preun): systemd-units -Requires(postun): systemd-units +%{?systemd_ordering} Provides: group(%username) = %jtuid @@ -882,16 +880,6 @@ exit 0 %systemd_postun_with_restart jetty.service -%triggerun -- jetty < 8.1.0-3 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply httpd -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save jetty >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del jetty >/dev/null 2>&1 || : -/bin/systemctl try-restart jetty.service >/dev/null 2>&1 || : - %endif # without jp_minimal %files client -f .mfiles-jetty-client @@ -977,6 +965,9 @@ exit 0 %license LICENSE-eplv10-aslv20.html LICENSE-MIT %changelog +* Thu Jan 25 2018 Michael Simacek - 9.4.8-2.v20171121 +- Remove obsolete systemd conversion scriptlet + * Mon Dec 04 2017 Michael Simacek - 9.4.8-1.v20171121 - Update to upstream version 9.4.8.v20171121 From 3d39940c442636cf70f346ebf464bfd6c3b55a06 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 18:43:27 +0000 Subject: [PATCH 06/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 d5afcd0..ca0c6fc 100644 --- a/jetty.spec +++ b/jetty.spec @@ -50,7 +50,7 @@ Name: jetty Version: 9.4.8 -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 @@ -965,6 +965,9 @@ exit 0 %license LICENSE-eplv10-aslv20.html LICENSE-MIT %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 9.4.8-3.v20171121 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jan 25 2018 Michael Simacek - 9.4.8-2.v20171121 - Remove obsolete systemd conversion scriptlet From 185ac9f99610c5a5e9e1428f9dec93df704e23f1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:04:47 +0100 Subject: [PATCH 07/59] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- jetty.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jetty.spec b/jetty.spec index ca0c6fc..ad21fe5 100644 --- a/jetty.spec +++ b/jetty.spec @@ -50,7 +50,7 @@ Name: jetty Version: 9.4.8 -Release: 3%{addver}%{?dist} +Release: 4%{addver}%{?dist} Summary: Java Webserver and Servlet Container # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt @@ -965,6 +965,9 @@ exit 0 %license LICENSE-eplv10-aslv20.html LICENSE-MIT %changelog +* Fri Feb 09 2018 Igor Gnatenko - 9.4.8-4.v20171121 +- Escape macros in %%changelog + * Wed Feb 07 2018 Fedora Release Engineering - 9.4.8-3.v20171121 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild @@ -1570,7 +1573,7 @@ exit 0 - Avoid circular dependency with mx4j-tools thru bootstrap option * Sat Aug 12 2006 Anthony Green - 0:5.1.11-0.rc0.4jpp -- Escape macros in changelog with %. +- Escape macros in changelog with %%. - Untabify. - Don't delete symlinks in %%preun. - Add logrotate file. From da522ed16bea7b8ef419958183c31886c22b0994 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 21 Mar 2018 16:09:47 +0200 Subject: [PATCH 08/59] Update to upstream 9.4.9 release. Signed-off-by: Alexander Kurtakov --- .gitignore | 1 + jetty.spec | 13 +++++++++---- rem-jetty-home-source.patch | 22 ++++++++++++++++++++++ sources | 2 +- 4 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 rem-jetty-home-source.patch diff --git a/.gitignore b/.gitignore index 41b71d4..e2f3c1f 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ jetty-6.1.26-src.zip /jetty-9.4.7.RC0.tar.gz /jetty-9.4.7.v20170914.tar.gz /jetty-9.4.8.v20171121.tar.gz +/jetty-9.4.9.v20180320.tar.gz diff --git a/jetty.spec b/jetty.spec index ad21fe5..93a7ba6 100644 --- a/jetty.spec +++ b/jetty.spec @@ -40,7 +40,7 @@ %global appdir %{jettylibdir}/webapps -%global addver .v20171121 +%global addver .v20180320 # 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.8 -Release: 4%{addver}%{?dist} +Version: 9.4.9 +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 @@ -64,6 +64,7 @@ Source5: %{name}.service Source6: LICENSE-MIT Patch1: 0001-Fedora-jetty.home.patch +Patch2: rem-jetty-home-source.patch BuildRequires: maven-local BuildRequires: mvn(javax.servlet:javax.servlet-api) @@ -678,6 +679,7 @@ rm -r jetty-hazelcast/src/test %pom_disable_module jetty-alpn-conscrypt-client jetty-alpn %pom_remove_dep -r :jetty-alpn-conscrypt-server %pom_remove_dep -r :jetty-alpn-conscrypt-client +rm -fr examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java cp %{SOURCE6} . @@ -728,7 +730,7 @@ sed -i '/ 9.4.9-1.v20180320 +- Update to upstream 9.4.9 release. + * Fri Feb 09 2018 Igor Gnatenko - 9.4.8-4.v20171121 - Escape macros in %%changelog diff --git a/rem-jetty-home-source.patch b/rem-jetty-home-source.patch new file mode 100644 index 0000000..b3a93b1 --- /dev/null +++ b/rem-jetty-home-source.patch @@ -0,0 +1,22 @@ +--- jetty-home/pom.xml.sav2 2018-03-21 15:46:44.920171365 +0200 ++++ jetty-home/pom.xml 2018-03-21 15:47:22.743109692 +0200 +@@ -425,19 +406,6 @@ + + + +- +- sources +- package +- +- single +- +- +- +- src/main/assembly/jetty-source-assembly.xml +- +- true +- +- + + + diff --git a/sources b/sources index 9c57a6a..b301d46 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jetty-9.4.8.v20171121.tar.gz) = f52a3363cf9d3f643b84fb9e3ed60b74ad0c0c7d8a197e6bfd61ef1881b784a940f26295229b2e153505f1765b5a8c2a89adbddcd8695e01d59dc2b72afb1f75 +SHA512 (jetty-9.4.9.v20180320.tar.gz) = c3d5a6615b8fed234f74904bdfd4d914ba254168f5207fd362e5c06ece5022f2ed93383f24c406b1ce943c95db51e250ed8d00d2049de73e39b28f3abccd8b9d From 02f246d4d44a8c02f4084b4d68c0808e70ad554e Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 23 Mar 2018 16:29:41 +0000 Subject: [PATCH 09/59] Make the requirement on "osgi.serviceloader.processor" optional --- ...ment-on-osgi.serviceloader.processor.patch | 50 +++++++++++++++++++ jetty.spec | 9 +++- 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 0001-Make-the-requirement-on-osgi.serviceloader.processor.patch diff --git a/0001-Make-the-requirement-on-osgi.serviceloader.processor.patch b/0001-Make-the-requirement-on-osgi.serviceloader.processor.patch new file mode 100644 index 0000000..0b5e8a8 --- /dev/null +++ b/0001-Make-the-requirement-on-osgi.serviceloader.processor.patch @@ -0,0 +1,50 @@ +From 0e93c25af3326e85e8fe37631783763aa151b584 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Fri, 23 Mar 2018 16:20:45 +0000 +Subject: [PATCH] Make the requirement on "osgi.serviceloader.processor" + optional + +This allows Eclipse to continue to make use of jetty-* bundles +without requiring the presence of Apache Aries. + +This fixes a problem introduced by the resolution to #2164 and +the same solution is used as in 10cdf16 + +See also the discussion at Eclipse: +https://bugs.eclipse.org/bugs/show_bug.cgi?id=532294 + +Signed-off-by: Mat Booth +--- + jetty-util/pom.xml | 2 +- + jetty-xml/pom.xml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml +index 5813e02d52..936d545aa5 100644 +--- a/jetty-util/pom.xml ++++ b/jetty-util/pom.xml +@@ -50,7 +50,7 @@ + true + + +- osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.util.security.CredentialProvider)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)" ++ osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.util.security.CredentialProvider)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + + + +diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml +index 15cefddcaa..43b8ddbc84 100644 +--- a/jetty-xml/pom.xml ++++ b/jetty-xml/pom.xml +@@ -27,7 +27,7 @@ + true + + +- osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.xml.ConfigurationProcessorFactory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)" ++ osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.xml.ConfigurationProcessorFactory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional + + + +-- +2.14.3 + diff --git a/jetty.spec b/jetty.spec index 93a7ba6..9c62a15 100644 --- a/jetty.spec +++ b/jetty.spec @@ -50,7 +50,7 @@ Name: jetty Version: 9.4.9 -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 @@ -64,7 +64,8 @@ Source5: %{name}.service Source6: LICENSE-MIT Patch1: 0001-Fedora-jetty.home.patch -Patch2: rem-jetty-home-source.patch +Patch2: rem-jetty-home-source.patch +Patch3: 0001-Make-the-requirement-on-osgi.serviceloader.processor.patch BuildRequires: maven-local BuildRequires: mvn(javax.servlet:javax.servlet-api) @@ -603,6 +604,7 @@ License: (ASL 2.0 or EPL) and MIT %setup -q -n %{name}.project-%{name}-%{version}%{addver} %patch1 -p1 +%patch3 -p1 find . -name "*.?ar" -exec rm {} \; find . -name "*.class" -exec rm {} \; @@ -967,6 +969,9 @@ exit 0 %license LICENSE-eplv10-aslv20.html LICENSE-MIT %changelog +* Fri Mar 23 2018 Mat Booth - 9.4.9-2.v20180320 +- Make the requirement on "osgi.serviceloader.processor" optional + * Wed Mar 21 2018 Alexander Kurtakov 9.4.9-1.v20180320 - Update to upstream 9.4.9 release. From 0cf79ade288483ec5b1c22e97e8f9684e2571655 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 30 Apr 2018 15:55:01 +0200 Subject: [PATCH 10/59] Update to upstream version 9.4.10.RC1 --- .gitignore | 1 + 0001-Fedora-jetty.home.patch | 6 +-- ...ment-on-osgi.serviceloader.processor.patch | 50 ------------------- jetty.spec | 16 +++--- rem-jetty-home-source.patch | 22 -------- sources | 2 +- 6 files changed, 14 insertions(+), 83 deletions(-) delete mode 100644 0001-Make-the-requirement-on-osgi.serviceloader.processor.patch delete mode 100644 rem-jetty-home-source.patch diff --git a/.gitignore b/.gitignore index e2f3c1f..acd6347 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ jetty-6.1.26-src.zip /jetty-9.4.7.v20170914.tar.gz /jetty-9.4.8.v20171121.tar.gz /jetty-9.4.9.v20180320.tar.gz +/jetty-9.4.10.RC1.tar.gz diff --git a/0001-Fedora-jetty.home.patch b/0001-Fedora-jetty.home.patch index 6515306..ec360ed 100644 --- a/0001-Fedora-jetty.home.patch +++ b/0001-Fedora-jetty.home.patch @@ -1,4 +1,4 @@ -From 4cdbf3c62c7b21f5e7bcea51f232085ab50bf242 Mon Sep 17 00:00:00 2001 +From 703f47588a6c1b027bb7f5e3aedbc112a94b1c85 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 2 Jun 2015 22:52:21 +0200 Subject: [PATCH] Fedora jetty.home @@ -8,7 +8,7 @@ Subject: [PATCH] Fedora jetty.home 1 file changed, 3 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 d1facfe..70f0366 100644 +index f0c9e07..7d2ee3e 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 @@ -22,5 +22,5 @@ index d1facfe..70f0366 100644 return home; } -- -2.13.5 +2.14.3 diff --git a/0001-Make-the-requirement-on-osgi.serviceloader.processor.patch b/0001-Make-the-requirement-on-osgi.serviceloader.processor.patch deleted file mode 100644 index 0b5e8a8..0000000 --- a/0001-Make-the-requirement-on-osgi.serviceloader.processor.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0e93c25af3326e85e8fe37631783763aa151b584 Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Fri, 23 Mar 2018 16:20:45 +0000 -Subject: [PATCH] Make the requirement on "osgi.serviceloader.processor" - optional - -This allows Eclipse to continue to make use of jetty-* bundles -without requiring the presence of Apache Aries. - -This fixes a problem introduced by the resolution to #2164 and -the same solution is used as in 10cdf16 - -See also the discussion at Eclipse: -https://bugs.eclipse.org/bugs/show_bug.cgi?id=532294 - -Signed-off-by: Mat Booth ---- - jetty-util/pom.xml | 2 +- - jetty-xml/pom.xml | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml -index 5813e02d52..936d545aa5 100644 ---- a/jetty-util/pom.xml -+++ b/jetty-util/pom.xml -@@ -50,7 +50,7 @@ - true - - -- osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.util.security.CredentialProvider)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)" -+ osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.util.security.CredentialProvider)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - -diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml -index 15cefddcaa..43b8ddbc84 100644 ---- a/jetty-xml/pom.xml -+++ b/jetty-xml/pom.xml -@@ -27,7 +27,7 @@ - true - - -- osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.xml.ConfigurationProcessorFactory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)" -+ osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.xml.ConfigurationProcessorFactory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional - - - --- -2.14.3 - diff --git a/jetty.spec b/jetty.spec index 9c62a15..d550e2b 100644 --- a/jetty.spec +++ b/jetty.spec @@ -40,7 +40,7 @@ %global appdir %{jettylibdir}/webapps -%global addver .v20180320 +%global addver .RC1 # 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.9 -Release: 2%{addver}%{?dist} +Version: 9.4.10 +Release: 0.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 @@ -64,8 +64,6 @@ Source5: %{name}.service Source6: LICENSE-MIT Patch1: 0001-Fedora-jetty.home.patch -Patch2: rem-jetty-home-source.patch -Patch3: 0001-Make-the-requirement-on-osgi.serviceloader.processor.patch BuildRequires: maven-local BuildRequires: mvn(javax.servlet:javax.servlet-api) @@ -604,7 +602,6 @@ License: (ASL 2.0 or EPL) and MIT %setup -q -n %{name}.project-%{name}-%{version}%{addver} %patch1 -p1 -%patch3 -p1 find . -name "*.?ar" -exec rm {} \; find . -name "*.class" -exec rm {} \; @@ -639,6 +636,9 @@ find . -name "*.class" -exec rm {} \; %pom_remove_plugin ":jetty-version-maven-plugin" %pom_xpath_remove "pom:artifactItem[pom:classifier='version']" jetty-home +# Disable building source release +%pom_xpath_remove 'pom:execution[pom:id="sources"]' jetty-home + # Remove google analytics from javadoc %pom_xpath_remove 'pom:plugin[pom:artifactId="maven-javadoc-plugin"]/pom:configuration/pom:header' @@ -732,7 +732,6 @@ sed -i '/ - 9.4.10-0.1.RC1 +- Update to upstream version 9.4.10.RC1 + * Fri Mar 23 2018 Mat Booth - 9.4.9-2.v20180320 - Make the requirement on "osgi.serviceloader.processor" optional diff --git a/rem-jetty-home-source.patch b/rem-jetty-home-source.patch deleted file mode 100644 index b3a93b1..0000000 --- a/rem-jetty-home-source.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- jetty-home/pom.xml.sav2 2018-03-21 15:46:44.920171365 +0200 -+++ jetty-home/pom.xml 2018-03-21 15:47:22.743109692 +0200 -@@ -425,19 +406,6 @@ - - - -- -- sources -- package -- -- single -- -- -- -- src/main/assembly/jetty-source-assembly.xml -- -- true -- -- - - - diff --git a/sources b/sources index b301d46..472472e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jetty-9.4.9.v20180320.tar.gz) = c3d5a6615b8fed234f74904bdfd4d914ba254168f5207fd362e5c06ece5022f2ed93383f24c406b1ce943c95db51e250ed8d00d2049de73e39b28f3abccd8b9d +SHA512 (jetty-9.4.10.RC1.tar.gz) = 29ef7790be0f5fe4b98702838eead1ac178bcb01a974cc5d43399580346e027ce63b6c49b81550284a5cdf9a7f78077015b1d6459f1c6625ebaafc484abb2979 From 7abbfbdd8a059487a2bb8ac1226ba42d52eb45c9 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 9 May 2018 11:53:23 +0200 Subject: [PATCH 11/59] Update to upstream version 9.4.10.v20180503 --- .gitignore | 1 + jetty.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index acd6347..e80f0fc 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ jetty-6.1.26-src.zip /jetty-9.4.8.v20171121.tar.gz /jetty-9.4.9.v20180320.tar.gz /jetty-9.4.10.RC1.tar.gz +/jetty-9.4.10.v20180503.tar.gz diff --git a/jetty.spec b/jetty.spec index d550e2b..893fc6e 100644 --- a/jetty.spec +++ b/jetty.spec @@ -40,7 +40,7 @@ %global appdir %{jettylibdir}/webapps -%global addver .RC1 +%global addver .v20180503 # minimal version required to build eclipse and thermostat # eclipse needs: util, server, http, continuation, io, security, servlet @@ -50,7 +50,7 @@ Name: jetty Version: 9.4.10 -Release: 0.1%{addver}%{?dist} +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 @@ -968,6 +968,9 @@ exit 0 %license LICENSE-eplv10-aslv20.html LICENSE-MIT %changelog +* Wed May 09 2018 Michael Simacek - 9.4.10-1.v20180503 +- Update to upstream version 9.4.10.v20180503 + * Mon Apr 30 2018 Michael Simacek - 9.4.10-0.1.RC1 - Update to upstream version 9.4.10.RC1 diff --git a/sources b/sources index 472472e..dd95389 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jetty-9.4.10.RC1.tar.gz) = 29ef7790be0f5fe4b98702838eead1ac178bcb01a974cc5d43399580346e027ce63b6c49b81550284a5cdf9a7f78077015b1d6459f1c6625ebaafc484abb2979 +SHA512 (jetty-9.4.10.v20180503.tar.gz) = 9a4adf7632627abec3d324ce3105fb32d1b5db23558b8e93cdcaedda55befdd9002f9d3b321ab9f917bc25ebe56a3e4d88102b93161213162b7b38c72ad20337 From 414e9c7cf8cf46b7d5757a611e2acf8229c74cfa Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 8 Jun 2018 12:40:59 +0200 Subject: [PATCH 12/59] Update to upstream version 9.4.11.v20180605 --- .gitignore | 1 + 0001-Fedora-jetty.home.patch | 6 +++--- jetty.spec | 13 ++++++++----- sources | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e80f0fc..6954f48 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ jetty-6.1.26-src.zip /jetty-9.4.9.v20180320.tar.gz /jetty-9.4.10.RC1.tar.gz /jetty-9.4.10.v20180503.tar.gz +/jetty-9.4.11.v20180605.tar.gz diff --git a/0001-Fedora-jetty.home.patch b/0001-Fedora-jetty.home.patch index ec360ed..3d40be5 100644 --- a/0001-Fedora-jetty.home.patch +++ b/0001-Fedora-jetty.home.patch @@ -1,10 +1,10 @@ -From 703f47588a6c1b027bb7f5e3aedbc112a94b1c85 Mon Sep 17 00:00:00 2001 +From e1f6d2f9749b6a04a3b7d163d17df41751fb8977 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 2 Jun 2015 22:52:21 +0200 Subject: [PATCH] Fedora jetty.home --- - .../java/org/eclipse/jetty/start/config/CommandLineConfigSource.java | 3 +++ + .../eclipse/jetty/start/config/CommandLineConfigSource.java | 3 +++ 1 file changed, 3 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 @@ -22,5 +22,5 @@ index f0c9e07..7d2ee3e 100644 return home; } -- -2.14.3 +2.17.1 diff --git a/jetty.spec b/jetty.spec index 893fc6e..9d9c8ca 100644 --- a/jetty.spec +++ b/jetty.spec @@ -40,7 +40,7 @@ %global appdir %{jettylibdir}/webapps -%global addver .v20180503 +%global addver .v20180605 # 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.10 +Version: 9.4.11 Release: 1%{addver}%{?dist} Summary: Java Webserver and Servlet Container @@ -639,15 +639,15 @@ find . -name "*.class" -exec rm {} \; # Disable building source release %pom_xpath_remove 'pom:execution[pom:id="sources"]' jetty-home -# Remove google analytics from javadoc -%pom_xpath_remove 'pom:plugin[pom:artifactId="maven-javadoc-plugin"]/pom:configuration/pom:header' - # Unwanted JS in javadoc sed -i '/^\s*\*.*