[maven-site-plugin] Update to upstream version 3.4

[Mikolaj Izdebski]

commit 3e2c36ffc472cab9f731cc604ecbc380514c2769
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Sun Jul 20 10:03:07 2014 +0200

    Update to upstream version 3.4

 .gitignore                        |    1 +
 0001-Fix-jetty-dependencies.patch |    8 ++++----
 0001-Port-to-jetty-9.patch        |   26 +++++++++++++-------------
 maven-site-plugin.spec            |    7 +++++--
 sources                           |    2 +-
 5 files changed, 24 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6112751..0a0e25e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ maven-site-plugin-2.2-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
+/maven-site-plugin-3.4-source-release.zip
diff --git a/0001-Fix-jetty-dependencies.patch b/0001-Fix-jetty-dependencies.patch
index cc28185..64b6db3 100644
--- a/0001-Fix-jetty-dependencies.patch
+++ b/0001-Fix-jetty-dependencies.patch
@@ -1,4 +1,4 @@
-From 1cb1e52ddd82e57477baac3cc0d765cac9fbefc2 Mon Sep 17 00:00:00 2001
+From fe5fa34b05982ac6a62aa82e2eb0f29fec1e407d 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 2/2] Fix jetty dependencies
@@ -8,10 +8,10 @@ Subject: [PATCH 2/2] Fix jetty dependencies
  1 file changed, 17 insertions(+), 4 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index cb677c4..af3eee0 100644
+index bd415c7..18d17a5 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -434,18 +434,31 @@ under the License.
+@@ -401,18 +401,31 @@ under the License.
      </dependency>
  
      <dependency>
@@ -48,5 +48,5 @@ index cb677c4..af3eee0 100644
        <version>6.1.25</version>
        <scope>test</scope>
 -- 
-1.8.1.4
+1.9.3
 
diff --git a/0001-Port-to-jetty-9.patch b/0001-Port-to-jetty-9.patch
index 054c5b9..61da995 100644
--- a/0001-Port-to-jetty-9.patch
+++ b/0001-Port-to-jetty-9.patch
@@ -1,20 +1,20 @@
-From 6a802fdb0319b459f154328cc9fe544d342aae29 Mon Sep 17 00:00:00 2001
+From e37087972ac0039913259ae5e4df27150407b202 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 1/2] Port to jetty 9
 
 ---
- .../org/apache/maven/plugins/site/SiteRunMojo.java | 28 +++++++++++-----------
+ .../apache/maven/plugins/site/run/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 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;
- 
+diff --git a/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java b/src/main/java/org/apache/maven/plugins/site/run/SiteRunMojo.java
+index fbaba2a..0854183 100644
+--- 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.annotations.Parameter;
+ 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;
@@ -31,7 +31,7 @@ index d5ac557..c64513f 100644
  
  /**
   * Starts the site up, rendering documents as requested for faster editing.
-@@ -84,7 +85,7 @@ public class SiteRunMojo
+@@ -79,7 +80,7 @@ public class SiteRunMojo
          Server server = new Server();
          server.setStopAtShutdown( true );
  
@@ -40,7 +40,7 @@ index d5ac557..c64513f 100644
          server.setConnectors( new Connector[] { defaultConnector } );
  
          WebAppContext webapp = createWebApplication();
-@@ -93,10 +94,9 @@ public class SiteRunMojo
+@@ -88,10 +89,9 @@ public class SiteRunMojo
          DefaultHandler defaultHandler = new DefaultHandler();
          defaultHandler.setServer( server );
  
@@ -54,7 +54,7 @@ index d5ac557..c64513f 100644
  
          getLog().info( "Starting Jetty on http://localhost:" + port + "/" );
          try
-@@ -219,11 +219,11 @@ public class SiteRunMojo
+@@ -214,11 +214,11 @@ public class SiteRunMojo
          return webapp;
      }
  
@@ -70,5 +70,5 @@ index d5ac557..c64513f 100644
      }
  
 -- 
-1.8.1.4
+1.9.3
 
diff --git a/maven-site-plugin.spec b/maven-site-plugin.spec
index c1da796..96b88b4 100644
--- a/maven-site-plugin.spec
+++ b/maven-site-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-site-plugin
-Version:        3.3
-Release:        5%{?dist}
+Version:        3.4
+Release:        1%{?dist}
 Summary:        Maven Site Plugin
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-site-plugin/
@@ -92,6 +92,9 @@ API documentation for %{name}.
 %doc LICENSE NOTICE
 
 %changelog
+* Sun Jul 20 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.4-1
+- Update to upstream version 3.4
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index d75ca8b..204cc87 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b27e1881283c7288d641b544dd2b623c  maven-site-plugin-3.3-source-release.zip
+5291297b641ee0298c1f90f468007a4a  maven-site-plugin-3.4-source-release.zip