[maven-site-plugin] 12/31: Refreshed the patch
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Aug 29 00:03:05 UTC 2017
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 c2a612ed8708ce7072c727edbab692a44a31d3e4
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Aug 28 22:28:09 2017 +0200
Refreshed the patch
---
debian/changelog | 2 +-
debian/patches/01-upgrade-jetty.patch | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4fbd725..6cb44fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-maven-site-plugin (3.3-1) UNRELEASED; urgency=medium
+maven-site-plugin (3.4-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
diff --git a/debian/patches/01-upgrade-jetty.patch b/debian/patches/01-upgrade-jetty.patch
index e72bfdf..88cad82 100644
--- a/debian/patches/01-upgrade-jetty.patch
+++ b/debian/patches/01-upgrade-jetty.patch
@@ -3,12 +3,12 @@ Description: Update the dependency on Jetty. This patch can't be upstreamed yet
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
-@@ -42,12 +42,13 @@
-
+--- a/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
++++ b/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
+@@ -38,12 +38,13 @@
+ import org.apache.maven.plugins.site.render.AbstractSiteRenderingMojo;
+ import org.apache.maven.reporting.exec.MavenReportExecution;
import org.codehaus.plexus.util.IOUtil;
-
-import org.mortbay.jetty.Connector;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.Server;
@@ -25,7 +25,7 @@ Forwarded: no
/**
* Starts the site up, rendering documents as requested for faster editing.
-@@ -84,7 +85,7 @@
+@@ -79,7 +80,7 @@
Server server = new Server();
server.setStopAtShutdown( true );
@@ -34,7 +34,7 @@ Forwarded: no
server.setConnectors( new Connector[] { defaultConnector } );
WebAppContext webapp = createWebApplication();
-@@ -93,10 +94,9 @@
+@@ -88,10 +89,9 @@
DefaultHandler defaultHandler = new DefaultHandler();
defaultHandler.setServer( server );
@@ -48,7 +48,7 @@ Forwarded: no
getLog().info( "Starting Jetty on http://localhost:" + port + "/" );
try
-@@ -219,11 +219,11 @@
+@@ -214,11 +214,11 @@
return webapp;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-site-plugin.git
More information about the pkg-java-commits
mailing list