From b4eec77423bd441d9b1cee1069e2774754aabdf0 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Thu, 14 Sep 2017 17:30:24 +0300
Subject: [PATCH] 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 <msimacek@redhat.com>
 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#;</Export-Package>#</Export-Package>#' 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 '/<SystemProperty name="jetty.state"/d' \
 %pom_disable_module jetty-rewrite
 %pom_disable_module jetty-nosql
 %pom_disable_module jetty-infinispan
+%pom_disable_module jetty-hazelcast
 %pom_disable_module jetty-unixsocket
 %pom_disable_module tests
 %pom_disable_module examples
@@ -908,6 +923,7 @@ exit 0
 %files fcgi-server -f .mfiles-fcgi-server
 %files http-spi -f .mfiles-jetty-http-spi
 %files infinispan -f .mfiles-jetty-infinispan
+%files hazelcast -f .mfiles-jetty-hazelcast
 %files jaspi -f .mfiles-jetty-jaspi
 %files jndi -f .mfiles-jetty-jndi
 %files jsp -f .mfiles-jetty-jsp
@@ -949,6 +965,9 @@ exit 0
 %license LICENSE-eplv10-aslv20.html LICENSE-MIT
 
 %changelog
+* Wed Sep 13 2017 Michael Simacek <msimacek@redhat.com> - 9.4.7.RC0-1
+- Update to upstream version 9.4.7.RC0
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 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