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 c0b1f03e030a4369a2339702d4f585035b1aed65 Author: Emmanuel Bourg <[email protected]> Date: Wed Feb 3 22:00:43 2016 +0000 Replaced the dependency on libjetty8-java with libjetty9-java --- debian/changelog | 7 +++++++ debian/control | 4 ++-- debian/maven.rules | 4 ++-- debian/patches/01-upgrade-jetty.patch | 28 ++++++++++++++++++++++++++-- 4 files changed, 37 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 78f58b4..fe3b8c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +maven-site-plugin (2.1-4) UNRELEASED; urgency=medium + + * Team upload. + * Replaced the dependency on libjetty8-java with libjetty9-java + + -- Emmanuel Bourg <[email protected]> Wed, 03 Feb 2016 22:48:31 +0100 + maven-site-plugin (2.1-3) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index c033cec..b9e5f93 100644 --- a/debian/control +++ b/debian/control @@ -10,8 +10,8 @@ Build-Depends: cdbs, libdoxia-java, libdoxia-java-doc, libdoxia-sitetools-java, - libjetty8-java, - libjetty8-java-doc, + libjetty9-java, +# libjetty9-java-doc, libmaven-doxia-tools-java, libmaven-javadoc-plugin-java, libmaven-plugin-testing-java, diff --git a/debian/maven.rules b/debian/maven.rules index 1d80500..ab9019c 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -26,10 +26,10 @@ 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/ * * -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/ * * 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/.*/9.x/ * * diff --git a/debian/patches/01-upgrade-jetty.patch b/debian/patches/01-upgrade-jetty.patch index 887f7cd..1dc380b 100644 --- a/debian/patches/01-upgrade-jetty.patch +++ b/debian/patches/01-upgrade-jetty.patch @@ -1,5 +1,5 @@ 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 + because Jetty 9 use a more recent version of Java than the baseline required for this Maven plugin. Author: Emmanuel Bourg <[email protected]> Forwarded: no @@ -18,13 +18,22 @@ Forwarded: no +import org.eclipse.jetty.server.Connector; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.server.ServerConnector; +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. +@@ -81,7 +82,7 @@ + Server server = new Server(); + server.setStopAtShutdown( true ); + +- Connector defaultConnector = getDefaultConnector(); ++ ServerConnector defaultConnector = getDefaultConnector(server); + server.setConnectors( new Connector[] { defaultConnector } ); + + WebAppContext webapp = createWebApplication(); @@ -90,10 +91,9 @@ DefaultHandler defaultHandler = new DefaultHandler(); defaultHandler.setServer( server ); @@ -39,3 +48,18 @@ Forwarded: no getLog().info( "Starting Jetty on http://localhost:"; + port + "/" ); try +@@ -218,11 +218,11 @@ + return webapp; + } + +- private Connector getDefaultConnector() ++ private ServerConnector getDefaultConnector(Server server) + { +- Connector connector = new SelectChannelConnector(); ++ ServerConnector connector = new ServerConnector(server); + connector.setPort( port ); +- connector.setMaxIdleTime( MAX_IDLE_TIME ); ++ connector.setIdleTimeout( MAX_IDLE_TIME ); + return connector; + } + -- 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
