[pkg-java] r18447 - in trunk/maven-site-plugin/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-09-27 22:49:11 +0000 (Sat, 27 Sep 2014)
New Revision: 18447

Added:
   trunk/maven-site-plugin/debian/patches/
   trunk/maven-site-plugin/debian/patches/01-upgrade-jetty.patch
   trunk/maven-site-plugin/debian/patches/series
Modified:
   trunk/maven-site-plugin/debian/changelog
   trunk/maven-site-plugin/debian/control
   trunk/maven-site-plugin/debian/maven.rules
Log:
Replaced the dependency on libjetty-java with libjetty8-java



Modified: trunk/maven-site-plugin/debian/changelog
===================================================================
--- trunk/maven-site-plugin/debian/changelog	2014-09-25 20:47:50 UTC (rev 18446)
+++ trunk/maven-site-plugin/debian/changelog	2014-09-27 22:49:11 UTC (rev 18447)
@@ -1,3 +1,10 @@
+maven-site-plugin (2.1-3) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Replaced the dependency on libjetty-java with libjetty8-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 28 Sep 2014 00:11:56 +0200
+
 maven-site-plugin (2.1-2) unstable; urgency=low
 
   * Remove Build-Depends: quilt.

Modified: trunk/maven-site-plugin/debian/control
===================================================================
--- trunk/maven-site-plugin/debian/control	2014-09-25 20:47:50 UTC (rev 18446)
+++ trunk/maven-site-plugin/debian/control	2014-09-27 22:49:11 UTC (rev 18447)
@@ -5,11 +5,11 @@
 Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>,
  Michael Koch <konqueror at gmx.de>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
-Build-Depends-Indep: libmaven-plugin-tools-java, libdoxia-java, libdoxia-sitetools-java, libjetty-java,  
+Build-Depends-Indep: libmaven-plugin-tools-java, libdoxia-java, libdoxia-sitetools-java, libjetty8-java,
  libmaven-doxia-tools-java, libmaven2-core-java, libplexus-archiver-java,  
  libplexus-container-default-java, libplexus-i18n-java, libplexus-utils-java,  
  libwagon-java, libmaven-plugin-testing-java, default-jdk-doc, libdoxia-java-doc,  
- libjetty-java-doc, libmaven2-core-java-doc, libplexus-container-default-java-doc,  
+ libjetty8-java-doc, libmaven2-core-java-doc, libplexus-container-default-java-doc,
  libplexus-utils-java-doc, libwagon-java-doc, libmaven-javadoc-plugin-java 
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-site-plugin

Modified: trunk/maven-site-plugin/debian/maven.rules
===================================================================
--- trunk/maven-site-plugin/debian/maven.rules	2014-09-25 20:47:50 UTC (rev 18446)
+++ trunk/maven-site-plugin/debian/maven.rules	2014-09-27 22:49:11 UTC (rev 18447)
@@ -26,7 +26,8 @@
 org.apache.maven.doxia doxia-site-renderer jar s/.*/debian/ * *
 org.apache.maven.shared maven-doxia-tools jar s/.*/debian/ * *
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
-org.mortbay.jetty * * s/6\..*/6.x/ * *
+s/org.mortbay.jetty/org.eclipse.jetty/ * * s/.*/debian/ * *
+s/org.mortbay.jetty/org.eclipse.jetty/ s/jetty/jetty-webapp/ * s/.*/debian/ * *
 s/velocity/org.apache.velocity/ * * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * *

Added: trunk/maven-site-plugin/debian/patches/01-upgrade-jetty.patch
===================================================================
--- trunk/maven-site-plugin/debian/patches/01-upgrade-jetty.patch	                        (rev 0)
+++ trunk/maven-site-plugin/debian/patches/01-upgrade-jetty.patch	2014-09-27 22:49:11 UTC (rev 18447)
@@ -0,0 +1,41 @@
+Description: Update the dependency on Jetty. This patch can't be upstreamed yet
+ because Jetty 8 use a more recent version of Java than the baseline required
+ for this Maven plugin.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
++++ b/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
+@@ -37,12 +37,13 @@
+ import org.apache.maven.plugins.site.webapp.DoxiaFilter;
+ import org.apache.maven.reporting.MavenReport;
+ import org.codehaus.plexus.util.IOUtil;
+-import org.mortbay.jetty.Connector;
+-import org.mortbay.jetty.Handler;
+-import org.mortbay.jetty.Server;
+-import org.mortbay.jetty.handler.DefaultHandler;
+-import org.mortbay.jetty.nio.SelectChannelConnector;
+-import org.mortbay.jetty.webapp.WebAppContext;
++import org.eclipse.jetty.server.Connector;
++import org.eclipse.jetty.server.Handler;
++import org.eclipse.jetty.server.Server;
++import org.eclipse.jetty.server.handler.DefaultHandler;
++import org.eclipse.jetty.server.handler.HandlerList;
++import org.eclipse.jetty.server.nio.SelectChannelConnector;
++import org.eclipse.jetty.webapp.WebAppContext;
+ 
+ /**
+  * Starts the site up, rendering documents as requested for faster editing.
+@@ -90,10 +91,9 @@
+         DefaultHandler defaultHandler = new DefaultHandler();
+         defaultHandler.setServer( server );
+ 
+-        Handler[] handlers = new Handler[2];
+-        handlers[0] = webapp;
+-        handlers[1] = defaultHandler;
+-        server.setHandlers( handlers );
++        HandlerList handlers = new HandlerList();
++        handlers.setHandlers(new Handler[] { webapp, defaultHandler } );
++        server.setHandler( handlers );
+ 
+         getLog().info( "Starting Jetty on http://localhost:" + port + "/" );
+         try

Added: trunk/maven-site-plugin/debian/patches/series
===================================================================
--- trunk/maven-site-plugin/debian/patches/series	                        (rev 0)
+++ trunk/maven-site-plugin/debian/patches/series	2014-09-27 22:49:11 UTC (rev 18447)
@@ -0,0 +1 @@
+01-upgrade-jetty.patch