From 414e9c7cf8cf46b7d5757a611e2acf8229c74cfa Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Jun 08 2018 10:41:30 +0000
Subject: Update to upstream version 9.4.11.v20180605


---

diff --git a/.gitignore b/.gitignore
index e80f0fc..6954f48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,4 @@ jetty-6.1.26-src.zip
 /jetty-9.4.9.v20180320.tar.gz
 /jetty-9.4.10.RC1.tar.gz
 /jetty-9.4.10.v20180503.tar.gz
+/jetty-9.4.11.v20180605.tar.gz
diff --git a/0001-Fedora-jetty.home.patch b/0001-Fedora-jetty.home.patch
index ec360ed..3d40be5 100644
--- a/0001-Fedora-jetty.home.patch
+++ b/0001-Fedora-jetty.home.patch
@@ -1,10 +1,10 @@
-From 703f47588a6c1b027bb7f5e3aedbc112a94b1c85 Mon Sep 17 00:00:00 2001
+From e1f6d2f9749b6a04a3b7d163d17df41751fb8977 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
 
 ---
- .../java/org/eclipse/jetty/start/config/CommandLineConfigSource.java   | 3 +++
+ .../eclipse/jetty/start/config/CommandLineConfigSource.java    | 3 +++
  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
@@ -22,5 +22,5 @@ index f0c9e07..7d2ee3e 100644
                      return home;
                  }
 -- 
-2.14.3
+2.17.1
 
diff --git a/jetty.spec b/jetty.spec
index 893fc6e..9d9c8ca 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -40,7 +40,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver  .v20180503
+%global addver  .v20180605
 
 # minimal version required to build eclipse and thermostat
 # eclipse needs: util, server, http, continuation, io, security, servlet
@@ -49,7 +49,7 @@
 %bcond_with     jp_minimal
 
 Name:           jetty
-Version:        9.4.10
+Version:        9.4.11
 Release:        1%{addver}%{?dist}
 Summary:        Java Webserver and Servlet Container
 
@@ -639,15 +639,15 @@ find . -name "*.class" -exec rm {} \;
 # 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'
-
 # Unwanted JS in javadoc
 sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
 
 # it doesn't like the trailing semicolon
 sed -i 's#;</Export-Package>#</Export-Package>#' jetty-http2/http2-common/pom.xml
 
+# only used for integration tests
+%pom_remove_plugin :maven-invoker-plugin jetty-jspc-maven-plugin
+
 # missing deps
 %pom_disable_module test-jetty-osgi jetty-osgi/pom.xml
 
@@ -968,6 +968,9 @@ exit 0
 %license LICENSE-eplv10-aslv20.html LICENSE-MIT
 
 %changelog
+* Fri Jun 08 2018 Michael Simacek <msimacek@redhat.com> - 9.4.11-1.v20180605
+- Update to upstream version 9.4.11.v20180605
+
 * Wed May 09 2018 Michael Simacek <msimacek@redhat.com> - 9.4.10-1.v20180503
 - Update to upstream version 9.4.10.v20180503
 
diff --git a/sources b/sources
index dd95389..28edc63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (jetty-9.4.10.v20180503.tar.gz) = 9a4adf7632627abec3d324ce3105fb32d1b5db23558b8e93cdcaedda55befdd9002f9d3b321ab9f917bc25ebe56a3e4d88102b93161213162b7b38c72ad20337
+SHA512 (jetty-9.4.11.v20180605.tar.gz) = 54724a96d832eca463b643af842fbed40e2631450d5c1c31505cb783d6b06b8095f1f232ca8bfa5e1a67a0917d09c6655ab6bf86125ddcfc2f2bc1a032911241