diff --git a/examples/jms/aerogear/pom.xml b/examples/jms/aerogear/pom.xml
index 975067ef6e..14063b5347 100644
--- a/examples/jms/aerogear/pom.xml
+++ b/examples/jms/aerogear/pom.xml
@@ -138,9 +138,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/applet/pom.xml b/examples/jms/applet/pom.xml
index cd7955b207..f9564e3334 100644
--- a/examples/jms/applet/pom.xml
+++ b/examples/jms/applet/pom.xml
@@ -123,9 +123,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/application-layer-failover/pom.xml b/examples/jms/application-layer-failover/pom.xml
index 00c17fa9fc..0f24886286 100644
--- a/examples/jms/application-layer-failover/pom.xml
+++ b/examples/jms/application-layer-failover/pom.xml
@@ -140,9 +140,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/bridge/pom.xml b/examples/jms/bridge/pom.xml
index d9c95329ab..de646b5277 100644
--- a/examples/jms/bridge/pom.xml
+++ b/examples/jms/bridge/pom.xml
@@ -146,9 +146,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/browser/pom.xml b/examples/jms/browser/pom.xml
index 68a528044d..dff0859d98 100644
--- a/examples/jms/browser/pom.xml
+++ b/examples/jms/browser/pom.xml
@@ -107,9 +107,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/client-kickoff/pom.xml b/examples/jms/client-kickoff/pom.xml
index 789a18dd07..82c93aaefb 100644
--- a/examples/jms/client-kickoff/pom.xml
+++ b/examples/jms/client-kickoff/pom.xml
@@ -138,9 +138,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/client-side-failoverlistener/pom.xml b/examples/jms/client-side-failoverlistener/pom.xml
index 6eb308aa7a..1a40cbed07 100644
--- a/examples/jms/client-side-failoverlistener/pom.xml
+++ b/examples/jms/client-side-failoverlistener/pom.xml
@@ -156,9 +156,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/client-side-load-balancing/pom.xml b/examples/jms/client-side-load-balancing/pom.xml
index b45545d3ff..9cda539ee8 100644
--- a/examples/jms/client-side-load-balancing/pom.xml
+++ b/examples/jms/client-side-load-balancing/pom.xml
@@ -176,9 +176,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/clustered-durable-subscription/pom.xml b/examples/jms/clustered-durable-subscription/pom.xml
index b363b0b5be..78cbb07955 100644
--- a/examples/jms/clustered-durable-subscription/pom.xml
+++ b/examples/jms/clustered-durable-subscription/pom.xml
@@ -151,9 +151,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/clustered-grouping/pom.xml b/examples/jms/clustered-grouping/pom.xml
index d543cc39fd..d7a3f74b2a 100644
--- a/examples/jms/clustered-grouping/pom.xml
+++ b/examples/jms/clustered-grouping/pom.xml
@@ -189,9 +189,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/clustered-jgroups/pom.xml b/examples/jms/clustered-jgroups/pom.xml
index 07b417b303..cad1d0fb4a 100644
--- a/examples/jms/clustered-jgroups/pom.xml
+++ b/examples/jms/clustered-jgroups/pom.xml
@@ -149,9 +149,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/clustered-queue/pom.xml b/examples/jms/clustered-queue/pom.xml
index 50873d8db9..d88f681da2 100644
--- a/examples/jms/clustered-queue/pom.xml
+++ b/examples/jms/clustered-queue/pom.xml
@@ -145,9 +145,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/clustered-standalone/pom.xml b/examples/jms/clustered-standalone/pom.xml
index 3103db55d8..07a06eab28 100644
--- a/examples/jms/clustered-standalone/pom.xml
+++ b/examples/jms/clustered-standalone/pom.xml
@@ -177,9 +177,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
          </plugin>
