diff --git a/arquillian/arquillian-common/pom.xml b/arquillian/arquillian-common/pom.xml
index d5aa70a031e..73ba471f45a 100644
--- a/arquillian/arquillian-common/pom.xml
+++ b/arquillian/arquillian-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <artifactId>arquillian-common</artifactId>
diff --git a/arquillian/arquillian-openejb-embedded-4/pom.xml b/arquillian/arquillian-openejb-embedded-4/pom.xml
index 0076952c0d7..e16aa0ec405 100644
--- a/arquillian/arquillian-openejb-embedded-4/pom.xml
+++ b/arquillian/arquillian-openejb-embedded-4/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>arquillian-openejb-embedded-4</artifactId>
   <name>OpenEJB :: Arquillian Adaptors Parent :: OpenEJB Container</name>
-  <version>4.7.4-SP.20</version>
+  <version>4.7.4-SP.21</version>
 
   <dependencies>
     <dependency>
diff --git a/arquillian/arquillian-openejb-transaction-provider/pom.xml b/arquillian/arquillian-openejb-transaction-provider/pom.xml
index 7ba9c4b1ac2..ddbdfa0b65b 100644
--- a/arquillian/arquillian-openejb-transaction-provider/pom.xml
+++ b/arquillian/arquillian-openejb-transaction-provider/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/arquillian/arquillian-tck/pom.xml b/arquillian/arquillian-tck/pom.xml
index c899ca3ef2f..696a344e74b 100644
--- a/arquillian/arquillian-tck/pom.xml
+++ b/arquillian/arquillian-tck/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/arquillian/arquillian-tomee-common/pom.xml b/arquillian/arquillian-tomee-common/pom.xml
index dc0678e69da..18b1093068c 100644
--- a/arquillian/arquillian-tomee-common/pom.xml
+++ b/arquillian/arquillian-tomee-common/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <artifactId>arquillian-tomee-common</artifactId>
   <packaging>jar</packaging>
diff --git a/arquillian/arquillian-tomee-embedded/pom.xml b/arquillian/arquillian-tomee-embedded/pom.xml
index ed9b5ee74ee..f8a899e3096 100644
--- a/arquillian/arquillian-tomee-embedded/pom.xml
+++ b/arquillian/arquillian-tomee-embedded/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <artifactId>arquillian-tomee-embedded</artifactId>
   <packaging>jar</packaging>
diff --git a/arquillian/arquillian-tomee-moviefun-example/pom.xml b/arquillian/arquillian-tomee-moviefun-example/pom.xml
index b330fcf677c..6e479f0de55 100644
--- a/arquillian/arquillian-tomee-moviefun-example/pom.xml
+++ b/arquillian/arquillian-tomee-moviefun-example/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.apache.openejb</groupId>
     <artifactId>arquillian</artifactId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <artifactId>arquillian-tomee-moviefun-example</artifactId>
   <packaging>war</packaging>
diff --git a/arquillian/arquillian-tomee-remote/pom.xml b/arquillian/arquillian-tomee-remote/pom.xml
index 24efe90fe16..2a0abfd2211 100644
--- a/arquillian/arquillian-tomee-remote/pom.xml
+++ b/arquillian/arquillian-tomee-remote/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <artifactId>arquillian-tomee-remote</artifactId>
   <packaging>jar</packaging>
@@ -91,7 +91,7 @@
       <groupId>org.apache.openejb</groupId>
       <artifactId>apache-tomee</artifactId>
       <type>zip</type>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
       <classifier>webprofile</classifier>
       <scope>provided</scope>
     </dependency>
@@ -120,7 +120,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>arquillian-tomee-common</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>
@@ -147,7 +147,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>arquillian-common</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
     </dependency>
 
     <dependency>
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml
index cf2143d85e6..526b8e04d7a 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-codi-tests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <artifactId>arquillian-tomee-codi-tests</artifactId>
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
index bc8a880819e..5bfbe951ff5 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <artifactId>arquillian-tomee-config-tests</artifactId>
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
index 501233791b3..aeeaf803364 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <artifactId>arquillian-tomee-jaxrs-tests</artifactId>
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
index a032c40cb77..8c3516d7630 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <artifactId>arquillian-tomee-jaxws-tests</artifactId>
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
index 37961ff8171..c44684612a8 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <artifactId>arquillian-tomee-jms-tests</artifactId>
diff --git a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
index 1192feda486..61e8c307904 100644
--- a/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian-tomee-tests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <artifactId>arquillian-tomee-webprofile-tests</artifactId>
diff --git a/arquillian/arquillian-tomee-tests/pom.xml b/arquillian/arquillian-tomee-tests/pom.xml
index d41daa0e76b..501045909bb 100644
--- a/arquillian/arquillian-tomee-tests/pom.xml
+++ b/arquillian/arquillian-tomee-tests/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <artifactId>arquillian-tomee-tests</artifactId>
   <packaging>pom</packaging>
@@ -115,7 +115,7 @@
     <dependency> <!-- tomee-embedded needs it + dependencies but tomee-*-remote doesn't need dependencies so to avoid conflicts bringing it back here -->
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
     </dependency>
 
     <!-- just to get it in the correct order -->
diff --git a/arquillian/arquillian-tomee-webapp-remote/pom.xml b/arquillian/arquillian-tomee-webapp-remote/pom.xml
index d9f011849d8..64a662b5191 100644
--- a/arquillian/arquillian-tomee-webapp-remote/pom.xml
+++ b/arquillian/arquillian-tomee-webapp-remote/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <artifactId>arquillian-tomee-webapp-remote</artifactId>
   <packaging>jar</packaging>
diff --git a/arquillian/pom.xml b/arquillian/pom.xml
index dc741519f9a..7b74d0550ce 100644
--- a/arquillian/pom.xml
+++ b/arquillian/pom.xml
@@ -22,11 +22,11 @@
   <parent>
     <artifactId>openejb</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <artifactId>arquillian</artifactId>
-  <version>1.7.4-SP.20</version>
+  <version>1.7.4-SP.21</version>
   <packaging>pom</packaging>
   <name>OpenEJB :: Arquillian Adaptors Parent</name>
 
diff --git a/arquillian/ziplock/pom.xml b/arquillian/ziplock/pom.xml
index 4c6a8e63463..834b0c2d15e 100644
--- a/arquillian/ziplock/pom.xml
+++ b/arquillian/ziplock/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>arquillian</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <artifactId>ziplock</artifactId>
   <packaging>jar</packaging>
diff --git a/assembly/openejb-lite/pom.xml b/assembly/openejb-lite/pom.xml
index 568470233b1..0e88cf58fbc 100644
--- a/assembly/openejb-lite/pom.xml
+++ b/assembly/openejb-lite/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>assembly</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-lite</artifactId>
diff --git a/assembly/openejb-standalone/pom.xml b/assembly/openejb-standalone/pom.xml
index 1ca350e94d0..08e6921f03a 100644
--- a/assembly/openejb-standalone/pom.xml
+++ b/assembly/openejb-standalone/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>assembly</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-standalone</artifactId>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index bab134381be..b143c267fd0 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>openejb</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>assembly</artifactId>
diff --git a/container/mbean-annotation-api/pom.xml b/container/mbean-annotation-api/pom.xml
index 4d9f06bd954..6f8fb64a3c1 100644
--- a/container/mbean-annotation-api/pom.xml
+++ b/container/mbean-annotation-api/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <artifactId>mbean-annotation-api</artifactId>
diff --git a/container/openejb-api/pom.xml b/container/openejb-api/pom.xml
index 6a276f99988..22e159186e8 100644
--- a/container/openejb-api/pom.xml
+++ b/container/openejb-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/container/openejb-concurrency-utilities-ee/pom.xml b/container/openejb-concurrency-utilities-ee/pom.xml
index 38ae1688434..2c1ce2ce080 100644
--- a/container/openejb-concurrency-utilities-ee/pom.xml
+++ b/container/openejb-concurrency-utilities-ee/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index 69485a0a675..d59c565560a 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-core</artifactId>
diff --git a/container/openejb-javaagent/pom.xml b/container/openejb-javaagent/pom.xml
index f18d1e65473..e6ddb0aee5f 100644
--- a/container/openejb-javaagent/pom.xml
+++ b/container/openejb-javaagent/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-javaagent</artifactId>
diff --git a/container/openejb-jee-accessors/pom.xml b/container/openejb-jee-accessors/pom.xml
index bbb5d36f0ce..f6903d4cf42 100644
--- a/container/openejb-jee-accessors/pom.xml
+++ b/container/openejb-jee-accessors/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-jee-accessors</artifactId>
diff --git a/container/openejb-jee/pom.xml b/container/openejb-jee/pom.xml
index 78e1102eabf..b70543e8711 100644
--- a/container/openejb-jee/pom.xml
+++ b/container/openejb-jee/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-jee</artifactId>
diff --git a/container/openejb-jpa-integration/pom.xml b/container/openejb-jpa-integration/pom.xml
index 237f65e353e..1d85f03a422 100644
--- a/container/openejb-jpa-integration/pom.xml
+++ b/container/openejb-jpa-integration/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/container/openejb-junit/pom.xml b/container/openejb-junit/pom.xml
index 9b84ea3f43c..a9cd1ac1ac4 100644
--- a/container/openejb-junit/pom.xml
+++ b/container/openejb-junit/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/container/openejb-loader/pom.xml b/container/openejb-loader/pom.xml
index 60d6b37a376..a3355b5f6f8 100644
--- a/container/openejb-loader/pom.xml
+++ b/container/openejb-loader/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>container</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-loader</artifactId>
diff --git a/container/pom.xml b/container/pom.xml
index db2836533ac..e15f43e5ef4 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>openejb</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/deps/jstl-patched/pom.xml b/deps/jstl-patched/pom.xml
index 33d04a33d8a..362f1629f1e 100644
--- a/deps/jstl-patched/pom.xml
+++ b/deps/jstl-patched/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>deps</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <groupId>org.apache.openejb.patch</groupId>
diff --git a/deps/pom.xml b/deps/pom.xml
index 707cc86abe9..02a62342170 100644
--- a/deps/pom.xml
+++ b/deps/pom.xml
@@ -18,7 +18,7 @@
   <parent>
     <artifactId>openejb</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>deps</artifactId>
