diff --git a/.gitignore b/.gitignore index d1cd688..f46c423 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ jetty-6.1.26-src.zip /jetty-9.4.0.v20161208.tar.gz /jetty-9.4.1.v20170120.tar.gz /jetty-9.4.2.v20170220.tar.gz +/jetty-9.4.3.v20170317.tar.gz diff --git a/0002-Make-the-requirement-on-osgi.serviceloader.processor.patch b/0002-Make-the-requirement-on-osgi.serviceloader.processor.patch deleted file mode 100644 index ec2d819..0000000 --- a/0002-Make-the-requirement-on-osgi.serviceloader.processor.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d6fcb5daacecdcdc6717447b32f7afb33bd5024e Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Wed, 1 Mar 2017 14:02:42 +0000 -Subject: [PATCH 2/2] Make the requirement on "osgi.serviceloader.processor" - optional - -This allows Eclipse to continue to make use of jetty-http -without requiring the presence of Apache Aries bundles. - -Signed-off-by: Mat Booth ---- - jetty-http/pom.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml -index 567fc89..d512469 100644 ---- a/jetty-http/pom.xml -+++ b/jetty-http/pom.xml -@@ -37,7 +37,7 @@ - true - - -- osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" -+ osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.http.HttpFieldPreEncoder)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)" - --- -2.9.3 - diff --git a/jetty.spec b/jetty.spec index 2c22f47..d7bf980 100644 --- a/jetty.spec +++ b/jetty.spec @@ -40,7 +40,7 @@ %global appdir %{jettylibdir}/webapps -%global addver v20170220 +%global addver .v20170317 # minimal version required to build eclipse and thermostat # eclipse needs: util, server, http, continuation, io, security, servlet @@ -49,14 +49,14 @@ %bcond_with jp_minimal Name: jetty -Version: 9.4.2 -Release: 3.%{addver}%{?dist} +Version: 9.4.3 +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 License: ASL 2.0 or EPL URL: http://www.eclipse.org/jetty/ -Source0: https://github.com/eclipse/%{name}.project/archive/%{name}-%{version}.%{addver}.tar.gz +Source0: https://github.com/eclipse/%{name}.project/archive/%{name}-%{version}%{addver}.tar.gz Source1: jetty.sh Source3: jetty.logrotate Source5: %{name}.service @@ -64,8 +64,6 @@ Source5: %{name}.service Source6: LICENSE-MIT Patch1: 0001-Fedora-jetty.home.patch -# https://github.com/eclipse/jetty.project/pull/1365 -Patch2: 0002-Make-the-requirement-on-osgi.serviceloader.processor.patch BuildRequires: maven-local BuildRequires: mvn(javax.servlet:javax.servlet-api) @@ -593,10 +591,9 @@ License: (ASL 2.0 or EPL) and MIT %{summary}. %prep -%setup -q -n %{name}.project-%{name}-%{version}.%{addver} +%setup -q -n %{name}.project-%{name}-%{version}%{addver} %patch1 -p1 -%patch2 -p1 find . -name "*.?ar" -exec rm {} \; find . -name "*.class" -exec rm {} \; @@ -951,6 +948,9 @@ exit 0 %license LICENSE-eplv10-aslv20.html LICENSE-MIT %changelog +* Tue Mar 28 2017 Michael Simacek - 9.4.3-1.v20170317 +- Update to upstream version 9.4.3.v20170317 + * Thu Mar 16 2017 Michael Simacek - 9.4.2-3.v20170220 - Rework conditionals - Switch jsp provider to glassfish - it's newer diff --git a/sources b/sources index a84ef1c..b52dbb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jetty-9.4.2.v20170220.tar.gz) = f3f790cac7a3dcb4c2b825c4a2b6e9a22df97ec9e36aacd8e40d2ea60fdea8e939505d4138d3b53102ce9e5c1618d5ce79855efd97f3fa79bea5a014f0516ab5 +SHA512 (jetty-9.4.3.v20170317.tar.gz) = 87bbab24d4a5f53384e2b4f436de60e0fae79b1f95d1b8f34f793997bfa5dd19b1af75c1725d2b97995b1a04e44d030bec449b0efe2a5ac229cfe7fd654ef12d