diff --git a/examples/jms/clustered-static-discovery/pom.xml b/examples/jms/clustered-static-discovery/pom.xml
index ea110dccff..e8cfb0abb0 100644
--- a/examples/jms/clustered-static-discovery/pom.xml
+++ b/examples/jms/clustered-static-discovery/pom.xml
@@ -179,9 +179,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/clustered-static-oneway/pom.xml b/examples/jms/clustered-static-oneway/pom.xml
index ab2352d004..e2ff59c4c7 100644
--- a/examples/jms/clustered-static-oneway/pom.xml
+++ b/examples/jms/clustered-static-oneway/pom.xml
@@ -159,9 +159,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/clustered-topic/pom.xml b/examples/jms/clustered-topic/pom.xml
index 6a4084ec72..f4adfcda37 100644
--- a/examples/jms/clustered-topic/pom.xml
+++ b/examples/jms/clustered-topic/pom.xml
@@ -159,9 +159,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/colocated-failover-scale-down/pom.xml b/examples/jms/colocated-failover-scale-down/pom.xml
index 98750df76a..4b2fb8d6b1 100644
--- a/examples/jms/colocated-failover-scale-down/pom.xml
+++ b/examples/jms/colocated-failover-scale-down/pom.xml
@@ -151,9 +151,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/colocated-failover/pom.xml b/examples/jms/colocated-failover/pom.xml
index 8b55198e43..80fe7bdeaf 100644
--- a/examples/jms/colocated-failover/pom.xml
+++ b/examples/jms/colocated-failover/pom.xml
@@ -151,9 +151,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/consumer-rate-limit/pom.xml b/examples/jms/consumer-rate-limit/pom.xml
index 75c654c324..bf1d928715 100644
--- a/examples/jms/consumer-rate-limit/pom.xml
+++ b/examples/jms/consumer-rate-limit/pom.xml
@@ -115,9 +115,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/dead-letter/pom.xml b/examples/jms/dead-letter/pom.xml
index 6938ca47ea..c831b6b8b6 100644
--- a/examples/jms/dead-letter/pom.xml
+++ b/examples/jms/dead-letter/pom.xml
@@ -115,9 +115,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/delayed-redelivery/pom.xml b/examples/jms/delayed-redelivery/pom.xml
index 609038987e..bbbdcf8c38 100644
--- a/examples/jms/delayed-redelivery/pom.xml
+++ b/examples/jms/delayed-redelivery/pom.xml
@@ -107,9 +107,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/divert/pom.xml b/examples/jms/divert/pom.xml
index a6d655c57e..6058585db1 100644
--- a/examples/jms/divert/pom.xml
+++ b/examples/jms/divert/pom.xml
@@ -144,9 +144,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/durable-subscription/pom.xml b/examples/jms/durable-subscription/pom.xml
index 91e0c8d554..f47116b4f5 100644
--- a/examples/jms/durable-subscription/pom.xml
+++ b/examples/jms/durable-subscription/pom.xml
@@ -115,9 +115,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/embedded-simple/pom.xml b/examples/jms/embedded-simple/pom.xml
index 6b44401b75..5cac971c3c 100644
--- a/examples/jms/embedded-simple/pom.xml
+++ b/examples/jms/embedded-simple/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/embedded/pom.xml b/examples/jms/embedded/pom.xml
index 49b8bfc718..24dcabb04d 100644
--- a/examples/jms/embedded/pom.xml
+++ b/examples/jms/embedded/pom.xml
@@ -116,9 +116,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
          </plugin>