diff --git a/examples/access-timeout-meta/pom.xml b/examples/access-timeout-meta/pom.xml
index 2ba58c10c3d..087d20e6fb2 100644
--- a/examples/access-timeout-meta/pom.xml
+++ b/examples/access-timeout-meta/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/access-timeout/pom.xml b/examples/access-timeout/pom.xml
index a30e3e3eb56..0bd0037942f 100644
--- a/examples/access-timeout/pom.xml
+++ b/examples/access-timeout/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/alternate-descriptors/pom.xml b/examples/alternate-descriptors/pom.xml
index eeb8ddebacd..9a3354ee120 100644
--- a/examples/alternate-descriptors/pom.xml
+++ b/examples/alternate-descriptors/pom.xml
@@ -91,7 +91,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
diff --git a/examples/application-composer/pom.xml b/examples/application-composer/pom.xml
index 7889587e12e..8873f043432 100644
--- a/examples/application-composer/pom.xml
+++ b/examples/application-composer/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/applicationcomposer-jaxws-cdi/pom.xml b/examples/applicationcomposer-jaxws-cdi/pom.xml
index 06962275f76..17fffe88699 100644
--- a/examples/applicationcomposer-jaxws-cdi/pom.xml
+++ b/examples/applicationcomposer-jaxws-cdi/pom.xml
@@ -68,13 +68,13 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>ziplock</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/applicationexception/pom.xml b/examples/applicationexception/pom.xml
index 5c45dbb3785..424dcb5da85 100644
--- a/examples/applicationexception/pom.xml
+++ b/examples/applicationexception/pom.xml
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/async-methods/pom.xml b/examples/async-methods/pom.xml
index 293d0e98454..812c5238c76 100644
--- a/examples/async-methods/pom.xml
+++ b/examples/async-methods/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/async-postconstruct/pom.xml b/examples/async-postconstruct/pom.xml
index 4500c646812..8fb5c04b9e3 100644
--- a/examples/async-postconstruct/pom.xml
+++ b/examples/async-postconstruct/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/bean-validation-design-by-contract/pom.xml b/examples/bean-validation-design-by-contract/pom.xml
index 82de303dd8b..3354c0d4c44 100755
--- a/examples/bean-validation-design-by-contract/pom.xml
+++ b/examples/bean-validation-design-by-contract/pom.xml
@@ -24,7 +24,7 @@
   <name>OpenEJB :: Examples :: Bean Validation Design By Contract</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <openejb.version>4.7.4-SP.20</openejb.version>
+    <openejb.version>4.7.4-SP.21</openejb.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-alternative-and-stereotypes/pom.xml b/examples/cdi-alternative-and-stereotypes/pom.xml
index 6010ce07075..9cc42ce9b69 100644
--- a/examples/cdi-alternative-and-stereotypes/pom.xml
+++ b/examples/cdi-alternative-and-stereotypes/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-application-scope/pom.xml b/examples/cdi-application-scope/pom.xml
index 8cc774bc994..a658ddb49d2 100644
--- a/examples/cdi-application-scope/pom.xml
+++ b/examples/cdi-application-scope/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-basic/pom.xml b/examples/cdi-basic/pom.xml
index 9ac760f4f04..6a337742f0a 100644
--- a/examples/cdi-basic/pom.xml
+++ b/examples/cdi-basic/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-ejbcontext-jaas/pom.xml b/examples/cdi-ejbcontext-jaas/pom.xml
index 51fad49c71d..f03b067d03a 100644
--- a/examples/cdi-ejbcontext-jaas/pom.xml
+++ b/examples/cdi-ejbcontext-jaas/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -62,7 +62,7 @@
       <plugin>
         <groupId>org.apache.openejb.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>1.7.4-SP.20</version>
+        <version>1.7.4-SP.21</version>
         <configuration>
           <systemVariables>
             <java.security.auth.login.config>${project.build.directory}/apache-tomee/conf/login.config</java.security.auth.login.config>
diff --git a/examples/cdi-event-realm/pom.xml b/examples/cdi-event-realm/pom.xml
index bd69af9e65c..f026efbd124 100644
--- a/examples/cdi-event-realm/pom.xml
+++ b/examples/cdi-event-realm/pom.xml
@@ -26,8 +26,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <openejb.version>4.7.4-SP.20</openejb.version>
-    <tomee.version>1.7.4-SP.20</tomee.version>
+    <openejb.version>4.7.4-SP.21</openejb.version>
+    <tomee.version>1.7.4-SP.21</tomee.version>
     <tomcat.version>7.0.57</tomcat.version>
   </properties>
 
diff --git a/examples/cdi-events/pom.xml b/examples/cdi-events/pom.xml
index d37d35057ec..a15750f3c80 100644
--- a/examples/cdi-events/pom.xml
+++ b/examples/cdi-events/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <!-- to show events we log them in the test -->
diff --git a/examples/cdi-interceptors/pom.xml b/examples/cdi-interceptors/pom.xml
index 6e892e6cf4a..20ab223b7ad 100644
--- a/examples/cdi-interceptors/pom.xml
+++ b/examples/cdi-interceptors/pom.xml
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-produces-disposes/pom.xml b/examples/cdi-produces-disposes/pom.xml
index c85140e392f..6fc59319747 100644
--- a/examples/cdi-produces-disposes/pom.xml
+++ b/examples/cdi-produces-disposes/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-produces-field/pom.xml b/examples/cdi-produces-field/pom.xml
index 7e84f3127b5..88b0d017c8f 100644
--- a/examples/cdi-produces-field/pom.xml
+++ b/examples/cdi-produces-field/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-query/pom.xml b/examples/cdi-query/pom.xml
index 9abedb138ab..ead0dbc5422 100644
--- a/examples/cdi-query/pom.xml
+++ b/examples/cdi-query/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-realm/pom.xml b/examples/cdi-realm/pom.xml
index 853c8acb825..c5111a9bc11 100644
--- a/examples/cdi-realm/pom.xml
+++ b/examples/cdi-realm/pom.xml
@@ -26,7 +26,7 @@
   <name>OpenEJB :: Examples :: CDI Realm</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>1.7.4-SP.20</tomee.version>
+    <tomee.version>1.7.4-SP.21</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -51,7 +51,7 @@
       <plugin>
         <groupId>org.apache.openejb.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>1.7.4-SP.20</version>
+        <version>1.7.4-SP.21</version>
       </plugin>
     </plugins>
   </build>
diff --git a/examples/cdi-request-scope/pom.xml b/examples/cdi-request-scope/pom.xml
index 68a80e88aaa..4ec943c9dfd 100644
--- a/examples/cdi-request-scope/pom.xml
+++ b/examples/cdi-request-scope/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cdi-session-scope/pom.xml b/examples/cdi-session-scope/pom.xml
index 8bbb1b4b564..0d1d254399a 100644
--- a/examples/cdi-session-scope/pom.xml
+++ b/examples/cdi-session-scope/pom.xml
@@ -44,7 +44,7 @@
       <plugin>
         <groupId>org.apache.openejb.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>1.7.4-SP.20</version>
+        <version>1.7.4-SP.21</version>
       </plugin>
     </plugins>
   </build>
diff --git a/examples/change-jaxws-url/pom.xml b/examples/change-jaxws-url/pom.xml
index 6b37e782358..f23f328b13c 100644
--- a/examples/change-jaxws-url/pom.xml
+++ b/examples/change-jaxws-url/pom.xml
@@ -25,8 +25,8 @@
   <name>OpenEJB :: Web Examples :: Change JAXWS URL</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <openejb.version>4.7.4-SP.20</openejb.version>
-    <tomee.version>1.7.4-SP.20</tomee.version>
+    <openejb.version>4.7.4-SP.21</openejb.version>
+    <tomee.version>1.7.4-SP.21</tomee.version>
   </properties>
   <repositories>
     <repository>
diff --git a/examples/client-resource-lookup-preview/pom.xml b/examples/client-resource-lookup-preview/pom.xml
index b978e3d6485..453b70ab2a6 100644
--- a/examples/client-resource-lookup-preview/pom.xml
+++ b/examples/client-resource-lookup-preview/pom.xml
@@ -59,13 +59,13 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-client</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-ejbd</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>ziplock</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/component-interfaces/pom.xml b/examples/component-interfaces/pom.xml
index 28ee0b035ca..a926bf5cab6 100644
--- a/examples/component-interfaces/pom.xml
+++ b/examples/component-interfaces/pom.xml
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/cucumber-jvm/pom.xml b/examples/cucumber-jvm/pom.xml
index 8a0b23d36e4..cde5d09c4f2 100644
--- a/examples/cucumber-jvm/pom.xml
+++ b/examples/cucumber-jvm/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/custom-injection/pom.xml b/examples/custom-injection/pom.xml
index f1159f0b1e3..af40cef2afd 100644
--- a/examples/custom-injection/pom.xml
+++ b/examples/custom-injection/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/datasource-ciphered-password/pom.xml b/examples/datasource-ciphered-password/pom.xml
index d16f4ba16cf..1f87ba5d482 100644
--- a/examples/datasource-ciphered-password/pom.xml
+++ b/examples/datasource-ciphered-password/pom.xml
@@ -24,7 +24,7 @@
   <name>OpenEJB :: Examples :: Datasource Ciphered Password</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <openejb.version>4.7.4-SP.20</openejb.version>
