[stapler] Update to upstream version 1.221

[Michal Srb]

commit 0d8d8bf6e88caba899a3acccdd720a4d8439f3a5
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Oct 14 07:43:28 2013 +0200

    Update to upstream version 1.221

 .gitignore   |    1 +
 sources      |    2 +-
 stapler.spec |   15 ++++++---------
 3 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d031505..e11d283 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /stapler-1.209-clean.tar.gz
 /LICENSE-2.0.txt
 /stapler-1.218-clean.tar.gz
+/stapler-1.221-clean.tar.gz
diff --git a/sources b/sources
index ecc88d9..2e12381 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt
-fc2f3983c9f3eb53f0e0787e882f785c  stapler-1.218-clean.tar.gz
+51dc5b756d571559725e25623e30d10c  stapler-1.221-clean.tar.gz
diff --git a/stapler.spec b/stapler.spec
index 69c7f11..0bf7ade 100644
--- a/stapler.spec
+++ b/stapler.spec
@@ -1,5 +1,5 @@
 Name:           stapler
-Version:        1.218
+Version:        1.221
 Release:        1%{?dist}
 Summary:        Stapler Java web framework
 
@@ -134,14 +134,8 @@ cp %{SOURCE1} LICENSE
    <scope>compile</scope>
  </dependency>" core
 
-# Fix findbugs groupId:artifactId
-%pom_xpath_replace "pom:dependency[pom:artifactId[text()='findbugs-annotations']]" \
-"<dependency>
-   <groupId>net.sourceforge.findbugs</groupId>
-   <artifactId>annotations</artifactId>
-   <scope>compile</scope>
- </dependency>" core
-
+# Provided by JDK
+%pom_remove_dep :javax.annotation-api core
 
 # Annotations removed by patch1, we don't need this anymore
 %pom_remove_dep ":jellydoc-annotations" jelly
@@ -185,6 +179,9 @@ cp %{SOURCE1} LICENSE
 
 
 %changelog
+* Mon Oct 14 2013 Michal Srb <msrb at redhat.com> - 1.221-1
+- Update to upstream version 1.221
+
 * Mon Sep 02 2013 Michal Srb <msrb at redhat.com> - 1.218-1
 - Update to upstream version 1.218