From 31e718e30e219a56be14c8d468a241be8288a272 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Sep 01 2015 11:01:09 +0000
Subject: Update to upstream version 9.3.3.v20150827


---

diff --git a/.gitignore b/.gitignore
index 4224121..2dd5273 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@ jetty-6.1.26-src.zip
 /jetty-9.3.0.v20150612.tar.gz
 /jetty-9.3.1.v20150714.tar.gz
 /jetty-9.3.2.v20150730.tar.gz
+/jetty-9.3.3.v20150827.tar.gz
diff --git a/jetty.spec b/jetty.spec
index 9542288..d48bec8 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -41,7 +41,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver v20150730
+%global addver v20150827
 
 # Conditionals to help breaking eclipse <-> jetty dependency cycle
 # when bootstrapping for new architectures
@@ -54,7 +54,7 @@
 %endif
 
 Name:           jetty
-Version:        9.3.2
+Version:        9.3.3
 Release:        1%{?dist}
 Summary:        Java Webserver and Servlet Container
 
@@ -187,12 +187,6 @@ Requires:       %{name}-http2-hpack = %{version}-%{release}
 Requires:       %{name}-http2-http-client-transport = %{version}-%{release}
 Requires:       %{name}-http2-server = %{version}-%{release}
 
-# javax.servlet-api is provided by both glassfish-servlet-api and
-# tomcat-servlet-3.0-api, but we need version 3.1
-# this is a temporary solution, that should be removed when the duplicate
-# provides problem is solved
-Requires:       glassfish-servlet-api
-
 Requires(pre):    shadow-utils
 Requires(post):   systemd-units, systemd-sysv
 Requires(preun):  systemd-units
@@ -604,8 +598,6 @@ License:        (ASL 2.0 or EPL) and MIT
 find . -name "*.?ar" -exec rm {} \;
 find . -name "*.class" -exec rm {} \;
 
-%pom_xpath_inject "pom:dependency[pom:artifactId='jetty-test-helper']" "<scope>test</scope>" apache-jstl
-
 # Use proper groupId for apache ant
 %pom_xpath_replace "pom:groupId[text()='ant']" "<groupId>org.apache.ant</groupId>" jetty-ant/pom.xml
 
@@ -970,6 +962,11 @@ exit 0
 %doc NOTICE.txt LICENSE*
 
 %changelog
+* Tue Sep 01 2015 Michael Simacek <msimacek@redhat.com> - 9.3.3-1
+- Update to upstream version 9.3.3.v20150827
+- Remove manual requires on glassfish-servlet-api as the duplicate provides
+  were fixed
+
 * Mon Aug 03 2015 Michael Simacek <msimacek@redhat.com> - 9.3.2-1
 - Update to upstream version 9.3.2.v20150730
 
diff --git a/sources b/sources
index aad4f66..7435c0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92782f0e0ed9b34260a75c5b522e272e  jetty-9.3.2.v20150730.tar.gz
+4deb1d5ea22a500abe5c3c3dbae43456  jetty-9.3.3.v20150827.tar.gz