+    <openejb.version>4.7.4-SP.21</openejb.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/datasource-definition/pom.xml b/examples/datasource-definition/pom.xml
index 8354b4c91a6..194ccdf397d 100644
--- a/examples/datasource-definition/pom.xml
+++ b/examples/datasource-definition/pom.xml
@@ -24,7 +24,7 @@
   <name>OpenEJB :: Examples :: Datasource Definition</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <openejb.version>4.7.4-SP.20</openejb.version>
+    <openejb.version>4.7.4-SP.21</openejb.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -116,7 +116,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/datasource-versioning/pom.xml b/examples/datasource-versioning/pom.xml
index aaed7d9759a..bbb2a7c8d00 100644
--- a/examples/datasource-versioning/pom.xml
+++ b/examples/datasource-versioning/pom.xml
@@ -25,7 +25,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.tomee>1.7.4-SP.20</version.tomee>
+    <version.tomee>1.7.4-SP.21</version.tomee>
   </properties>
 
   <build>
@@ -156,7 +156,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -168,7 +168,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>tomee-jdbc</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/decorators/pom.xml b/examples/decorators/pom.xml
index f8ba811eda8..87a9255baab 100644
--- a/examples/decorators/pom.xml
+++ b/examples/decorators/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/deltaspike-configproperty/pom.xml b/examples/deltaspike-configproperty/pom.xml
index 7ae1ac1c35d..c9c0fc10ca3 100644
--- a/examples/deltaspike-configproperty/pom.xml
+++ b/examples/deltaspike-configproperty/pom.xml
@@ -80,13 +80,13 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>arquillian-openejb-embedded-4</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>ziplock</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/deltaspike-exception-handling/pom.xml b/examples/deltaspike-exception-handling/pom.xml
index 955d90b4562..c1f6764310f 100644
--- a/examples/deltaspike-exception-handling/pom.xml
+++ b/examples/deltaspike-exception-handling/pom.xml
@@ -79,13 +79,13 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>arquillian-openejb-embedded-4</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>ziplock</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/deltaspike-fullstack/pom.xml b/examples/deltaspike-fullstack/pom.xml
index d5f5bf2ab4b..31d5782bbfa 100644
--- a/examples/deltaspike-fullstack/pom.xml
+++ b/examples/deltaspike-fullstack/pom.xml
@@ -22,8 +22,8 @@
     <version.myfaces2>2.2.3</version.myfaces2>
     <version.deltaspike>1.0.1</version.deltaspike>
     <version.extval>2.0.8</version.extval>
-    <version.openejb>4.7.4-SP.20</version.openejb>
-    <version.tomee>1.7.4-SP.20</version.tomee>
+    <version.openejb>4.7.4-SP.21</version.openejb>
+    <version.tomee>1.7.4-SP.21</version.tomee>
   </properties>
 
   <build>
diff --git a/examples/deltaspike-i18n/pom.xml b/examples/deltaspike-i18n/pom.xml
index e3961d4ac7d..11930265681 100644
--- a/examples/deltaspike-i18n/pom.xml
+++ b/examples/deltaspike-i18n/pom.xml
@@ -81,13 +81,13 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>arquillian-openejb-embedded-4</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>ziplock</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/dynamic-dao-implementation/pom.xml b/examples/dynamic-dao-implementation/pom.xml
index 6c45fbd6cd2..2093999adbf 100644
--- a/examples/dynamic-dao-implementation/pom.xml
+++ b/examples/dynamic-dao-implementation/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/dynamic-datasource-routing/pom.xml b/examples/dynamic-datasource-routing/pom.xml
index cac5e791df0..eeff427fb4e 100755
--- a/examples/dynamic-datasource-routing/pom.xml
+++ b/examples/dynamic-datasource-routing/pom.xml
@@ -24,7 +24,7 @@
   <name>OpenEJB :: Examples :: Dynamic Datasource Routing</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <openejb.version>4.7.4-SP.20</openejb.version>
+    <openejb.version>4.7.4-SP.21</openejb.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
     </dependency>
   </dependencies>
   <!--
diff --git a/examples/dynamic-implementation/pom.xml b/examples/dynamic-implementation/pom.xml
index c6a7b941be4..b61f2478a1a 100644
--- a/examples/dynamic-implementation/pom.xml
+++ b/examples/dynamic-implementation/pom.xml
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-api</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/dynamic-proxy-to-access-mbean/pom.xml b/examples/dynamic-proxy-to-access-mbean/pom.xml
index 9c600ea7299..8d598081689 100644
--- a/examples/dynamic-proxy-to-access-mbean/pom.xml
+++ b/examples/dynamic-proxy-to-access-mbean/pom.xml
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-api</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/ear-testing/business-logic/pom.xml b/examples/ear-testing/business-logic/pom.xml
index 80c8571fe72..556f1244ff8 100644
--- a/examples/ear-testing/business-logic/pom.xml
+++ b/examples/ear-testing/business-logic/pom.xml
@@ -77,7 +77,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/groovy-cdi/pom.xml b/examples/groovy-cdi/pom.xml
index fdb952210bf..1910108ac6d 100644
--- a/examples/groovy-cdi/pom.xml
+++ b/examples/groovy-cdi/pom.xml
@@ -93,13 +93,13 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>arquillian-openejb-embedded-4</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>ziplock</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/groovy-jpa/pom.xml b/examples/groovy-jpa/pom.xml
index 2410a59d992..6ae6aa787d1 100644
--- a/examples/groovy-jpa/pom.xml
+++ b/examples/groovy-jpa/pom.xml
@@ -94,13 +94,13 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>arquillian-openejb-embedded-4</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>ziplock</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/groovy-spock/pom.xml b/examples/groovy-spock/pom.xml
index c035736267b..3d57757a769 100644
--- a/examples/groovy-spock/pom.xml
+++ b/examples/groovy-spock/pom.xml
@@ -120,7 +120,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>arquillian-openejb-embedded-4</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -132,7 +132,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>ziplock</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/helloworld-weblogic/pom.xml b/examples/helloworld-weblogic/pom.xml
index f1b6256ea2f..93f24487edc 100644
--- a/examples/helloworld-weblogic/pom.xml
+++ b/examples/helloworld-weblogic/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/injection-of-connectionfactory/pom.xml b/examples/injection-of-connectionfactory/pom.xml
index 330b759b84c..0cadc2ccef6 100644
--- a/examples/injection-of-connectionfactory/pom.xml
+++ b/examples/injection-of-connectionfactory/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/injection-of-datasource/pom.xml b/examples/injection-of-datasource/pom.xml
index e1b733b443d..f22ef98fd11 100644
--- a/examples/injection-of-datasource/pom.xml
+++ b/examples/injection-of-datasource/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/injection-of-ejbs/pom.xml b/examples/injection-of-ejbs/pom.xml
index dd9a2de3d8d..d48868863e2 100644
--- a/examples/injection-of-ejbs/pom.xml
+++ b/examples/injection-of-ejbs/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/injection-of-entitymanager/pom.xml b/examples/injection-of-entitymanager/pom.xml
index 71e53922b8f..079414ecca4 100644
--- a/examples/injection-of-entitymanager/pom.xml
+++ b/examples/injection-of-entitymanager/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/injection-of-env-entry/pom.xml b/examples/injection-of-env-entry/pom.xml
index 94fe859e7ee..b35b2e28d72 100644
--- a/examples/injection-of-env-entry/pom.xml
+++ b/examples/injection-of-env-entry/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/interceptors/pom.xml b/examples/interceptors/pom.xml
index af7bd5abccc..941402b5c62 100644
--- a/examples/interceptors/pom.xml
+++ b/examples/interceptors/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/jpa-eclipselink/pom.xml b/examples/jpa-eclipselink/pom.xml
index 0169d2efc49..af351016387 100644
--- a/examples/jpa-eclipselink/pom.xml
+++ b/examples/jpa-eclipselink/pom.xml
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <!-- toplink dependencies -->
diff --git a/examples/jpa-enumerated/pom.xml b/examples/jpa-enumerated/pom.xml
index e69f1efa04a..b9ebf5ed2ac 100644
--- a/examples/jpa-enumerated/pom.xml
+++ b/examples/jpa-enumerated/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/jpa-hibernate/pom.xml b/examples/jpa-hibernate/pom.xml
index 93d33b58903..49f5caf67d2 100644
--- a/examples/jpa-hibernate/pom.xml
+++ b/examples/jpa-hibernate/pom.xml
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core-hibernate</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <type>pom</type>
       <scope>test</scope>
     </dependency>
diff --git a/examples/jsf-managedBean-and-ejb/pom.xml b/examples/jsf-managedBean-and-ejb/pom.xml
index abd28941e46..dcbf083d1d1 100644
--- a/examples/jsf-managedBean-and-ejb/pom.xml
+++ b/examples/jsf-managedBean-and-ejb/pom.xml
@@ -43,7 +43,7 @@
       <plugin>
         <groupId>org.apache.openejb.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>1.7.4-SP.20</version>
+        <version>1.7.4-SP.21</version>
       </plugin>
     </plugins>
   </build>
