[maven-site-plugin: 2/2] Merge branch 'port-to-jetty-9'

[Mikolaj Izdebski]

commit 17d607e8244df660608b22b9107d6f5188a8b220
Merge: 0e4168d 1d759d5
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Fri Mar 1 09:26:51 2013 +0100

    Merge branch 'port-to-jetty-9'
    
    Conflicts:
    	maven-site-plugin.spec

 0001-Fix-jetty-dependencies.patch      |   52 +++++++++++++++++
 0001-Port-to-jetty-9.patch             |   74 ++++++++++++++++++++++++
 0002-Port-to-jetty-8.x.patch           |   98 --------------------------------
 maven-site-plugin-jetty-provided.patch |   23 +++++---
 maven-site-plugin.spec                 |   23 +++++--
 5 files changed, 157 insertions(+), 113 deletions(-)
---
diff --cc maven-site-plugin-jetty-provided.patch
index 7530c9b,0000000..e5f3a73
mode 100644,000000..100644
--- a/maven-site-plugin-jetty-provided.patch
+++ b/maven-site-plugin-jetty-provided.patch
@@@ -1,24 -1,0 +1,31 @@@
- --- pom.xml~	2013-02-26 10:22:46.367919263 +0100
- +++ pom.xml	2013-02-26 10:26:19.330517747 +0100
- @@ -406,18 +406,21 @@
++--- 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>8.1.0.RC4</version>
++       <version>6.1.25</version>
 ++      <scope>provided</scope>
-    </dependency>
++     </dependency>
 + 
 +     <dependency>
 +       <groupId>org.eclipse.jetty</groupId>
 +       <artifactId>jetty-webapp</artifactId>
-        <version>8.1.0.RC4</version>
++       <version>6.1.25</version>
 ++      <scope>provided</scope>
-    </dependency>
++     </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>8.1.0.RC4</version>
++       <version>6.1.25</version>
 ++      <scope>provided</scope>
 +     </dependency>
 + 
 +     <dependency>
diff --cc maven-site-plugin.spec
index a7cde3d,c7156a9..610b48a
--- a/maven-site-plugin.spec
+++ b/maven-site-plugin.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           maven-site-plugin
  Version:        3.2
--Release:        3%{?dist}
++Release:        4%{?dist}
  Summary:        Maven Site Plugin
  
  Group:          Development/Libraries
@@@ -8,10 -8,8 +8,11 @@@ License:        ASL 2.
  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
  
- Patch1:         0002-Port-to-jetty-8.x.patch
+ Patch0:         0001-Port-to-jetty-9.patch
+ Patch1:         0001-Fix-jetty-dependencies.patch
 +# Jetty is needed only in interactive mode of maven-site-plugin. Change
 +# dependency scope from compile to provided to reduce dependency bloat.
 +Patch2:         %{name}-jetty-provided.patch
  
  BuildArch: noarch
  
@@@ -70,8 -69,8 +72,9 @@@ API documentation for %{name}
  
  %prep
  %setup -q
+ %patch0 -p1
  %patch1 -p1
 +%patch2
  
  %build
  # skipping tests because we need to fix them first for jetty update
@@@ -87,9 -86,9 +90,15 @@@
  %doc LICENSE NOTICE
  
  %changelog
++* Fri Mar  1 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.2-4
++- Merge branch 'port-to-jetty-9' into master
++
 +* Tue Feb 26 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.2-3
 +- Change jetty dependency scope to provided
 +
+ * Mon Feb 25 2013 Michal Srb <msrb at redhat.com> - 3.2-3
+ - Port to jetty 9.0.0
+ 
  * Thu Feb 07 2013 Michal Srb <msrb at redhat.com> - 3.2-2
  - Migrate from maven-doxia to doxia subpackages