commit 1d759d52f4805e2a022a6b174f74d85be91d7c13
Author: Michal Srb <msrb(a)redhat.com>
Date: Mon Feb 25 10:14:56 2013 +0100
Port to jetty 9.0.0
0001-Fix-jetty-dependencies.patch | 52 +++++++++++++++++++
0001-Port-to-jetty-9.patch | 74 ++++++++++++++++++++++++++++
0002-Port-to-jetty-8.x.patch | 98 -------------------------------------
maven-site-plugin.spec | 20 +++++---
4 files changed, 139 insertions(+), 105 deletions(-)
---
diff --git a/0001-Fix-jetty-dependencies.patch b/0001-Fix-jetty-dependencies.patch
new file mode 100644
index 0000000..b9756fe
--- /dev/null
+++ b/0001-Fix-jetty-dependencies.patch
@@ -0,0 +1,52 @@
+From 5f1902e3e0003d989e29578d6c40a5e936fcb65a Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb(a)redhat.com>
+Date: Fri, 22 Feb 2013 11:13:23 +0100
+Subject: [PATCH] Fix jetty dependencies
+
+---
+ pom.xml | 21 +++++++++++++++++----
+ 1 file changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 9e99e5f..267cc91 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -403,18 +403,31 @@ under the License.
+ </dependency>
+
+ <dependency>
+- <groupId>org.mortbay.jetty</groupId>
+- <artifactId>jetty</artifactId>
++ <groupId>org.eclipse.jetty</groupId>
++ <artifactId>jetty-server</artifactId>
+ <version>6.1.25</version>
+ </dependency>
++
++ <dependency>
++ <groupId>org.eclipse.jetty</groupId>
++ <artifactId>jetty-webapp</artifactId>
++ <version>6.1.25</version>
++ </dependency>
++
++ <dependency>
++ <groupId>org.eclipse.jetty</groupId>
++ <artifactId>jetty-servlet</artifactId>
++ <version>6.1.25</version>
++ </dependency>
++
+ <dependency>
+- <groupId>org.mortbay.jetty</groupId>
++ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.25</version>
+ </dependency>
+
+ <dependency>
+- <groupId>org.mortbay.jetty</groupId>
++ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>6.1.25</version>
+ <scope>test</scope>
+--
+1.8.1.2
+
diff --git a/0001-Port-to-jetty-9.patch b/0001-Port-to-jetty-9.patch
new file mode 100644
index 0000000..89229ce
--- /dev/null
+++ b/0001-Port-to-jetty-9.patch
@@ -0,0 +1,74 @@
+From 4c2e25dd41672533a6f6f3da490d2cbfa385884a Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb(a)redhat.com>
+Date: Fri, 22 Feb 2013 10:56:19 +0100
+Subject: [PATCH] Port to jetty 9
+
+---
+ .../org/apache/maven/plugins/site/SiteRunMojo.java | 28 +++++++++++-----------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
b/src/main/java/org/apache/maven/plugins/site/SiteRunMojo.java
+index f341eef..d7e6c09 100644
+--- 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 @@ 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;
+-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.ServerConnector;
++import org.eclipse.jetty.webapp.WebAppContext;
+
+ /**
+ * Starts the site up, rendering documents as requested for faster editing.
+@@ -84,7 +85,7 @@ public class SiteRunMojo
+ Server server = new Server();
+ server.setStopAtShutdown( true );
+
+- Connector defaultConnector = getDefaultConnector();
++ ServerConnector defaultConnector = getDefaultConnector( server );
+ server.setConnectors( new Connector[] { defaultConnector } );
+
+ WebAppContext webapp = createWebApplication();
+@@ -93,10 +94,9 @@ public class SiteRunMojo
+ 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
+@@ -219,11 +219,11 @@ public class SiteRunMojo
+ 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;
+ }
+
+--
+1.8.1.2
+
diff --git a/maven-site-plugin.spec b/maven-site-plugin.spec
index 78b3f60..c7156a9 100644
--- a/maven-site-plugin.spec
+++ b/maven-site-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-site-plugin
Version: 3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Maven Site Plugin
Group: Development/Libraries
@@ -8,7 +8,8 @@ License: ASL 2.0
URL:
http://maven.apache.org/plugins/maven-site-plugin/
Source0:
http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}...
-Patch1: 0002-Port-to-jetty-8.x.patch
+Patch0: 0001-Port-to-jetty-9.patch
+Patch1: 0001-Fix-jetty-dependencies.patch
BuildArch: noarch
@@ -39,11 +40,12 @@ BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-wagon
BuildRequires: maven-reporting-exec
BuildRequires: plexus-containers-component-metadata
-BuildRequires: jetty-client >= 8.1.0-0.1.rc5
-BuildRequires: jetty-server >= 8.1.0-0.1.rc5
-BuildRequires: jetty-servlet >= 8.1.0-0.1.rc5
-BuildRequires: jetty-util >= 8.1.0-0.1.rc5
-BuildRequires: jetty-webapp >= 8.1.0-0.1.rc5
+BuildRequires: jetty >= 9.0.0-0.1.RC0
+BuildRequires: jetty-client >= 9.0.0-0.1.RC0
+BuildRequires: jetty-server >= 9.0.0-0.1.RC0
+BuildRequires: jetty-servlet >= 9.0.0-0.1.RC0
+BuildRequires: jetty-util >= 9.0.0-0.1.RC0
+BuildRequires: jetty-webapp >= 9.0.0-0.1.RC0
BuildRequires: servlet3
BuildRequires: plexus-archiver
BuildRequires: plexus-containers-container-default
@@ -67,6 +69,7 @@ API documentation for %{name}.
%prep
%setup -q
+%patch0 -p1
%patch1 -p1
%build
@@ -83,6 +86,9 @@ API documentation for %{name}.
%doc LICENSE NOTICE
%changelog
+* Mon Feb 25 2013 Michal Srb <msrb(a)redhat.com> - 3.2-3
+- Port to jetty 9.0.0
+
* Thu Feb 07 2013 Michal Srb <msrb(a)redhat.com> - 3.2-2
- Migrate from maven-doxia to doxia subpackages