diff --git a/examples/jms/expiry/pom.xml b/examples/jms/expiry/pom.xml
index d8a92b1a81..5e65867a34 100644
--- a/examples/jms/expiry/pom.xml
+++ b/examples/jms/expiry/pom.xml
@@ -115,9 +115,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/ha-policy-autobackup/pom.xml b/examples/jms/ha-policy-autobackup/pom.xml
index e2d4d97414..369002279d 100644
--- a/examples/jms/ha-policy-autobackup/pom.xml
+++ b/examples/jms/ha-policy-autobackup/pom.xml
@@ -153,9 +153,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/http-transport/pom.xml b/examples/jms/http-transport/pom.xml
index 180f49bc38..0d77308695 100644
--- a/examples/jms/http-transport/pom.xml
+++ b/examples/jms/http-transport/pom.xml
@@ -115,9 +115,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/instantiate-connection-factory/pom.xml b/examples/jms/instantiate-connection-factory/pom.xml
index 63c0a00d56..d23099e9bd 100644
--- a/examples/jms/instantiate-connection-factory/pom.xml
+++ b/examples/jms/instantiate-connection-factory/pom.xml
@@ -125,9 +125,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/interceptor/pom.xml b/examples/jms/interceptor/pom.xml
index 8c518d46ef..75cd2a6dd2 100644
--- a/examples/jms/interceptor/pom.xml
+++ b/examples/jms/interceptor/pom.xml
@@ -120,9 +120,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/jaas/pom.xml b/examples/jms/jaas/pom.xml
index df52a156a1..e86300c037 100644
--- a/examples/jms/jaas/pom.xml
+++ b/examples/jms/jaas/pom.xml
@@ -137,9 +137,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/jms-auto-closeable/pom.xml b/examples/jms/jms-auto-closeable/pom.xml
index 6cf20c6c4f..40444dc384 100644
--- a/examples/jms/jms-auto-closeable/pom.xml
+++ b/examples/jms/jms-auto-closeable/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/jms-bridge/pom.xml b/examples/jms/jms-bridge/pom.xml
index 4c7c637c16..adcb8812ed 100644
--- a/examples/jms/jms-bridge/pom.xml
+++ b/examples/jms/jms-bridge/pom.xml
@@ -148,9 +148,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/jms-completion-listener/pom.xml b/examples/jms/jms-completion-listener/pom.xml
index 503e16ba07..9af42ca2c0 100644
--- a/examples/jms/jms-completion-listener/pom.xml
+++ b/examples/jms/jms-completion-listener/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/jms-context/pom.xml b/examples/jms/jms-context/pom.xml
index 91b7ad37f4..606d02924d 100644
--- a/examples/jms/jms-context/pom.xml
+++ b/examples/jms/jms-context/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/jms-shared-consumer/pom.xml b/examples/jms/jms-shared-consumer/pom.xml
index ab55054ec8..593791bfd1 100644
--- a/examples/jms/jms-shared-consumer/pom.xml
+++ b/examples/jms/jms-shared-consumer/pom.xml
@@ -115,9 +115,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/jmx/pom.xml b/examples/jms/jmx/pom.xml
index 959f3f0e31..0b3e85f64f 100644
--- a/examples/jms/jmx/pom.xml
+++ b/examples/jms/jmx/pom.xml
@@ -140,9 +140,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/large-message/pom.xml b/examples/jms/large-message/pom.xml
index 59915bbe20..04a1e12ffc 100644
--- a/examples/jms/large-message/pom.xml
+++ b/examples/jms/large-message/pom.xml
@@ -118,9 +118,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/last-value-queue/pom.xml b/examples/jms/last-value-queue/pom.xml
index f107fcccb6..5f71ef4691 100644
--- a/examples/jms/last-value-queue/pom.xml
+++ b/examples/jms/last-value-queue/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/management-notifications/pom.xml b/examples/jms/management-notifications/pom.xml
index cbbfcf7117..b3cb3f2af8 100644
--- a/examples/jms/management-notifications/pom.xml
+++ b/examples/jms/management-notifications/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/management/pom.xml b/examples/jms/management/pom.xml
index 570a98371a..b1c1ec5e9e 100644
--- a/examples/jms/management/pom.xml
+++ b/examples/jms/management/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/message-counters/pom.xml b/examples/jms/message-counters/pom.xml
index bef0960fd5..2457cdad75 100644
--- a/examples/jms/message-counters/pom.xml
+++ b/examples/jms/message-counters/pom.xml
@@ -135,9 +135,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/message-group/pom.xml b/examples/jms/message-group/pom.xml
index 08207d0c7c..f1f65d234e 100644
--- a/examples/jms/message-group/pom.xml
+++ b/examples/jms/message-group/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/message-group2/pom.xml b/examples/jms/message-group2/pom.xml
index 99912eb0c9..53724fbeda 100644
--- a/examples/jms/message-group2/pom.xml
+++ b/examples/jms/message-group2/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/message-priority/pom.xml b/examples/jms/message-priority/pom.xml
index 3ef9a3cfbe..d086fa5ce6 100644
--- a/examples/jms/message-priority/pom.xml
+++ b/examples/jms/message-priority/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/multiple-failover-failback/pom.xml b/examples/jms/multiple-failover-failback/pom.xml
index 13b763005a..afc3214e8f 100644
--- a/examples/jms/multiple-failover-failback/pom.xml
+++ b/examples/jms/multiple-failover-failback/pom.xml
@@ -184,9 +184,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/multiple-failover/pom.xml b/examples/jms/multiple-failover/pom.xml
index cb1fe2fb0f..ffb10b72e6 100644
--- a/examples/jms/multiple-failover/pom.xml
+++ b/examples/jms/multiple-failover/pom.xml
@@ -184,9 +184,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/no-consumer-buffering/pom.xml b/examples/jms/no-consumer-buffering/pom.xml
index bc4d616d1a..e102b4b1b7 100644
--- a/examples/jms/no-consumer-buffering/pom.xml
+++ b/examples/jms/no-consumer-buffering/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/non-transaction-failover/pom.xml b/examples/jms/non-transaction-failover/pom.xml
index a646afbb0d..fe594242db 100644
--- a/examples/jms/non-transaction-failover/pom.xml
+++ b/examples/jms/non-transaction-failover/pom.xml
@@ -155,9 +155,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/openwire/pom.xml b/examples/jms/openwire/pom.xml
index c44421a9da..cb23b70760 100644
--- a/examples/jms/openwire/pom.xml
+++ b/examples/jms/openwire/pom.xml
@@ -121,9 +121,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/paging/pom.xml b/examples/jms/paging/pom.xml
index 7146895287..53ffaefd0a 100644
--- a/examples/jms/paging/pom.xml
+++ b/examples/jms/paging/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/pom.xml b/examples/jms/pom.xml
index 1c2f4470ea..d5efa761ad 100644
--- a/examples/jms/pom.xml
+++ b/examples/jms/pom.xml
@@ -35,6 +35,7 @@ under the License.
 
    <properties>
       <udp-address>231.7.7.7</udp-address>