diff --git a/examples/lookup-of-ejbs-with-descriptor/pom.xml b/examples/lookup-of-ejbs-with-descriptor/pom.xml
index 538e8d26943..dfcecda46b1 100644
--- a/examples/lookup-of-ejbs-with-descriptor/pom.xml
+++ b/examples/lookup-of-ejbs-with-descriptor/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/lookup-of-ejbs/pom.xml b/examples/lookup-of-ejbs/pom.xml
index 9f8e7db7fc1..7d5cd5d9c18 100644
--- a/examples/lookup-of-ejbs/pom.xml
+++ b/examples/lookup-of-ejbs/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/mbean-auto-registration/pom.xml b/examples/mbean-auto-registration/pom.xml
index 52a10e206e1..866bc07d725 100755
--- a/examples/mbean-auto-registration/pom.xml
+++ b/examples/mbean-auto-registration/pom.xml
@@ -24,7 +24,7 @@
   <name>OpenEJB :: Examples :: MBean Auto Registration</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <openejb.version>4.7.4-SP.20</openejb.version>
+    <openejb.version>4.7.4-SP.21</openejb.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>mbean-annotation-api</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/moviefun-rest/pom.xml b/examples/moviefun-rest/pom.xml
index d99b1eb26fc..8d02015639b 100644
--- a/examples/moviefun-rest/pom.xml
+++ b/examples/moviefun-rest/pom.xml
@@ -21,9 +21,9 @@
   <name>OpenEJB :: Web Examples :: Moviefun Rest</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>1.7.4-SP.20</tomee.version>
+    <tomee.version>1.7.4-SP.21</tomee.version>
     <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
-    <version.openejb>4.7.4-SP.20</version.openejb>
+    <version.openejb>4.7.4-SP.21</version.openejb>
   </properties>
   <repositories>
     <repository>
diff --git a/examples/moviefun/pom.xml b/examples/moviefun/pom.xml
index aacc37131f7..bfda7dded99 100644
--- a/examples/moviefun/pom.xml
+++ b/examples/moviefun/pom.xml
@@ -21,7 +21,7 @@
   <name>OpenEJB :: Web Examples :: Moviefun</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>1.7.4-SP.20</tomee.version>
+    <tomee.version>1.7.4-SP.21</tomee.version>
     <version.shrinkwrap.resolver>2.0.0</version.shrinkwrap.resolver>
   </properties>
   <repositories>
@@ -98,7 +98,7 @@
       <plugin>
         <groupId>org.apache.openejb.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>1.7.4-SP.20</version>
+        <version>1.7.4-SP.21</version>
         <configuration>
           <tomeeClassifier>plus</tomeeClassifier>
           <args>-Xmx512m -XX:PermSize=256m</args>
@@ -148,7 +148,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -166,7 +166,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>tomee-embedded</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
       <!--<classifier>uber</classifier> -->
       <scope>test</scope>
     </dependency>
@@ -189,7 +189,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>ziplock</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/movies-complete-meta/pom.xml b/examples/movies-complete-meta/pom.xml
index e3841f95639..9c437cdb920 100644
--- a/examples/movies-complete-meta/pom.xml
+++ b/examples/movies-complete-meta/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/movies-complete/pom.xml b/examples/movies-complete/pom.xml
index f7bdc43ddaa..ace8eac649b 100644
--- a/examples/movies-complete/pom.xml
+++ b/examples/movies-complete/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/mtom/pom.xml b/examples/mtom/pom.xml
index 5759cbc3a35..b5277cfb020 100644
--- a/examples/mtom/pom.xml
+++ b/examples/mtom/pom.xml
@@ -27,7 +27,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.openejb>4.7.4-SP.20</version.openejb>
+    <version.openejb>4.7.4-SP.21</version.openejb>
   </properties>
 
   <repositories>
diff --git a/examples/multi-jpa-provider-testing/pom.xml b/examples/multi-jpa-provider-testing/pom.xml
index b51644d5425..10ebceee499 100644
--- a/examples/multi-jpa-provider-testing/pom.xml
+++ b/examples/multi-jpa-provider-testing/pom.xml
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>arquillian-openejb-embedded-4</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -136,7 +136,7 @@
     <dependency> <!-- just a facade pom which will bring hibernate for us -->
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core-hibernate</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
       <type>pom</type>
     </dependency>
diff --git a/examples/multiple-arquillian-adapters/pom.xml b/examples/multiple-arquillian-adapters/pom.xml
index deea6dd5335..64e9add49e3 100644
--- a/examples/multiple-arquillian-adapters/pom.xml
+++ b/examples/multiple-arquillian-adapters/pom.xml
@@ -27,8 +27,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <tomee.version>1.7.4-SP.20</tomee.version>
-    <openejb.version>4.7.4-SP.20</openejb.version>
+    <tomee.version>1.7.4-SP.21</tomee.version>
+    <openejb.version>4.7.4-SP.21</openejb.version>
     <arquillian.version>1.0.1.Final</arquillian.version>
   </properties>
 
diff --git a/examples/multiple-tomee-arquillian/pom.xml b/examples/multiple-tomee-arquillian/pom.xml
index 7828e9f9233..28ef15042b3 100644
--- a/examples/multiple-tomee-arquillian/pom.xml
+++ b/examples/multiple-tomee-arquillian/pom.xml
@@ -25,7 +25,7 @@
   <name>OpenEJB :: Examples :: Multiple TomEE with Arquillian</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>1.7.4-SP.20</tomee.version>
+    <tomee.version>1.7.4-SP.21</tomee.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -102,7 +102,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>ziplock</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/myfaces-codi-demo/pom.xml b/examples/myfaces-codi-demo/pom.xml
index d63d29251f4..b97bee51e48 100644
--- a/examples/myfaces-codi-demo/pom.xml
+++ b/examples/myfaces-codi-demo/pom.xml
@@ -39,7 +39,7 @@
       <plugin>
         <groupId>org.apache.openejb.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>1.7.4-SP.20</version>
+        <version>1.7.4-SP.21</version>
       </plugin>
     </plugins>
   </build>
diff --git a/examples/persistence-fragment/pom.xml b/examples/persistence-fragment/pom.xml
index 6ebe408aa98..2bbdddbde6e 100644
--- a/examples/persistence-fragment/pom.xml
+++ b/examples/persistence-fragment/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/pojo-webservice/pom.xml b/examples/pojo-webservice/pom.xml
index 2874749992b..b47360c7d9c 100644
--- a/examples/pojo-webservice/pom.xml
+++ b/examples/pojo-webservice/pom.xml
@@ -25,7 +25,7 @@
   <name>OpenEJB :: Web Examples :: Pojo WS</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <tomee.version>1.7.4-SP.20</tomee.version>
+    <tomee.version>1.7.4-SP.21</tomee.version>
   </properties>
   <repositories>
     <repository>
@@ -62,7 +62,7 @@
       <plugin> <!-- http://localhost:8080/pojo-webservice?wsdl -->
         <groupId>org.apache.openejb.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>1.7.4-SP.20</version>
+        <version>1.7.4-SP.21</version>
         <configuration>
           <tomeeVersion>${tomee.version}</tomeeVersion>
           <tomeeClassifier>plus</tomeeClassifier>
diff --git a/examples/polling-parent/pom.xml b/examples/polling-parent/pom.xml
index 5dca8e9f682..35c1d69299b 100644
--- a/examples/polling-parent/pom.xml
+++ b/examples/polling-parent/pom.xml
@@ -165,8 +165,8 @@
   <properties>
     <xbean.version>3.17</xbean.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.tomee>1.7.4-SP.20</version.tomee>
-    <version.openejb>4.7.4-SP.20</version.openejb>
+    <version.tomee>1.7.4-SP.21</version.tomee>
+    <version.openejb>4.7.4-SP.21</version.openejb>
   </properties>
 
   <!--
diff --git a/examples/pom.xml b/examples/pom.xml
index e2c73ce8665..5089b377729 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>openejb</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>examples</artifactId>
diff --git a/examples/projectstage-demo/pom.xml b/examples/projectstage-demo/pom.xml
index 484c5582aee..758a3cb8a8f 100644
--- a/examples/projectstage-demo/pom.xml
+++ b/examples/projectstage-demo/pom.xml
@@ -64,7 +64,7 @@
   </dependencies>
 
   <properties>
-    <tomee.version>1.7.4-SP.20</tomee.version>
+    <tomee.version>1.7.4-SP.21</tomee.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
diff --git a/examples/quartz-app/pom.xml b/examples/quartz-app/pom.xml
index 872a4aac879..fd6ae60899f 100644
--- a/examples/quartz-app/pom.xml
+++ b/examples/quartz-app/pom.xml
@@ -25,7 +25,7 @@
   <name>OpenEJB :: Examples :: Quartz</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	<version.openejb>4.7.4-SP.20</version.openejb>
+	<version.openejb>4.7.4-SP.21</version.openejb>
   </properties>
   <modules>
     <module>quartz-ra</module>
diff --git a/examples/realm-in-tomee/pom.xml b/examples/realm-in-tomee/pom.xml
index c275b28631e..03757e2221c 100644
--- a/examples/realm-in-tomee/pom.xml
+++ b/examples/realm-in-tomee/pom.xml
@@ -46,7 +46,7 @@
       <plugin>
         <groupId>org.apache.openejb.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>1.7.4-SP.20</version>
+        <version>1.7.4-SP.21</version>
       </plugin>
     </plugins>
   </build>
diff --git a/examples/reload-persistence-unit-properties/pom.xml b/examples/reload-persistence-unit-properties/pom.xml
index 1cfcff51542..a7fcccf08ac 100644
--- a/examples/reload-persistence-unit-properties/pom.xml
+++ b/examples/reload-persistence-unit-properties/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/resources-declared-in-webapp/pom.xml b/examples/resources-declared-in-webapp/pom.xml
index 165f8169fff..26f16270f97 100644
--- a/examples/resources-declared-in-webapp/pom.xml
+++ b/examples/resources-declared-in-webapp/pom.xml
@@ -26,7 +26,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <openejb.version>4.7.4-SP.20</openejb.version>
+    <openejb.version>4.7.4-SP.21</openejb.version>
   </properties>
 
   <repositories>
