mizdebsk pushed to tycho (master). "Port to Jetty 9.3.0"

[notifications at fedoraproject.org]

>From e301533dcecd16799222143e95d1bc7337593059 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Sun, 29 Mar 2015 16:52:42 +0200
Subject: Port to Jetty 9.3.0


diff --git a/tycho-port-to-jetty-9.3.0.patch b/tycho-port-to-jetty-9.3.0.patch
new file mode 100644
index 0000000..328d51b
--- /dev/null
+++ b/tycho-port-to-jetty-9.3.0.patch
@@ -0,0 +1,29 @@
+--- tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/AbstractMonitorServlet.java~	2015-03-29 16:42:21.976690003 +0200
++++ tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/AbstractMonitorServlet.java	2015-03-29 16:48:04.996306637 +0200
+@@ -21,8 +21,6 @@
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+ 
+-import org.eclipse.jetty.server.Request;
+-
+ public abstract class AbstractMonitorServlet extends GenericServlet {
+ 
+     private static final long serialVersionUID = -7271350776954812609L;
+@@ -42,7 +40,7 @@
+         HttpServletRequest req = (HttpServletRequest) request;
+         HttpServletResponse res = (HttpServletResponse) response;
+ 
+-        String uri = ((Request) req).getUri().toString();
++        String uri = req.getRequestURI();
+         if (!uri.endsWith(".sha1") && !uri.endsWith(".md5")) {
+             accessedUrls.add(uri);
+         }
+@@ -51,7 +49,7 @@
+     }
+ 
+     protected void addUri(HttpServletRequest req) {
+-        String uri = ((Request) req).getUri().toString();
++        String uri = req.getRequestURI();
+         if (!accessedUrls.contains(uri)) {
+             accessedUrls.add(uri);
+         }
diff --git a/tycho.spec b/tycho.spec
index 447590c..cc109de 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -25,7 +25,7 @@
 
 Name:           %{?scl_prefix}tycho
 Version:        0.22.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 Group:          Development/Libraries
@@ -61,6 +61,7 @@ Patch4:         %{pkg_name}-maven-delegation.patch
 Patch5:         %{pkg_name}-fix-bootstrap-build.patch
 # Patch director plugin to only assemble products for the current arch
 Patch6:         %{pkg_name}-running-env-only.patch
+Patch7:         %{pkg_name}-port-to-jetty-9.3.0.patch
 
 BuildArch:      noarch
 
@@ -173,6 +174,7 @@ tar -xf %{SOURCE6}
 %patch3 -p1
 %patch4 -p1
 %patch6 -p1
+%patch7 -p0
 
 find tycho-core -iname '*html' -delete
 
@@ -427,6 +429,9 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
 %{_javadocdir}/tycho
 
 %changelog
+* Sun Mar 29 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.22.0-12
+- Port to Jetty 9.3.0
+
 * Thu Feb  5 2015 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.22.0-11
 - fedoraproject-p2: Fix support for shallow dropin directory layout
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/tycho.git/commit/?h=master&id=e301533dcecd16799222143e95d1bc7337593059