+      <geronimo.jms.2.spec.version>1.0.0-SNAPSHOT</geronimo.jms.2.spec.version>
    </properties>
 
    <profiles>
diff --git a/examples/jms/pre-acknowledge/pom.xml b/examples/jms/pre-acknowledge/pom.xml
index 61ecf91ba8..babd14dc1c 100644
--- a/examples/jms/pre-acknowledge/pom.xml
+++ b/examples/jms/pre-acknowledge/pom.xml
@@ -115,9 +115,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/producer-rate-limit/pom.xml b/examples/jms/producer-rate-limit/pom.xml
index 8e1b2163eb..3477faf7b1 100644
--- a/examples/jms/producer-rate-limit/pom.xml
+++ b/examples/jms/producer-rate-limit/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/proton-j/pom.xml b/examples/jms/proton-j/pom.xml
index a25c1dc452..73584c35d4 100644
--- a/examples/jms/proton-j/pom.xml
+++ b/examples/jms/proton-j/pom.xml
@@ -121,9 +121,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/proton-ruby/pom.xml b/examples/jms/proton-ruby/pom.xml
index 5e7891a05b..e1a457a0ec 100644
--- a/examples/jms/proton-ruby/pom.xml
+++ b/examples/jms/proton-ruby/pom.xml
@@ -99,9 +99,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/queue-message-redistribution/pom.xml b/examples/jms/queue-message-redistribution/pom.xml
index 2a3c2442a0..3ccbc29caa 100644
--- a/examples/jms/queue-message-redistribution/pom.xml
+++ b/examples/jms/queue-message-redistribution/pom.xml
@@ -159,9 +159,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/queue-requestor/pom.xml b/examples/jms/queue-requestor/pom.xml
index 67eebd78f4..25f84a90f2 100644
--- a/examples/jms/queue-requestor/pom.xml
+++ b/examples/jms/queue-requestor/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/queue-selector/pom.xml b/examples/jms/queue-selector/pom.xml
index 5d6dac8de0..bc058cd07d 100644
--- a/examples/jms/queue-selector/pom.xml
+++ b/examples/jms/queue-selector/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/queue/pom.xml b/examples/jms/queue/pom.xml
index 55e82978e5..a90df43274 100644
--- a/examples/jms/queue/pom.xml
+++ b/examples/jms/queue/pom.xml
@@ -113,9 +113,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/reattach-node/pom.xml b/examples/jms/reattach-node/pom.xml
index cd96592c01..641d016373 100644
--- a/examples/jms/reattach-node/pom.xml
+++ b/examples/jms/reattach-node/pom.xml
@@ -116,9 +116,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/replicated-failback-static/pom.xml b/examples/jms/replicated-failback-static/pom.xml
index d728a22ab1..ae9699c761 100644
--- a/examples/jms/replicated-failback-static/pom.xml
+++ b/examples/jms/replicated-failback-static/pom.xml
@@ -155,9 +155,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/replicated-failback/pom.xml b/examples/jms/replicated-failback/pom.xml
index 0c4509c3bc..b4567eb3ab 100644
--- a/examples/jms/replicated-failback/pom.xml
+++ b/examples/jms/replicated-failback/pom.xml
@@ -155,9 +155,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/replicated-multiple-failover/pom.xml b/examples/jms/replicated-multiple-failover/pom.xml
index bf79461dbe..33eaf9b3d4 100644
--- a/examples/jms/replicated-multiple-failover/pom.xml
+++ b/examples/jms/replicated-multiple-failover/pom.xml
@@ -184,9 +184,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/replicated-transaction-failover/pom.xml b/examples/jms/replicated-transaction-failover/pom.xml
index cb61f3ef57..7ff6fa6654 100644
--- a/examples/jms/replicated-transaction-failover/pom.xml
+++ b/examples/jms/replicated-transaction-failover/pom.xml
@@ -155,9 +155,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/request-reply/pom.xml b/examples/jms/request-reply/pom.xml
index 2d521a3b7c..f319775e77 100644
--- a/examples/jms/request-reply/pom.xml
+++ b/examples/jms/request-reply/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/scale-down/pom.xml b/examples/jms/scale-down/pom.xml
index f1539dcd37..394964e6df 100644
--- a/examples/jms/scale-down/pom.xml
+++ b/examples/jms/scale-down/pom.xml
@@ -147,9 +147,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/scheduled-message/pom.xml b/examples/jms/scheduled-message/pom.xml
index a96247a806..977188cf72 100644
--- a/examples/jms/scheduled-message/pom.xml
+++ b/examples/jms/scheduled-message/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/security/pom.xml b/examples/jms/security/pom.xml
index 6a20ffed54..c98a955cf0 100644
--- a/examples/jms/security/pom.xml
+++ b/examples/jms/security/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/send-acknowledgements/pom.xml b/examples/jms/send-acknowledgements/pom.xml
index 7417c6a35b..661ef2d848 100644
--- a/examples/jms/send-acknowledgements/pom.xml
+++ b/examples/jms/send-acknowledgements/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/spring-integration/pom.xml b/examples/jms/spring-integration/pom.xml
index d4bd75348d..d09bd7f818 100644
--- a/examples/jms/spring-integration/pom.xml
+++ b/examples/jms/spring-integration/pom.xml
@@ -101,9 +101,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/ssl-enabled/pom.xml b/examples/jms/ssl-enabled/pom.xml
index 595ad84cc0..14f3a710be 100644
--- a/examples/jms/ssl-enabled/pom.xml
+++ b/examples/jms/ssl-enabled/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/static-selector-jms/pom.xml b/examples/jms/static-selector-jms/pom.xml
index 8edb306cd9..64a5b97c21 100644
--- a/examples/jms/static-selector-jms/pom.xml
+++ b/examples/jms/static-selector-jms/pom.xml
@@ -115,9 +115,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/static-selector/pom.xml b/examples/jms/static-selector/pom.xml
index 5dc7b29968..601aa68f77 100644
--- a/examples/jms/static-selector/pom.xml
+++ b/examples/jms/static-selector/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/stomp-websockets/pom.xml b/examples/jms/stomp-websockets/pom.xml
index 91016d3232..d27809e619 100644
--- a/examples/jms/stomp-websockets/pom.xml
+++ b/examples/jms/stomp-websockets/pom.xml
@@ -124,9 +124,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/stomp/pom.xml b/examples/jms/stomp/pom.xml
index 970102682b..eedd120ee6 100644
--- a/examples/jms/stomp/pom.xml
+++ b/examples/jms/stomp/pom.xml
@@ -117,9 +117,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/stomp1.1/pom.xml b/examples/jms/stomp1.1/pom.xml
index caf0cef589..aa1275d150 100644
--- a/examples/jms/stomp1.1/pom.xml
+++ b/examples/jms/stomp1.1/pom.xml
@@ -117,9 +117,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/stomp1.2/pom.xml b/examples/jms/stomp1.2/pom.xml
index a32408f190..34e6400fc0 100644
--- a/examples/jms/stomp1.2/pom.xml
+++ b/examples/jms/stomp1.2/pom.xml
@@ -117,9 +117,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/stop-server-failover/pom.xml b/examples/jms/stop-server-failover/pom.xml
index 1c7d23922a..e35869ad16 100644
--- a/examples/jms/stop-server-failover/pom.xml
+++ b/examples/jms/stop-server-failover/pom.xml
@@ -161,9 +161,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/symmetric-cluster/pom.xml b/examples/jms/symmetric-cluster/pom.xml
index 4c2c39beaa..9b994aece9 100644
--- a/examples/jms/symmetric-cluster/pom.xml
+++ b/examples/jms/symmetric-cluster/pom.xml
@@ -289,9 +289,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/temp-queue/pom.xml b/examples/jms/temp-queue/pom.xml
index 713b9d846e..47f664de15 100644
--- a/examples/jms/temp-queue/pom.xml
+++ b/examples/jms/temp-queue/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/topic-hierarchies/pom.xml b/examples/jms/topic-hierarchies/pom.xml
index 20cfd3953d..ffcbfb7cdd 100644
--- a/examples/jms/topic-hierarchies/pom.xml
+++ b/examples/jms/topic-hierarchies/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/topic-selector-example1/pom.xml b/examples/jms/topic-selector-example1/pom.xml
index 091ecf7ae4..250719f9bb 100644
--- a/examples/jms/topic-selector-example1/pom.xml
+++ b/examples/jms/topic-selector-example1/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/topic-selector-example2/pom.xml b/examples/jms/topic-selector-example2/pom.xml
index c0db996b37..c6c5c12b0f 100644
--- a/examples/jms/topic-selector-example2/pom.xml
+++ b/examples/jms/topic-selector-example2/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/topic/pom.xml b/examples/jms/topic/pom.xml
index 068207d932..0415b581f6 100644
--- a/examples/jms/topic/pom.xml
+++ b/examples/jms/topic/pom.xml
@@ -115,9 +115,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/transaction-failover/pom.xml b/examples/jms/transaction-failover/pom.xml
index d2e7ec4780..5cdfe78281 100644
--- a/examples/jms/transaction-failover/pom.xml
+++ b/examples/jms/transaction-failover/pom.xml
@@ -155,9 +155,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/transactional/pom.xml b/examples/jms/transactional/pom.xml
index 914e3a31be..d8ecd8ee41 100644
--- a/examples/jms/transactional/pom.xml
+++ b/examples/jms/transactional/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/xa-heuristic/pom.xml b/examples/jms/xa-heuristic/pom.xml
index 9d58c4f1f9..5079f786cd 100644
--- a/examples/jms/xa-heuristic/pom.xml
+++ b/examples/jms/xa-heuristic/pom.xml
@@ -135,9 +135,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/xa-receive/pom.xml b/examples/jms/xa-receive/pom.xml
index 5deebb0fa0..264f1c3136 100644
--- a/examples/jms/xa-receive/pom.xml
+++ b/examples/jms/xa-receive/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/xa-send/pom.xml b/examples/jms/xa-send/pom.xml
index 7bed98853a..76142804db 100644
--- a/examples/jms/xa-send/pom.xml
+++ b/examples/jms/xa-send/pom.xml
@@ -112,9 +112,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>
diff --git a/examples/jms/xa-with-jta/pom.xml b/examples/jms/xa-with-jta/pom.xml
index d4aa21aa8c..defdc9f575 100644
--- a/examples/jms/xa-with-jta/pom.xml
+++ b/examples/jms/xa-with-jta/pom.xml
@@ -126,9 +126,9 @@ under the License.
                   <version>${netty.version}</version>
                </dependency>
                <dependency>
-                  <groupId>org.jboss.javaee</groupId>
-                  <artifactId>jboss-jms-api</artifactId>
-                  <version>1.1.0.GA</version>
+                  <groupId>org.apache.geronimo.specs</groupId>
+                  <artifactId>geronimo-jms_2.0_spec</artifactId>
+                  <version>${geronimo.jms.2.spec.version}</version>
                </dependency>
             </dependencies>
             <configuration>