diff --git a/examples/resources-jmx-example/pom.xml b/examples/resources-jmx-example/pom.xml
index 0d83da1275d..063db4cc6cd 100644
--- a/examples/resources-jmx-example/pom.xml
+++ b/examples/resources-jmx-example/pom.xml
@@ -29,8 +29,8 @@
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.openejb>4.7.4-SP.20</version.openejb>
-    <version.tomee>1.7.4-SP.20</version.tomee>
+    <version.openejb>4.7.4-SP.21</version.openejb>
+    <version.tomee>1.7.4-SP.21</version.tomee>
     <version.openjpa>2.4.0</version.openjpa>
   </properties>
   
diff --git a/examples/rest-applicationcomposer-mockito/pom.xml b/examples/rest-applicationcomposer-mockito/pom.xml
index 77d99cdc319..8310e156003 100644
--- a/examples/rest-applicationcomposer-mockito/pom.xml
+++ b/examples/rest-applicationcomposer-mockito/pom.xml
@@ -75,19 +75,19 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-mockito</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/rest-applicationcomposer/pom.xml b/examples/rest-applicationcomposer/pom.xml
index b92f3033bdd..350b0550170 100644
--- a/examples/rest-applicationcomposer/pom.xml
+++ b/examples/rest-applicationcomposer/pom.xml
@@ -75,13 +75,13 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/rest-cdi/pom.xml b/examples/rest-cdi/pom.xml
index 73cceac7d64..eecc57170ca 100644
--- a/examples/rest-cdi/pom.xml
+++ b/examples/rest-cdi/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/rest-example-with-application/pom.xml b/examples/rest-example-with-application/pom.xml
index 62613139ba0..6bc64aebfa4 100644
--- a/examples/rest-example-with-application/pom.xml
+++ b/examples/rest-example-with-application/pom.xml
@@ -25,8 +25,8 @@
   <name>OpenEJB :: Web Examples :: REST Example With Application</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <openejb.version>4.7.4-SP.20</openejb.version>
-    <tomee.version>1.7.4-SP.20</tomee.version>
+    <openejb.version>4.7.4-SP.21</openejb.version>
+    <tomee.version>1.7.4-SP.21</tomee.version>
   </properties>
   <repositories>
     <repository>
diff --git a/examples/rest-example/pom.xml b/examples/rest-example/pom.xml
index 4a5d3947379..9f3a7ea20cb 100644
--- a/examples/rest-example/pom.xml
+++ b/examples/rest-example/pom.xml
@@ -26,8 +26,8 @@
   
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <openejb.version>4.7.4-SP.20</openejb.version>
-    <tomee.version>1.7.4-SP.20</tomee.version>
+    <openejb.version>4.7.4-SP.21</openejb.version>
+    <tomee.version>1.7.4-SP.21</tomee.version>
     <version.openjpa>2.4.0</version.openjpa>
   </properties>
   
diff --git a/examples/rest-jaas/pom.xml b/examples/rest-jaas/pom.xml
index 47c144d2623..aead42f6a96 100644
--- a/examples/rest-jaas/pom.xml
+++ b/examples/rest-jaas/pom.xml
@@ -49,7 +49,7 @@
       <plugin>
         <groupId>org.apache.openejb.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>1.7.4-SP.20</version>
+        <version>1.7.4-SP.21</version>
         <configuration>
           <systemVariables>
             <java.security.auth.login.config>${project.build.directory}/apache-tomee/conf/login.config</java.security.auth.login.config>
diff --git a/examples/rest-on-ejb/pom.xml b/examples/rest-on-ejb/pom.xml
index 592798bbfef..9b640060acc 100644
--- a/examples/rest-on-ejb/pom.xml
+++ b/examples/rest-on-ejb/pom.xml
@@ -70,13 +70,13 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/examples/rest-xml-json/pom.xml b/examples/rest-xml-json/pom.xml
index de67d864cd4..6f2f3bf4259 100644
--- a/examples/rest-xml-json/pom.xml
+++ b/examples/rest-xml-json/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/scala-basic/pom.xml b/examples/scala-basic/pom.xml
index 27b7e7a0677..3f9b22a176f 100644
--- a/examples/scala-basic/pom.xml
+++ b/examples/scala-basic/pom.xml
@@ -127,7 +127,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/schedule-events/pom.xml b/examples/schedule-events/pom.xml
index 9fb2ebfac75..a7149ab7dd4 100644
--- a/examples/schedule-events/pom.xml
+++ b/examples/schedule-events/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/schedule-expression/pom.xml b/examples/schedule-expression/pom.xml
index e2a950b2dd2..cb1316c52b6 100644
--- a/examples/schedule-expression/pom.xml
+++ b/examples/schedule-expression/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/schedule-methods-meta/pom.xml b/examples/schedule-methods-meta/pom.xml
index fde595edfca..e0d57c451b0 100644
--- a/examples/schedule-methods-meta/pom.xml
+++ b/examples/schedule-methods-meta/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/schedule-methods/pom.xml b/examples/schedule-methods/pom.xml
index 602896960e5..decfdee9bd4 100644
--- a/examples/schedule-methods/pom.xml
+++ b/examples/schedule-methods/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/server-events/pom.xml b/examples/server-events/pom.xml
index 8a20403caeb..de7cdebd67b 100644
--- a/examples/server-events/pom.xml
+++ b/examples/server-events/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>provided</scope>
     </dependency>
 
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>arquillian-openejb-embedded-4</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-cdi-interceptor/pom.xml b/examples/simple-cdi-interceptor/pom.xml
index a2683820dbb..24cd5358743 100644
--- a/examples/simple-cdi-interceptor/pom.xml
+++ b/examples/simple-cdi-interceptor/pom.xml
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-cmp2/pom.xml b/examples/simple-cmp2/pom.xml
index e41d18b4400..52f62d4da22 100644
--- a/examples/simple-cmp2/pom.xml
+++ b/examples/simple-cmp2/pom.xml
@@ -28,7 +28,7 @@
   <name>OpenEJB :: Examples :: Simple CMP2 Entity</name>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <openejb.version>4.7.4-SP.20</openejb.version>
+    <openejb.version>4.7.4-SP.21</openejb.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>
@@ -107,7 +107,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/simple-mdb-and-cdi/pom.xml b/examples/simple-mdb-and-cdi/pom.xml
index 7866d47c0ff..184666e27b9 100644
--- a/examples/simple-mdb-and-cdi/pom.xml
+++ b/examples/simple-mdb-and-cdi/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-mdb-with-descriptor/pom.xml b/examples/simple-mdb-with-descriptor/pom.xml
index e07a2c53285..e27461df28a 100644
--- a/examples/simple-mdb-with-descriptor/pom.xml
+++ b/examples/simple-mdb-with-descriptor/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/simple-mdb/pom.xml b/examples/simple-mdb/pom.xml
index 93dfba4774f..da979dda7a3 100644
--- a/examples/simple-mdb/pom.xml
+++ b/examples/simple-mdb/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-osgi/pom.xml b/examples/simple-osgi/pom.xml
index 094f82d600a..f92ec21e4dd 100644
--- a/examples/simple-osgi/pom.xml
+++ b/examples/simple-osgi/pom.xml
@@ -103,7 +103,7 @@
       <dependency>
         <groupId>org.apache.openejb</groupId>
         <artifactId>openejb-core</artifactId>
-        <version>4.7.4-SP.20</version>
+        <version>4.7.4-SP.21</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/examples/simple-osgi/simple-osgi-remote-client/pom.xml b/examples/simple-osgi/simple-osgi-remote-client/pom.xml
index 3d8d89683ad..cef4a4fa5fb 100644
--- a/examples/simple-osgi/simple-osgi-remote-client/pom.xml
+++ b/examples/simple-osgi/simple-osgi-remote-client/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-client</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/examples/simple-osgi/standard-ejbd-server/pom.xml b/examples/simple-osgi/standard-ejbd-server/pom.xml
index 2073b08b8af..62d620911e1 100644
--- a/examples/simple-osgi/standard-ejbd-server/pom.xml
+++ b/examples/simple-osgi/standard-ejbd-server/pom.xml
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-ejbd</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
diff --git a/examples/simple-rest/pom.xml b/examples/simple-rest/pom.xml
index 86e83022a00..c5636caf317 100644
--- a/examples/simple-rest/pom.xml
+++ b/examples/simple-rest/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf-rs</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-singleton/pom.xml b/examples/simple-singleton/pom.xml
index 06489014add..ee7fb90efd6 100644
--- a/examples/simple-singleton/pom.xml
+++ b/examples/simple-singleton/pom.xml
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-stateful-callbacks/pom.xml b/examples/simple-stateful-callbacks/pom.xml
index 8fa6fc6c2ef..f0690eb777b 100644
--- a/examples/simple-stateful-callbacks/pom.xml
+++ b/examples/simple-stateful-callbacks/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-stateful/pom.xml b/examples/simple-stateful/pom.xml
index 7ab1868667c..b7a48d19f67 100644
--- a/examples/simple-stateful/pom.xml
+++ b/examples/simple-stateful/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-stateless-callbacks/pom.xml b/examples/simple-stateless-callbacks/pom.xml
index c31f6f1dea2..251778c592f 100644
--- a/examples/simple-stateless-callbacks/pom.xml
+++ b/examples/simple-stateless-callbacks/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-stateless-with-descriptor/pom.xml b/examples/simple-stateless-with-descriptor/pom.xml
index 6b3de12dab4..d9a1c77c3ce 100644
--- a/examples/simple-stateless-with-descriptor/pom.xml
+++ b/examples/simple-stateless-with-descriptor/pom.xml
@@ -71,13 +71,13 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-jee-accessors</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-stateless/pom.xml b/examples/simple-stateless/pom.xml
index 27d376b12a2..30391688502 100644
--- a/examples/simple-stateless/pom.xml
+++ b/examples/simple-stateless/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/simple-webservice-without-interface/pom.xml b/examples/simple-webservice-without-interface/pom.xml
index 7bb13a8ab4a..1dbf0bcc4fa 100644
--- a/examples/simple-webservice-without-interface/pom.xml
+++ b/examples/simple-webservice-without-interface/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
diff --git a/examples/simple-webservice/pom.xml b/examples/simple-webservice/pom.xml
index 8b40ac08eb0..d3e3cd1d30a 100644
--- a/examples/simple-webservice/pom.xml
+++ b/examples/simple-webservice/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
diff --git a/examples/spring-data-proxy-meta/pom.xml b/examples/spring-data-proxy-meta/pom.xml
index 03d27b2f878..98080a0e4c2 100644
--- a/examples/spring-data-proxy-meta/pom.xml
+++ b/examples/spring-data-proxy-meta/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
     </dependency>
   </dependencies>
 
