[stapler] Update to upstream version 1.226

[Michal Srb]

commit 9a1ae8001f2a4215a734f4d549ec07625a452366
Author: Michal Srb <msrb at redhat.com>
Date:   Fri Jun 13 08:16:17 2014 +0200

    Update to upstream version 1.226

 .gitignore   |    1 +
 sources      |    2 +-
 stapler.spec |   12 +++++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 07391d6..d91ef62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /stapler-1.223-clean.tar.gz
 /stapler-1.224-clean.tar.gz
 /stapler-1.225-clean.tar.gz
+/stapler-1.226-clean.tar.gz
diff --git a/sources b/sources
index fa4491d..8c016f0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt
-c2491d22dcb503200c051137b23765a1  stapler-1.225-clean.tar.gz
+6eff2f50807f2d879fc1c6b9db06e9ed  stapler-1.226-clean.tar.gz
diff --git a/stapler.spec b/stapler.spec
index 8fa87bf..5981c2c 100644
--- a/stapler.spec
+++ b/stapler.spec
@@ -1,6 +1,6 @@
 Name:           stapler
-Version:        1.225
-Release:        2%{?dist}
+Version:        1.226
+Release:        1%{?dist}
 Summary:        Stapler Java web framework
 
 # Project is licensed mostly under 2-clause BSD license
@@ -22,6 +22,7 @@ Patch0:         0001-Remove-jellydoc-annotations.patch
 # (this need some testing)
 Patch1:         0001-Use-XmlChars-class-from-external-jar.patch
 Patch2:         0001-Use-unbundled-class-from-glassfish-jaxb.patch
+Patch3:         servlet31.patch
 
 BuildArch:      noarch
 
@@ -36,10 +37,12 @@ BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(com.sun.xml.bind:jaxb-impl)
 BuildRequires:  mvn(com.sun.xml.txw2:txw2)
 BuildRequires:  mvn(dom4j:dom4j)
+BuildRequires:  mvn(javax.servlet:javax.servlet-api)
 BuildRequires:  mvn(javax.servlet:jsp-api)
 BuildRequires:  mvn(javax.servlet:servlet-api)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-release-plugin)
+BuildRequires:  mvn(org.apache.tomcat:tomcat-el-api)
 BuildRequires:  mvn(org.codehaus.groovy:groovy18-all:1.8)
 BuildRequires:  mvn(org.jenkins-ci:annotation-indexer)
 BuildRequires:  mvn(org.jenkins-ci:commons-jelly)
@@ -48,7 +51,6 @@ BuildRequires:  mvn(org.jvnet:tiger-types)
 BuildRequires:  mvn(org.kohsuke.metainf-services:metainf-services)
 BuildRequires:  mvn(org.kohsuke:pom:pom:)
 BuildRequires:  mvn(org.kohsuke.stapler:json-lib)
-BuildRequires:  mvn(org.kohsuke.stapler:stapler-parent:pom:)
 BuildRequires:  mvn(org.mockito:mockito-all)
 BuildRequires:  mvn(org.ow2.asm:asm)
 BuildRequires:  mvn(xerces:xercesImpl)
@@ -100,6 +102,7 @@ cp %{SOURCE1} LICENSE
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 sed -i 's/org.kohsuke.asm5/org.objectweb.asm/' core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java
 
@@ -173,6 +176,9 @@ sed -i 's/org.kohsuke.asm5/org.objectweb.asm/' core/src/main/java/org/kohsuke/st
 
 
 %changelog
+* Tue Jun 10 2014 Michal Srb <msrb at redhat.com> - 1.226-1
+- Update to upstream version 1.226
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.225-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild