From cd6776deae759128ed4a801543d4063aea25e92a Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Jun 22 2015 16:55:44 +0000
Subject: Update to upstream release 0.3.0.v20150612


---

diff --git a/.gitignore b/.gitignore
index 5d65123..64f8c8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@ jetty-6.1.26-src.zip
 /jetty-9.2.7.v20150116.tar.gz
 /jetty-9.2.9.v20150224.tar.gz
 /jetty-9.3.0.M2.tar.gz
+/jetty-9.3.0.v20150612.tar.gz
diff --git a/jetty.spec b/jetty.spec
index d76d845..73a6880 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -41,7 +41,7 @@
 %global appdir      %{jettylibdir}/webapps
 
 
-%global addver M2
+%global addver v20150612
 
 # Conditionals to help breaking eclipse <-> jetty dependency cycle
 # when bootstrapping for new architectures
@@ -55,7 +55,7 @@
 
 Name:           jetty
 Version:        9.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 # Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
@@ -140,6 +140,7 @@ Requires:       %{name}-fcgi-server = %{version}-%{release}
 Requires:       %{name}-http = %{version}-%{release}
 Requires:       %{name}-http-spi = %{version}-%{release}
 Requires:       %{name}-io = %{version}-%{release}
+Requires:       %{name}-infinispan = %{version}-%{release}
 Requires:       %{name}-jaas = %{version}-%{release}
 Requires:       %{name}-jaspi = %{version}-%{release}
 Requires:       %{name}-jmx = %{version}-%{release}
@@ -300,6 +301,12 @@ Obsoletes:      %{name}-websocket < %{version}-%{release}
 %description    io
 %{extdesc} %{summary}.
 
+%package        infinispan
+Summary:        infinispan module for Jetty
+
+%description    infinispan
+%{extdesc} %{summary}.
+
 %package        jaas
 Summary:        jaas module for Jetty
 
@@ -636,6 +643,7 @@ sed -i 's#;</Export-Package>#</Export-Package>#' jetty-http2/http2-common/pom.xm
 %pom_disable_module test-jetty-osgi-context jetty-osgi/pom.xml
 %pom_disable_module test-jetty-osgi-webapp jetty-osgi/pom.xml
 %pom_disable_module http2-alpn-tests jetty-http2/pom.xml
+%pom_disable_module test-cdi-webapp jetty-cdi
 
 # Since tests are disabled, we don't have some jars
 %pom_remove_dep :test-jetty-webapp jetty-distribution/pom.xml
@@ -649,7 +657,6 @@ sed -i 's#;</Export-Package>#</Export-Package>#' jetty-http2/http2-common/pom.xm
 %pom_xpath_remove "pom:artifactItem[pom:artifactId[text()='test-spec-webapp']]" jetty-distribution/pom.xml
 
 # Missing jars (jetty-setuid-java-1.0.0.jar,jetty-setuid-java-1.0.0-config.jar)
-%pom_xpath_remove "pom:execution[pom:id[text()='unpack-setuid-config']]" jetty-distribution/pom.xml
 %pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]" jetty-distribution/pom.xml
 # test-jaas-webapp artifact is disabled
 %pom_xpath_remove "pom:execution[pom:id[text()='unpack-test-jaas-config']]" jetty-distribution/pom.xml
@@ -716,6 +723,8 @@ rm LICENSE-CONTRIBUTOR/CDDLv1.0.txt
 %mvn_package :jetty-alpn-parent __noinstall
 %mvn_package :jetty-runner __noinstall
 
+%mvn_package org.eclipse.jetty.cdi: jetty-cdi
+
 %mvn_package :apache-jsp jetty-jsp
 %mvn_alias :apache-jsp :jetty-jsp
 
@@ -776,6 +785,7 @@ for jar in %{buildroot}%{_javadir}/%{name}/*.jar; do
         mod=`basename -s .jar $jar`
         target="%{buildroot}%{homedir}/lib"
         case $mod in
+            *cdi*) target="$target/$mod-%{version}.%{addver}.jar" ;;
             *websocket*) target="$target/websocket/$mod-%{version}.%{addver}.jar" ;;
             *spring*) target="$target/spring/$mod-%{version}.%{addver}.jar" ;;
             *http2*) target="$target/http2/$mod-%{version}.%{addver}.jar" ;;
@@ -897,6 +907,7 @@ exit 0
 %files http -f .mfiles-jetty-http
 %files http-spi -f .mfiles-jetty-http-spi
 %files io -f .mfiles-jetty-io
+%files infinispan -f .mfiles-jetty-infinispan
 %files jaas -f .mfiles-jetty-jaas
 %files jaspi -f .mfiles-jetty-jaspi
 %files jmx -f .mfiles-jetty-jmx
@@ -958,6 +969,9 @@ exit 0
 %doc NOTICE.txt LICENSE*
 
 %changelog
+* Mon Jun 22 2015 Michael Simacek <msimacek@redhat.com> - 9.3.0-5
+- Update to upstream release 0.3.0.v20150612
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.3.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 57ba7e3..62050d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c24295c75c3b9915efea228548a45317  jetty-9.3.0.M2.tar.gz
+f0b6bdddf45ddef602933167d4721cb5  jetty-9.3.0.v20150612.tar.gz