diff --git a/examples/spring-data-proxy/pom.xml b/examples/spring-data-proxy/pom.xml
index 448985b756f..f19eed63569 100644
--- a/examples/spring-data-proxy/pom.xml
+++ b/examples/spring-data-proxy/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
     </dependency>
   </dependencies>
 
diff --git a/examples/telephone-stateful/pom.xml b/examples/telephone-stateful/pom.xml
index a9e2d2d0d52..45e7b05808e 100644
--- a/examples/telephone-stateful/pom.xml
+++ b/examples/telephone-stateful/pom.xml
@@ -83,7 +83,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-ejbd</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <!-- END SNIPPET: openejbdep -->
diff --git a/examples/testcase-injection/pom.xml b/examples/testcase-injection/pom.xml
index 22423fff681..9279c58437f 100644
--- a/examples/testcase-injection/pom.xml
+++ b/examples/testcase-injection/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/testing-security-2/pom.xml b/examples/testing-security-2/pom.xml
index f09f27e84b9..cbc17e3f0fa 100644
--- a/examples/testing-security-2/pom.xml
+++ b/examples/testing-security-2/pom.xml
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/testing-security-3/pom.xml b/examples/testing-security-3/pom.xml
index 3980c52f8ce..355ad00744d 100644
--- a/examples/testing-security-3/pom.xml
+++ b/examples/testing-security-3/pom.xml
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/examples/testing-security-4/pom.xml b/examples/testing-security-4/pom.xml
index 60f36b94b2a..1687fbc8a3b 100644
--- a/examples/testing-security-4/pom.xml
+++ b/examples/testing-security-4/pom.xml
@@ -79,7 +79,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/examples/testing-security-meta/pom.xml b/examples/testing-security-meta/pom.xml
index 463901d8e98..b9c0f2d91e5 100644
--- a/examples/testing-security-meta/pom.xml
+++ b/examples/testing-security-meta/pom.xml
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/testing-security/pom.xml b/examples/testing-security/pom.xml
index fe89e069d89..0426adc6601 100644
--- a/examples/testing-security/pom.xml
+++ b/examples/testing-security/pom.xml
@@ -78,7 +78,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/testing-transactions-bmt/pom.xml b/examples/testing-transactions-bmt/pom.xml
index 58c167b9b9b..92b45c08db8 100644
--- a/examples/testing-transactions-bmt/pom.xml
+++ b/examples/testing-transactions-bmt/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/testing-transactions/pom.xml b/examples/testing-transactions/pom.xml
index 6439fa94dff..a72ec5212a8 100644
--- a/examples/testing-transactions/pom.xml
+++ b/examples/testing-transactions/pom.xml
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/tomee-jersey-eclipselink/pom.xml b/examples/tomee-jersey-eclipselink/pom.xml
index 88b49f8f288..e0f77ee88e9 100644
--- a/examples/tomee-jersey-eclipselink/pom.xml
+++ b/examples/tomee-jersey-eclipselink/pom.xml
@@ -90,7 +90,7 @@
       <plugin>
         <groupId>org.apache.openejb.maven</groupId>
         <artifactId>tomee-maven-plugin</artifactId>
-        <version>1.7.4-SP.20</version>
+        <version>1.7.4-SP.21</version>
         <configuration>
           <systemVariables>
             <com.sun.jersey.server.impl.cdi.lookupExtensionInBeanManager>true</com.sun.jersey.server.impl.cdi.lookupExtensionInBeanManager>
diff --git a/examples/transaction-rollback/pom.xml b/examples/transaction-rollback/pom.xml
index 3b49a14f262..c010702737c 100644
--- a/examples/transaction-rollback/pom.xml
+++ b/examples/transaction-rollback/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/examples/troubleshooting/pom.xml b/examples/troubleshooting/pom.xml
index 4fd25d16cc7..6f1edb2a41b 100644
--- a/examples/troubleshooting/pom.xml
+++ b/examples/troubleshooting/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-core</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/examples/webservice-attachments/pom.xml b/examples/webservice-attachments/pom.xml
index ef02a454164..9847547558c 100644
--- a/examples/webservice-attachments/pom.xml
+++ b/examples/webservice-attachments/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
diff --git a/examples/webservice-handlerchain/pom.xml b/examples/webservice-handlerchain/pom.xml
index bbd0f0c1eaf..cf480bd1f38 100644
--- a/examples/webservice-handlerchain/pom.xml
+++ b/examples/webservice-handlerchain/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
diff --git a/examples/webservice-holder/pom.xml b/examples/webservice-holder/pom.xml
index 6b69221ffc4..389889d9a99 100644
--- a/examples/webservice-holder/pom.xml
+++ b/examples/webservice-holder/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
diff --git a/examples/webservice-inheritance/pom.xml b/examples/webservice-inheritance/pom.xml
index 0e43119fac2..d5c27d62df8 100644
--- a/examples/webservice-inheritance/pom.xml
+++ b/examples/webservice-inheritance/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
diff --git a/examples/webservice-security/pom.xml b/examples/webservice-security/pom.xml
index e6515731716..10aebecdef2 100644
--- a/examples/webservice-security/pom.xml
+++ b/examples/webservice-security/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
diff --git a/examples/webservice-ws-security/pom.xml b/examples/webservice-ws-security/pom.xml
index d396cce1465..f2dea3da5ec 100644
--- a/examples/webservice-ws-security/pom.xml
+++ b/examples/webservice-ws-security/pom.xml
@@ -56,7 +56,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>test</scope>
     </dependency>
     <!-- This is required on IBM JDKs (and potentially others) because saaj-impl depends
diff --git a/examples/webservice-ws-with-resources-config/pom.xml b/examples/webservice-ws-with-resources-config/pom.xml
index f41e260e215..9bc6633bfe7 100644
--- a/examples/webservice-ws-with-resources-config/pom.xml
+++ b/examples/webservice-ws-with-resources-config/pom.xml
@@ -37,7 +37,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-cxf</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/itests/failover-ejb/pom.xml b/itests/failover-ejb/pom.xml
index 2ddb873b02a..523da9b495a 100644
--- a/itests/failover-ejb/pom.xml
+++ b/itests/failover-ejb/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.openejb.itests</groupId>
diff --git a/itests/failover/pom.xml b/itests/failover/pom.xml
index bb251be1625..76acf5e47fc 100644
--- a/itests/failover/pom.xml
+++ b/itests/failover/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.openejb.itests</groupId>
@@ -65,7 +65,7 @@
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>arquillian-tomee-common</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
     </dependency>
     <dependency>
       <groupId>org.apache.openejb</groupId>
diff --git a/itests/legacy-client/pom.xml b/itests/legacy-client/pom.xml
index 30a88b8a3bd..8c843df3bad 100644
--- a/itests/legacy-client/pom.xml
+++ b/itests/legacy-client/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/itests/legacy-server/pom.xml b/itests/legacy-server/pom.xml
index d888bb9f709..196dfadc62f 100644
--- a/itests/legacy-server/pom.xml
+++ b/itests/legacy-server/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/itests/openejb-itests-app/pom.xml b/itests/openejb-itests-app/pom.xml
index 8951282b6e0..2afae23ed05 100644
--- a/itests/openejb-itests-app/pom.xml
+++ b/itests/openejb-itests-app/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-itests-app</artifactId>
diff --git a/itests/openejb-itests-beans/pom.xml b/itests/openejb-itests-beans/pom.xml
index 5625b3fcfe4..eafd4739d5d 100644
--- a/itests/openejb-itests-beans/pom.xml
+++ b/itests/openejb-itests-beans/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/itests/openejb-itests-client/pom.xml b/itests/openejb-itests-client/pom.xml
index 8667e4d2c90..9d64329f4c6 100644
--- a/itests/openejb-itests-client/pom.xml
+++ b/itests/openejb-itests-client/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-itests-client</artifactId>
diff --git a/itests/openejb-itests-interceptor-beans/pom.xml b/itests/openejb-itests-interceptor-beans/pom.xml
index 3816174a17e..b4682619aae 100644
--- a/itests/openejb-itests-interceptor-beans/pom.xml
+++ b/itests/openejb-itests-interceptor-beans/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.openejb</groupId>
     <artifactId>itests</artifactId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <artifactId>openejb-itests-interceptor-beans</artifactId>
