[maven-site-plugin] Update to upstream version 3.3
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue May 14 12:14:40 UTC 2013
commit 6b45a362af464aba6cb878d12c4681a388b26ca7
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue May 14 13:28:56 2013 +0200
Update to upstream version 3.3
.gitignore | 1 +
0001-Fix-jetty-dependencies.patch | 80 +++++++++++-----------
0001-Port-to-jetty-9.patch | 116 ++++++++++++++++----------------
maven-site-plugin-jetty-provided.patch | 54 ++++++++--------
maven-site-plugin.spec | 96 ++++++++++++++-------------
sources | 2 +-
6 files changed, 177 insertions(+), 172 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a7e22f4..6112751 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ maven-site-plugin-2.2-source-release.zip
/maven-site-plugin-2.3-source-release.zip
maven-site-plugin-3.0-source-release.zip
/maven-site-plugin-3.1-source-release.zip
+/maven-site-plugin-3.3-source-release.zip
diff --git a/0001-Fix-jetty-dependencies.patch b/0001-Fix-jetty-dependencies.patch
index b9756fe..cc28185 100644
--- a/0001-Fix-jetty-dependencies.patch
+++ b/0001-Fix-jetty-dependencies.patch
@@ -1,52 +1,52 @@
-From 5f1902e3e0003d989e29578d6c40a5e936fcb65a Mon Sep 17 00:00:00 2001
+From 1cb1e52ddd82e57477baac3cc0d765cac9fbefc2 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Fri, 22 Feb 2013 11:13:23 +0100
-Subject: [PATCH] Fix jetty dependencies
+Subject: [PATCH 2/2] 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
+index cb677c4..af3eee0 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>
+@@ -434,18 +434,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
+1.8.1.4
diff --git a/0001-Port-to-jetty-9.patch b/0001-Port-to-jetty-9.patch
index 89229ce..054c5b9 100644
--- a/0001-Port-to-jetty-9.patch
+++ b/0001-Port-to-jetty-9.patch
@@ -1,74 +1,74 @@
-From 4c2e25dd41672533a6f6f3da490d2cbfa385884a Mon Sep 17 00:00:00 2001
+From 6a802fdb0319b459f154328cc9fe544d342aae29 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb at redhat.com>
Date: Fri, 22 Feb 2013 10:56:19 +0100
-Subject: [PATCH] Port to jetty 9
+Subject: [PATCH 1/2] 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
+index d5ac557..c64513f 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.
+
+ 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();
+ 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
+ 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;
- }
-
+ 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
+1.8.1.4
diff --git a/maven-site-plugin-jetty-provided.patch b/maven-site-plugin-jetty-provided.patch
index e5f3a73..de5bf06 100644
--- a/maven-site-plugin-jetty-provided.patch
+++ b/maven-site-plugin-jetty-provided.patch
@@ -1,31 +1,31 @@
---- pom.xml~ 2013-03-01 09:27:48.503184556 +0100
-+++ pom.xml 2013-03-01 09:29:26.886220106 +0100
-@@ -406,24 +406,28 @@
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>6.1.25</version>
+--- pom.xml~ 2013-05-14 13:40:30.885165658 +0200
++++ pom.xml 2013-05-14 13:40:19.542169386 +0200
+@@ -437,24 +437,28 @@
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>6.1.25</version>
+ <scope>provided</scope>
- </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-webapp</artifactId>
+ <version>6.1.25</version>
+ <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>6.1.25</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>6.1.25</version>
+ <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>6.1.25</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>6.1.25</version>
+ <scope>provided</scope>
- </dependency>
-
- <dependency>
+ </dependency>
+
+ <dependency>
diff --git a/maven-site-plugin.spec b/maven-site-plugin.spec
index 610b48a..6c4d8a9 100644
--- a/maven-site-plugin.spec
+++ b/maven-site-plugin.spec
@@ -1,12 +1,11 @@
Name: maven-site-plugin
-Version: 3.2
-Release: 4%{?dist}
+Version: 3.3
+Release: 1%{?dist}
Summary: Maven Site Plugin
-
-Group: Development/Libraries
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}/%{name}-%{version}-source-release.zip
+BuildArch: noarch
Patch0: 0001-Port-to-jetty-9.patch
Patch1: 0001-Fix-jetty-dependencies.patch
@@ -14,48 +13,50 @@ Patch1: 0001-Fix-jetty-dependencies.patch
# dependency scope from compile to provided to reduce dependency bloat.
Patch2: %{name}-jetty-provided.patch
-BuildArch: noarch
-
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven-local
-BuildRequires: maven-artifact-manager
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-assembly-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-doxia-sink-api
-BuildRequires: maven-doxia-logging-api
-BuildRequires: maven-doxia-core
-BuildRequires: maven-doxia-module-xhtml
-BuildRequires: maven-doxia-module-apt
-BuildRequires: maven-doxia-module-xdoc
-BuildRequires: maven-doxia-module-fml
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-doxia-tools >= 1.4-8
-BuildRequires: maven-project
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-shade-plugin
-BuildRequires: maven-plugin-testing-harness
-BuildRequires: maven-wagon
-BuildRequires: maven-reporting-exec
-BuildRequires: plexus-containers-component-metadata
-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
-BuildRequires: plexus-i18n
-BuildRequires: plexus-velocity
-BuildRequires: plexus-utils
-BuildRequires: jetty-parent
+BuildRequires: maven-local
+BuildRequires: mvn(commons-io:commons-io)
+BuildRequires: mvn(commons-lang:commons-lang)
+BuildRequires: mvn(javax.servlet:servlet-api)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-core)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-decoration-model)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-integration-tools)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-logging-api)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-module-apt)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-module-fml)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-module-markdown)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-module-xdoc)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-module-xhtml)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api)
+BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer)
+BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness)
+BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires: mvn(org.apache.maven.plugins:maven-plugins)
+BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
+BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
+BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-exec)
+BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api)
+BuildRequires: mvn(org.apache.maven:maven-archiver)
+BuildRequires: mvn(org.apache.maven:maven-artifact)
+BuildRequires: mvn(org.apache.maven:maven-compat)
+BuildRequires: mvn(org.apache.maven:maven-core)
+BuildRequires: mvn(org.apache.maven:maven-model)
+BuildRequires: mvn(org.apache.maven:maven-plugin-api)
+BuildRequires: mvn(org.apache.maven:maven-settings)
+BuildRequires: mvn(org.apache.maven:maven-settings-builder)
+BuildRequires: mvn(org.apache.velocity:velocity)
+BuildRequires: mvn(org.codehaus.plexus:plexus-archiver)
+BuildRequires: mvn(org.codehaus.plexus:plexus-i18n)
+BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires: mvn(org.codehaus.plexus:plexus-velocity)
+BuildRequires: mvn(org.eclipse.jetty:jetty-client)
+BuildRequires: mvn(org.eclipse.jetty:jetty-server)
+BuildRequires: mvn(org.eclipse.jetty:jetty-servlet)
+BuildRequires: mvn(org.eclipse.jetty:jetty-util)
+BuildRequires: mvn(org.eclipse.jetty:jetty-webapp)
+BuildRequires: mvn(org.slf4j:jcl-over-slf4j)
+BuildRequires: mvn(org.slf4j:slf4j-api)
+BuildRequires: mvn(org.slf4j:slf4j-simple)
Provides: maven2-plugin-site = %{version}-%{release}
Obsoletes: maven2-plugin-site <= 0:2.0.8
@@ -90,6 +91,9 @@ API documentation for %{name}.
%doc LICENSE NOTICE
%changelog
+* Tue May 14 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.3-1
+- Update to upstream version 3.3
+
* Fri Mar 1 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.2-4
- Merge branch 'port-to-jetty-9' into master
diff --git a/sources b/sources
index 4b02eb5..d75ca8b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bdece0d7320e4a0380c865a0c3ed9b0e maven-site-plugin-3.2-source-release.zip
+b27e1881283c7288d641b544dd2b623c maven-site-plugin-3.3-source-release.zip
More information about the scm-commits
mailing list