[stapler] Update to upstream version 1.225

[Michal Srb]

commit 7c981406bcea73575e46bd4c9c647ea79197b3c8
Author: Michal Srb <msrb at redhat.com>
Date:   Wed Apr 23 08:22:52 2014 +0200

    Update to upstream version 1.225

 .gitignore              |    1 +
 0001-Port-to-asm4.patch |   64 -----------------------------------------------
 sources                 |    3 +-
 stapler.spec            |   18 ++++++++-----
 4 files changed, 13 insertions(+), 73 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 88564bd..07391d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /stapler-1.222-clean.tar.gz
 /stapler-1.223-clean.tar.gz
 /stapler-1.224-clean.tar.gz
+/stapler-1.225-clean.tar.gz
diff --git a/sources b/sources
index eec8439..fa4491d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt
-421f7796b4e4126e7374c4e864170c15  stapler-1.223-clean.tar.gz
-5e20e0d75a6f986392e19f38c99f305c  stapler-1.224-clean.tar.gz
+c2491d22dcb503200c051137b23765a1  stapler-1.225-clean.tar.gz
diff --git a/stapler.spec b/stapler.spec
index 6c917cd..ddc4dcf 100644
--- a/stapler.spec
+++ b/stapler.spec
@@ -1,5 +1,5 @@
 Name:           stapler
-Version:        1.224
+Version:        1.225
 Release:        1%{?dist}
 Summary:        Stapler Java web framework
 
@@ -16,13 +16,12 @@ Source0:        stapler-%{version}-clean.tar.gz
 # in affected files is enough
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 
-Patch0:         0001-Port-to-asm4.patch
 # We don't have maven-jellydoc-plugin
-Patch1:         0001-Remove-jellydoc-annotations.patch
+Patch0:         0001-Remove-jellydoc-annotations.patch
 # We do not bundle classes from other projects, fix that
 # (this need some testing)
-Patch2:         0001-Use-XmlChars-class-from-external-jar.patch
-Patch3:         0001-Use-unbundled-class-from-glassfish-jaxb.patch
+Patch1:         0001-Use-XmlChars-class-from-external-jar.patch
+Patch2:         0001-Use-unbundled-class-from-glassfish-jaxb.patch
 
 BuildArch:      noarch
 
@@ -95,12 +94,14 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{name}-parent-%{version}
 
+
 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
 
 # Missing org.jruby-rack:jruby-rack
 %pom_disable_module jruby
@@ -115,7 +116,7 @@ cp %{SOURCE1} LICENSE
 
 
 # Build against asm4
-%pom_remove_dep :asm3 core
+%pom_remove_dep :asm5 core
 %pom_add_dep org.ow2.asm:asm core
 
 # Provided by JDK
@@ -172,6 +173,9 @@ cp %{SOURCE1} LICENSE
 
 
 %changelog
+* Wed Apr 23 2014 Michal Srb <msrb at redhat.com> - 1.225-1
+- Update to upstream version 1.225
+
 * Wed Feb 26 2014 Michal Srb <msrb at redhat.com> - 1.224-1
 - Update to upstream version 1.224