From 5bead4cb07e2af59b1da1359b29d3ee7b11fb314 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Jul 02 2018 14:29:18 +0000
Subject: Fix missing classes in start.jar


---

diff --git a/jetty.spec b/jetty.spec
index 9d9c8ca..9b119fe 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -50,7 +50,7 @@
 
 Name:           jetty
 Version:        9.4.11
-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
@@ -811,8 +811,8 @@ build-jar-repository %{buildroot}%{homedir}/lib/apache-jsp \
 ecj=`echo %{buildroot}%{homedir}/lib/apache-jsp/org.eclipse.jdt.ecj-*.jar`
 rm $ecj
 
-# substitute dependency jars
-xmvn-subst -s -L -t jar -R %{buildroot} %{buildroot}%{homedir}
+# substitute dependency jars (keep start.jar with shaded jetty util)
+xmvn-subst -s -L -R %{buildroot} %{buildroot}%{homedir}/lib
 
 # ecj doesn't have javapackages metadata in manifest, remove when fixed
 ln -sf %{_javadir}/ecj.jar $ecj
@@ -968,6 +968,9 @@ exit 0
 %license LICENSE-eplv10-aslv20.html LICENSE-MIT
 
 %changelog
+* Mon Jul 02 2018 Michael Simacek <msimacek@redhat.com> - 9.4.11-2.v20180605
+- Fix missing classes in start.jar
+
 * Fri Jun 08 2018 Michael Simacek <msimacek@redhat.com> - 9.4.11-1.v20180605
 - Update to upstream version 9.4.11.v20180605