From 0cf79ade288483ec5b1c22e97e8f9684e2571655 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Apr 30 2018 13:55:01 +0000 Subject: Update to upstream version 9.4.10.RC1 --- 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