diff --git a/itests/openejb-itests-servlets/pom.xml b/itests/openejb-itests-servlets/pom.xml
index 30a7004bc8f..faf987792f0 100644
--- a/itests/openejb-itests-servlets/pom.xml
+++ b/itests/openejb-itests-servlets/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-itests-servlets</artifactId>
diff --git a/itests/openejb-itests-web/pom.xml b/itests/openejb-itests-web/pom.xml
index 22e6bdf457b..c4696d6a410 100644
--- a/itests/openejb-itests-web/pom.xml
+++ b/itests/openejb-itests-web/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>itests</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-itests-web</artifactId>
diff --git a/itests/pom.xml b/itests/pom.xml
index c89257a29dd..f4593e82862 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>openejb</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/maven/jarstxt-maven-plugin/pom.xml b/maven/jarstxt-maven-plugin/pom.xml
index f0816f633a2..443bed8bbfb 100644
--- a/maven/jarstxt-maven-plugin/pom.xml
+++ b/maven/jarstxt-maven-plugin/pom.xml
@@ -19,12 +19,12 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.openejb.maven</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>jarstxt-maven-plugin</artifactId>
-  <version>4.7.4-SP.20</version>
+  <version>4.7.4-SP.21</version>
   <packaging>maven-plugin</packaging>
   <name>OpenEJB :: Maven Plugins :: jars.txt Maven Plugin</name>
 
diff --git a/maven/maven-util/pom.xml b/maven/maven-util/pom.xml
index 084f8d1b421..ce975a171ad 100644
--- a/maven/maven-util/pom.xml
+++ b/maven/maven-util/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.openejb.maven</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/maven/openejb-embedded-maven-plugin/pom.xml b/maven/openejb-embedded-maven-plugin/pom.xml
index 988aa84b266..bc16786478b 100644
--- a/maven/openejb-embedded-maven-plugin/pom.xml
+++ b/maven/openejb-embedded-maven-plugin/pom.xml
@@ -20,13 +20,13 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.openejb.maven</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>openejb-embedded-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>4.7.4-SP.20</version>
+  <version>4.7.4-SP.21</version>
   <name>OpenEJB :: Maven Plugins :: OpenEJB Embedded Maven Plugin</name>
 
   <dependencies>
@@ -45,7 +45,7 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>maven-util</artifactId>
-      <version>1.7.4-SP.20</version>
+      <version>1.7.4-SP.21</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/maven/pom.xml b/maven/pom.xml
index 2c68b5122b9..230ab590d14 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -21,11 +21,11 @@
   <parent>
     <artifactId>openejb</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <groupId>org.apache.openejb.maven</groupId>
-  <version>1.7.4-SP.20</version>
+  <version>1.7.4-SP.21</version>
   <artifactId>maven</artifactId>
   <packaging>pom</packaging>
   <name>OpenEJB :: Maven Plugins</name>
diff --git a/maven/tomee-embedded-maven-plugin/pom.xml b/maven/tomee-embedded-maven-plugin/pom.xml
index 14d60a60a1e..6378c303bfd 100644
--- a/maven/tomee-embedded-maven-plugin/pom.xml
+++ b/maven/tomee-embedded-maven-plugin/pom.xml
@@ -22,11 +22,11 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.openejb.maven</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <artifactId>tomee-embedded-maven-plugin</artifactId>
-  <version>1.7.4-SP.20</version>
+  <version>1.7.4-SP.21</version>
   <packaging>maven-plugin</packaging>
   <name>OpenEJB :: Maven Plugins :: TomEE Embedded Maven Plugin</name>
 
diff --git a/maven/tomee-maven-plugin/pom.xml b/maven/tomee-maven-plugin/pom.xml
index fc3cbcb0ab5..d7ffb198410 100644
--- a/maven/tomee-maven-plugin/pom.xml
+++ b/maven/tomee-maven-plugin/pom.xml
@@ -22,11 +22,11 @@
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.openejb.maven</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <artifactId>tomee-maven-plugin</artifactId>
-  <version>1.7.4-SP.20</version>
+  <version>1.7.4-SP.21</version>
   <packaging>maven-plugin</packaging>
   <name>OpenEJB :: Maven Plugins :: TomEE Maven Plugin</name>
 
diff --git a/maven/tomee-webapp-archetype/pom.xml b/maven/tomee-webapp-archetype/pom.xml
index 1ff9b02d01b..7669804eeff 100644
--- a/maven/tomee-webapp-archetype/pom.xml
+++ b/maven/tomee-webapp-archetype/pom.xml
@@ -19,7 +19,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
   <parent>
     <artifactId>maven</artifactId>
     <groupId>org.apache.openejb.maven</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
index 2b90b4e19f0..56c29682714 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
   <artifactId>openejb</artifactId>
   <packaging>pom</packaging>
 
-  <version>4.7.4-SP.20</version>
+  <version>4.7.4-SP.21</version>
 
   <name>Apache OpenEJB</name>
   <description>Apache OpenEJB is an open source, modular, configurable and extendable EJB Container System and EJB
@@ -97,8 +97,8 @@
     <test.complexity.coverage.minimun>0</test.complexity.coverage.minimun>
     <test.branch.coverage.minimun>0</test.branch.coverage.minimun>
     <test.coverage.skip>false</test.coverage.skip>
-    <openejb.version>4.7.4-SP.20</openejb.version>
-    <tomee.version>1.7.4-SP.20</tomee.version>
+    <openejb.version>4.7.4-SP.21</openejb.version>
+    <tomee.version>1.7.4-SP.21</tomee.version>
 
     <openjpa.version>2.4.0</openjpa.version>
     <org.apache.openwebbeans.version>1.2.7</org.apache.openwebbeans.version>
diff --git a/server/openejb-activemq/pom.xml b/server/openejb-activemq/pom.xml
index daaa43c03a5..b8254430c45 100644
--- a/server/openejb-activemq/pom.xml
+++ b/server/openejb-activemq/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-activemq</artifactId>
diff --git a/server/openejb-axis/pom.xml b/server/openejb-axis/pom.xml
index a9f80c72092..b41b7024557 100644
--- a/server/openejb-axis/pom.xml
+++ b/server/openejb-axis/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-axis</artifactId>
diff --git a/server/openejb-bonecp/pom.xml b/server/openejb-bonecp/pom.xml
index d292b526aaf..6a91b410115 100644
--- a/server/openejb-bonecp/pom.xml
+++ b/server/openejb-bonecp/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/openejb-client/pom.xml b/server/openejb-client/pom.xml
index e61115c8a19..ff4f3085579 100644
--- a/server/openejb-client/pom.xml
+++ b/server/openejb-client/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-client</artifactId>
diff --git a/server/openejb-common-cli/pom.xml b/server/openejb-common-cli/pom.xml
index 5f0d18cde45..00eb8135a7d 100644
--- a/server/openejb-common-cli/pom.xml
+++ b/server/openejb-common-cli/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/openejb-cxf-rs/pom.xml b/server/openejb-cxf-rs/pom.xml
index 0d2107f2e04..4984d880bc4 100644
--- a/server/openejb-cxf-rs/pom.xml
+++ b/server/openejb-cxf-rs/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/openejb-cxf-transport/pom.xml b/server/openejb-cxf-transport/pom.xml
index 76e1691b887..924bee6f4b6 100644
--- a/server/openejb-cxf-transport/pom.xml
+++ b/server/openejb-cxf-transport/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/openejb-cxf/pom.xml b/server/openejb-cxf/pom.xml
index 0a320648b9c..08bcda55fe8 100644
--- a/server/openejb-cxf/pom.xml
+++ b/server/openejb-cxf/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-cxf</artifactId>
diff --git a/server/openejb-daemon/pom.xml b/server/openejb-daemon/pom.xml
index 949a3c3fb23..a55e67857fb 100644
--- a/server/openejb-daemon/pom.xml
+++ b/server/openejb-daemon/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-daemon</artifactId>
diff --git a/server/openejb-derbynet/pom.xml b/server/openejb-derbynet/pom.xml
index ea5e97215ee..afcda8d9899 100644
--- a/server/openejb-derbynet/pom.xml
+++ b/server/openejb-derbynet/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-derbynet</artifactId>
diff --git a/server/openejb-ejbd/pom.xml b/server/openejb-ejbd/pom.xml
index 9e9a4cc62f8..9024a3b8600 100644
--- a/server/openejb-ejbd/pom.xml
+++ b/server/openejb-ejbd/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-ejbd</artifactId>
diff --git a/server/openejb-hessian/pom.xml b/server/openejb-hessian/pom.xml
index cb62f07e57f..6bc9a272135 100644
--- a/server/openejb-hessian/pom.xml
+++ b/server/openejb-hessian/pom.xml
@@ -23,7 +23,7 @@ limitations under the License.
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <artifactId>openejb-hessian</artifactId>
@@ -33,7 +33,7 @@ limitations under the License.
     <dependency>
       <groupId>org.apache.openejb</groupId>
       <artifactId>openejb-http</artifactId>
