From da522ed16bea7b8ef419958183c31886c22b0994 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mar 21 2018 14:09:47 +0000
Subject: Update to upstream 9.4.9 release.


Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
---

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 '/<SystemProperty name="jetty.state"/d' \
 %pom_disable_module jetty-home
 
 %endif # with jp_minimal
-
+%patch2 -b .sav2
 
 %build
 %mvn_package :jetty-home __noinstall
@@ -965,6 +967,9 @@ exit 0
 %license LICENSE-eplv10-aslv20.html LICENSE-MIT
 
 %changelog
+* Wed Mar 21 2018 Alexander Kurtakov <akurtako@redhat.com> 9.4.9-1.v20180320
+- Update to upstream 9.4.9 release.
+
 * Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 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 @@
+               </descriptors>
+             </configuration>
+           </execution>
+-          <execution>
+-            <id>sources</id>
+-            <phase>package</phase>
+-            <goals>
+-              <goal>single</goal>
+-            </goals>
+-            <configuration>
+-              <descriptors>
+-                <descriptor>src/main/assembly/jetty-source-assembly.xml</descriptor>
+-              </descriptors>
+-              <appendAssemblyId>true</appendAssemblyId>
+-            </configuration>
+-          </execution>
+         </executions>
+       </plugin>
+       <!-- No point performing PMD in assembly project -->
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