[maven-site-plugin] 17/31: Refreshed the patch

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-site-plugin.

commit a47d67640e65f161b315aca35c9fdec77d9fd0df
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Aug 29 00:45:33 2017 +0200

    Refreshed the patch
---
 debian/changelog                      |  2 +-
 debian/maven.rules                    |  1 +
 debian/patches/01-upgrade-jetty.patch | 72 ++++++++++++++++++++++++++++++++++-
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd0db03..b01194e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-maven-site-plugin (3.5-1) UNRELEASED; urgency=medium
+maven-site-plugin (3.6-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
diff --git a/debian/maven.rules b/debian/maven.rules
index 5b2ed36..dc8f6e9 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -32,5 +32,6 @@ s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * *
 s/org.mortbay.jetty/org.eclipse.jetty/ s/jetty/jetty-webapp/ * s/.*/9.x/ * *
+s/org.mortbay.jetty/org.eclipse.jetty/ s/jetty-client/jetty-proxy/ * s/.*/9.x/ * *
 s/org.mortbay.jetty/org.eclipse.jetty/ * * s/.*/9.x/ * *
 javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
diff --git a/debian/patches/01-upgrade-jetty.patch b/debian/patches/01-upgrade-jetty.patch
index 379dafc..d48825d 100644
--- a/debian/patches/01-upgrade-jetty.patch
+++ b/debian/patches/01-upgrade-jetty.patch
@@ -48,7 +48,7 @@ Forwarded: no
  
          getLog().info( "Starting Jetty on http://localhost:" + port + "/" );
          try
-@@ -220,11 +220,11 @@
+@@ -224,11 +224,11 @@
          return webapp;
      }
  
@@ -63,3 +63,73 @@ Forwarded: no
          return connector;
      }
  
+--- a/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java
++++ b/src/test/java/org/apache/maven/plugins/site/deploy/SimpleDavServerHandler.java
+@@ -36,12 +36,12 @@
+ import org.apache.commons.io.FileUtils;
+ import org.apache.commons.io.IOUtils;
+ import org.apache.commons.lang3.SystemUtils;
+-import org.mortbay.jetty.Handler;
+-import org.mortbay.jetty.Request;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.handler.AbstractHandler;
+-import org.mortbay.jetty.servlet.Context;
+-import org.mortbay.jetty.servlet.ServletHolder;
++import org.eclipse.jetty.server.Handler;
++import org.eclipse.jetty.server.Request;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.server.handler.AbstractHandler;
++import org.eclipse.jetty.servlet.ServletContextHandler;
++import org.eclipse.jetty.servlet.ServletHolder;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ 
+@@ -67,7 +67,7 @@
+         this.siteTargetPath = targetPath;
+         Handler repoHandler = new AbstractHandler()
+         {
+-            public void handle( String target, HttpServletRequest request, HttpServletResponse response, int dispatch )
++            public void handle( String target, Request req, HttpServletRequest request, HttpServletResponse response )
+                 throws IOException, ServletException
+             {
+                 String targetPath = request.getPathInfo();
+@@ -112,7 +112,7 @@
+     {
+         siteTargetPath = null;
+         server = new Server( 0 );
+-        Context context = new Context( server, "/", 0 );
++        ServletContextHandler context = new ServletContextHandler( server, "/", ServletContextHandler.SESSIONS );
+ 
+         context.addServlet( new ServletHolder( servlet ), "/" );
+         
+@@ -121,7 +121,7 @@
+     
+     public int getPort()
+     {
+-        return server.getConnectors()[0].getLocalPort();
++        return ((org.eclipse.jetty.server.NetworkConnector) server.getConnectors()[0]).getLocalPort();
+     }
+ 
+     public void stop()
+--- a/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java
++++ b/src/test/java/org/apache/maven/plugins/site/deploy/AuthAsyncProxyServlet.java
+@@ -35,8 +35,8 @@
+ import org.apache.commons.io.FileUtils;
+ import org.apache.commons.io.IOUtils;
+ import org.apache.maven.plugins.site.deploy.SimpleDavServerHandler.HttpRequest;
+-import org.mortbay.jetty.security.B64Code;
+-import org.mortbay.proxy.AsyncProxyServlet;
++import org.eclipse.jetty.util.B64Code;
++import org.eclipse.jetty.proxy.AsyncProxyServlet;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+ 
+@@ -108,7 +108,7 @@
+             if ( proxyAuthorization != null && proxyAuthorization.startsWith( "Basic " ) )
+             {
+                 String proxyAuth = proxyAuthorization.substring( 6 );
+-                String authorization = B64Code.decode( proxyAuth );
++                String authorization = B64Code.decode( proxyAuth, "ISO-8859-1" );
+                 String[] authTokens = authorization.split( ":" );
+                 String user = authTokens[0];
+                 String password = authTokens[1];

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-site-plugin.git