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 c6b960df3abf937777a232f0e58bdcabc7bfef01 Author: Emmanuel Bourg <[email protected]> Date: Sat Sep 27 22:49:11 2014 +0000 Replaced the dependency on libjetty-java with libjetty8-java --- debian/changelog | 7 ++++++ debian/control | 4 ++-- debian/maven.rules | 3 ++- debian/patches/01-upgrade-jetty.patch | 41 +++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 53 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 79933dc..40e9b15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 <[email protected]> Sun, 28 Sep 2014 00:11:56 +0200 + maven-site-plugin (2.1-2) unstable; urgency=low * Remove Build-Depends: quilt. diff --git a/debian/control b/debian/control index d20225e..bedac55 100644 --- a/debian/control +++ b/debian/control @@ -5,11 +5,11 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Torsten Werner <[email protected]>, Ludovic Claude <[email protected]>, Michael Koch <[email protected]> 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 diff --git a/debian/maven.rules b/debian/maven.rules index 4e44629..1d80500 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -26,7 +26,8 @@ org.apache.maven.doxia doxia-sink-api jar s/.*/debian/ * * 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/ * * diff --git a/debian/patches/01-upgrade-jetty.patch b/debian/patches/01-upgrade-jetty.patch new file mode 100644 index 0000000..887f7cd --- /dev/null +++ b/debian/patches/01-upgrade-jetty.patch @@ -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 <[email protected]> +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 diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..42030ff --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-upgrade-jetty.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-site-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