-      <version>4.7.4-SP.20</version>
+      <version>4.7.4-SP.21</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/server/openejb-hsql/pom.xml b/server/openejb-hsql/pom.xml
index 901f51b3ca7..f64f4c5af9b 100644
--- a/server/openejb-hsql/pom.xml
+++ b/server/openejb-hsql/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-hsql</artifactId>
diff --git a/server/openejb-http/pom.xml b/server/openejb-http/pom.xml
index f126c344b45..defbc31f3e5 100644
--- a/server/openejb-http/pom.xml
+++ b/server/openejb-http/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-http</artifactId>
diff --git a/server/openejb-multicast/pom.xml b/server/openejb-multicast/pom.xml
index f5389d7dee3..dd769df8788 100644
--- a/server/openejb-multicast/pom.xml
+++ b/server/openejb-multicast/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-multicast</artifactId>
diff --git a/server/openejb-rest/pom.xml b/server/openejb-rest/pom.xml
index 5049439d0e2..728837d32cf 100644
--- a/server/openejb-rest/pom.xml
+++ b/server/openejb-rest/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/openejb-server/pom.xml b/server/openejb-server/pom.xml
index f822c0d6c2d..6e53a4ffdaf 100644
--- a/server/openejb-server/pom.xml
+++ b/server/openejb-server/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-server</artifactId>
diff --git a/server/openejb-ssh/pom.xml b/server/openejb-ssh/pom.xml
index 9b21ae910ee..98f678a5e6a 100644
--- a/server/openejb-ssh/pom.xml
+++ b/server/openejb-ssh/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/server/openejb-webservices/pom.xml b/server/openejb-webservices/pom.xml
index 6615d4e0645..9e10470883a 100644
--- a/server/openejb-webservices/pom.xml
+++ b/server/openejb-webservices/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openejb-webservices</artifactId>
diff --git a/server/pom.xml b/server/pom.xml
index c604104a702..e1f5c72bcca 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>openejb</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>server</artifactId>
diff --git a/tck/bval-embedded/pom.xml b/tck/bval-embedded/pom.xml
index 74f425f16b8..1c3240732ae 100644
--- a/tck/bval-embedded/pom.xml
+++ b/tck/bval-embedded/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tck/bval-tomee/pom.xml b/tck/bval-tomee/pom.xml
index 01011c8e924..2c4d38865b9 100644
--- a/tck/bval-tomee/pom.xml
+++ b/tck/bval-tomee/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tck/cdi-embedded/pom.xml b/tck/cdi-embedded/pom.xml
index 308fa3473dc..76e558cdc2e 100644
--- a/tck/cdi-embedded/pom.xml
+++ b/tck/cdi-embedded/pom.xml
@@ -19,13 +19,13 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdi-embedded</artifactId>
   <packaging>jar</packaging>
   <name>OpenEJB :: TCK :: CDI Embedded</name>
-  <version>1.7.4-SP.20</version>
+  <version>1.7.4-SP.21</version>
 
   <dependencies>
     <dependency>
diff --git a/tck/cdi-tomee-embedded/pom.xml b/tck/cdi-tomee-embedded/pom.xml
index 2bf28c6f3bf..9ce40c5c253 100644
--- a/tck/cdi-tomee-embedded/pom.xml
+++ b/tck/cdi-tomee-embedded/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdi-tomee-embedded</artifactId>
diff --git a/tck/cdi-tomee/pom.xml b/tck/cdi-tomee/pom.xml
index 7f4171c2137..27571846224 100644
--- a/tck/cdi-tomee/pom.xml
+++ b/tck/cdi-tomee/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdi-tomee</artifactId>
diff --git a/tck/pom.xml b/tck/pom.xml
index fc9fb5c4fb0..d790ff381d4 100644
--- a/tck/pom.xml
+++ b/tck/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>openejb</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tck</artifactId>
diff --git a/tck/tck-common/pom.xml b/tck/tck-common/pom.xml
index b99c6406c98..cefef0130f5 100644
--- a/tck/tck-common/pom.xml
+++ b/tck/tck-common/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <artifactId>tck</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tck-common</artifactId>
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index d507545b855..b682cb83c3d 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/pom.xml b/tomee/pom.xml
index e4eb47f6c95..3cdf058c074 100644
--- a/tomee/pom.xml
+++ b/tomee/pom.xml
@@ -23,17 +23,17 @@
   <parent>
     <artifactId>openejb</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tomee</artifactId>
-  <version>1.7.4-SP.20</version>
+  <version>1.7.4-SP.21</version>
   <packaging>pom</packaging>
   <name>OpenEJB :: TomEE</name>
 
   <properties>
-    <version.openejb>4.7.4-SP.20</version.openejb>
+    <version.openejb>4.7.4-SP.21</version.openejb>
   </properties>
 
   <modules>
diff --git a/tomee/tomee-catalina/pom.xml b/tomee/tomee-catalina/pom.xml
index 9f3cfd6844d..93cd0ab9de2 100644
--- a/tomee/tomee-catalina/pom.xml
+++ b/tomee/tomee-catalina/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-common/pom.xml b/tomee/tomee-common/pom.xml
index d5b379a6013..e53a79d74ea 100644
--- a/tomee/tomee-common/pom.xml
+++ b/tomee/tomee-common/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tomee-common</artifactId>
diff --git a/tomee/tomee-embedded/pom.xml b/tomee/tomee-embedded/pom.xml
index 86fadc715b5..708b77e3886 100644
--- a/tomee/tomee-embedded/pom.xml
+++ b/tomee/tomee-embedded/pom.xml
@@ -24,14 +24,14 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tomee-embedded</artifactId>
   <packaging>jar</packaging>
   <name>OpenEJB :: TomEE :: TomEE Embedded</name>
-  <version>1.7.4-SP.20</version>
+  <version>1.7.4-SP.21</version>
 
   <build>
     <plugins>
diff --git a/tomee/tomee-jaxrs-webapp/pom.xml b/tomee/tomee-jaxrs-webapp/pom.xml
index 77ebae4418d..86026b78419 100644
--- a/tomee/tomee-jaxrs-webapp/pom.xml
+++ b/tomee/tomee-jaxrs-webapp/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tomee/tomee-jaxrs/pom.xml b/tomee/tomee-jaxrs/pom.xml
index 828ce44f321..da4efa98b95 100644
--- a/tomee/tomee-jaxrs/pom.xml
+++ b/tomee/tomee-jaxrs/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tomee/tomee-jdbc/pom.xml b/tomee/tomee-jdbc/pom.xml
index 873a3120174..ba28a5ee0ba 100644
--- a/tomee/tomee-jdbc/pom.xml
+++ b/tomee/tomee-jdbc/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tomee/tomee-juli/pom.xml b/tomee/tomee-juli/pom.xml
index c6996c473c8..8a6a8583f07 100644
--- a/tomee/tomee-juli/pom.xml
+++ b/tomee/tomee-juli/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-loader/pom.xml b/tomee/tomee-loader/pom.xml
index cb6c1ad0e1c..e01c9eb3587 100644
--- a/tomee/tomee-loader/pom.xml
+++ b/tomee/tomee-loader/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-mojarra/pom.xml b/tomee/tomee-mojarra/pom.xml
index 2f084d0c2a5..707973192f7 100644
--- a/tomee/tomee-mojarra/pom.xml
+++ b/tomee/tomee-mojarra/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-myfaces/pom.xml b/tomee/tomee-myfaces/pom.xml
index 31d64691bf5..e399014bab1 100644
--- a/tomee/tomee-myfaces/pom.xml
+++ b/tomee/tomee-myfaces/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tomee/tomee-overlay-runner/pom.xml b/tomee/tomee-overlay-runner/pom.xml
index d00594abdd6..f06155a7a4f 100644
--- a/tomee/tomee-overlay-runner/pom.xml
+++ b/tomee/tomee-overlay-runner/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index 104d36fbfb5..04477cb1d1f 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index 6d7ffef9e44..c4b79d25f08 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/tomee/tomee-util/pom.xml b/tomee/tomee-util/pom.xml
index e023db07689..2eed3f5eabc 100644
--- a/tomee/tomee-util/pom.xml
+++ b/tomee/tomee-util/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/tomee/tomee-webaccess/pom.xml b/tomee/tomee-webaccess/pom.xml
index 8fd0fde4d58..82af8afce6b 100644
--- a/tomee/tomee-webaccess/pom.xml
+++ b/tomee/tomee-webaccess/pom.xml
@@ -17,7 +17,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <artifactId>tomee-webaccess</artifactId>
   <packaging>war</packaging>
diff --git a/tomee/tomee-webapp/pom.xml b/tomee/tomee-webapp/pom.xml
index 605938fb246..8a7c433333a 100644
--- a/tomee/tomee-webapp/pom.xml
+++ b/tomee/tomee-webapp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tomee-webapp</artifactId>
diff --git a/tomee/tomee-webservices/pom.xml b/tomee/tomee-webservices/pom.xml
index a3345a3fa4a..161dae01454 100644
--- a/tomee/tomee-webservices/pom.xml
+++ b/tomee/tomee-webservices/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>tomee</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>1.7.4-SP.20</version>
+    <version>1.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>tomee-webservices</artifactId>
diff --git a/utils/openejb-core-eclipselink/pom.xml b/utils/openejb-core-eclipselink/pom.xml
index 4afc77400d2..7072b7b8194 100644
--- a/utils/openejb-core-eclipselink/pom.xml
+++ b/utils/openejb-core-eclipselink/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>utils</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/utils/openejb-core-hibernate/pom.xml b/utils/openejb-core-hibernate/pom.xml
index b3bc16392db..a801ded92b9 100644
--- a/utils/openejb-core-hibernate/pom.xml
+++ b/utils/openejb-core-hibernate/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>utils</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/utils/openejb-mockito/pom.xml b/utils/openejb-mockito/pom.xml
index 82f26c2e188..de9b1514957 100644
--- a/utils/openejb-mockito/pom.xml
+++ b/utils/openejb-mockito/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>utils</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/utils/openejb-provisionning/pom.xml b/utils/openejb-provisionning/pom.xml
index 41c280d4219..3d6ddc3e5ff 100644
--- a/utils/openejb-provisionning/pom.xml
+++ b/utils/openejb-provisionning/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>utils</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/utils/pom.xml b/utils/pom.xml
index e621e4fe337..71fb051f5a9 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>openejb</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>utils</artifactId>
diff --git a/utils/webdeployer/pom.xml b/utils/webdeployer/pom.xml
index 1f505a0e897..25b25f50e3a 100644
--- a/utils/webdeployer/pom.xml
+++ b/utils/webdeployer/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <artifactId>utils</artifactId>
     <groupId>org.apache.openejb</groupId>
-    <version>4.7.4-SP.20</version>
+    <version>4.7.4-SP.21</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>