From 020d7a4149bcdf941320d891c06607299c67a9ad Mon Sep 17 00:00:00 2001
From: Martyn Taylor <mtaylor@redhat.com>
Date: Mon, 16 Mar 2015 12:07:10 +0000
Subject: [PATCH] Replace jboss-annotations with geronimo equivilent

Adds in the Geronimo 1.1 Annotation spec jar as a replacement for the
jboss annotation spec jar, pulled in via Rest Easy.  Also cleans up
dependency exclusions, removing them from sub modules and added to the
dependency management section of the main pom.
---
 activemq-rest/pom.xml                         | 34 +--------------
 .../test/PersistentPushQueueConsumerTest.java |  2 +-
 examples/jms/rest/dup-send/pom.xml            | 12 ------
 examples/jms/rest/javascript-chat/pom.xml     | 14 ------
 examples/jms/rest/jms-to-rest/pom.xml         | 12 ------
 examples/jms/rest/push/pom.xml                | 12 ------
 pom.xml                                       | 43 +++++++++++++++++++
 7 files changed, 46 insertions(+), 83 deletions(-)

diff --git a/activemq-rest/pom.xml b/activemq-rest/pom.xml
index ae069e1104..b966f46515 100644
--- a/activemq-rest/pom.xml
+++ b/activemq-rest/pom.xml
@@ -49,21 +49,11 @@
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxrs</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.jboss.spec.javax.annotation</groupId>
-               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-            </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxb-provider</artifactId>
          <exclusions>
-            <exclusion>
-               <groupId>org.jboss.spec.javax.annotation</groupId>
-               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-            </exclusion>
             <exclusion>
                <groupId>com.sun.xml.bind</groupId>
                <artifactId>jaxb-impl</artifactId>
@@ -77,32 +67,14 @@
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jackson-provider</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.jboss.spec.javax.annotation</groupId>
-               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-atom-provider</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.jboss.spec.javax.annotation</groupId>
-               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>tjws</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.jboss.spec.javax.annotation</groupId>
-               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>io.netty</groupId>
@@ -123,10 +95,8 @@
          <artifactId>geronimo-jms_2.0_spec</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.jboss.spec.javax.annotation</groupId>
-         <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-         <version>1.0.1.Final</version>
-         <scope>test</scope>
+         <groupId>org.apache.geronimo.specs</groupId>
+         <artifactId>geronimo-annotation_1.1_spec</artifactId>
       </dependency>
       <dependency>
          <groupId>junit</groupId>
diff --git a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java
index bfe4f68204..a2a51f712e 100644
--- a/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java
+++ b/activemq-rest/src/test/java/org/apache/activemq/rest/test/PersistentPushQueueConsumerTest.java
@@ -211,4 +211,4 @@ public class PersistentPushQueueConsumerTest
          shutdown();
       }
    }
-}
\ No newline at end of file
+}
diff --git a/examples/jms/rest/dup-send/pom.xml b/examples/jms/rest/dup-send/pom.xml
index 65e242add7..ce546abcca 100644
--- a/examples/jms/rest/dup-send/pom.xml
+++ b/examples/jms/rest/dup-send/pom.xml
@@ -151,22 +151,10 @@ under the License.
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxrs</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.jboss.spec.javax.annotation</groupId>
-               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxb-provider</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.jboss.spec.javax.annotation</groupId>
-               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>junit</groupId>
diff --git a/examples/jms/rest/javascript-chat/pom.xml b/examples/jms/rest/javascript-chat/pom.xml
index 787627d11b..16925f065e 100644
--- a/examples/jms/rest/javascript-chat/pom.xml
+++ b/examples/jms/rest/javascript-chat/pom.xml
@@ -164,24 +164,10 @@ under the License.
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxrs</artifactId>
-         <version>${resteasy.version}</version>
-         <exclusions>
-            <exclusion>
-               <groupId>org.jboss.spec.javax.annotation</groupId>
-               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxb-provider</artifactId>
-         <version>${resteasy.version}</version>
-         <exclusions>
-            <exclusion>
-               <groupId>org.jboss.spec.javax.annotation</groupId>
-               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>junit</groupId>
diff --git a/examples/jms/rest/jms-to-rest/pom.xml b/examples/jms/rest/jms-to-rest/pom.xml
index d583a55e45..0c36696c83 100644
--- a/examples/jms/rest/jms-to-rest/pom.xml
+++ b/examples/jms/rest/jms-to-rest/pom.xml
@@ -151,22 +151,10 @@ under the License.
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxrs</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.jboss.spec.javax.annotation</groupId>
-               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxb-provider</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.jboss.spec.javax.annotation</groupId>
-               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>junit</groupId>
diff --git a/examples/jms/rest/push/pom.xml b/examples/jms/rest/push/pom.xml
index 14713eeb3b..5d497a04c6 100644
--- a/examples/jms/rest/push/pom.xml
+++ b/examples/jms/rest/push/pom.xml
@@ -157,22 +157,10 @@ under the License.
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxrs</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.jboss.spec.javax.annotation</groupId>
-               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.jboss.resteasy</groupId>
          <artifactId>resteasy-jaxb-provider</artifactId>
-         <exclusions>
-            <exclusion>
-               <groupId>org.jboss.spec.javax.annotation</groupId>
-               <artifactId>jboss-annotations-api_1.1_spec</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml
index b45a87d92f..153fcb7ead 100644
--- a/pom.xml
+++ b/pom.xml
@@ -359,30 +359,73 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
             <version>${resteasy.version}</version>
+            <exclusions>
+               <exclusion>
+                  <!-- We exclude this dep as it is GPL licensed.  Instead we include the Geronimo annotations -->
+                  <groupId>org.jboss.spec.javax.annotation</groupId>
+                  <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+               </exclusion>
+            </exclusions>
             <!-- License: Apache 2.0 -->
          </dependency>
          <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxb-provider</artifactId>
             <version>${resteasy.version}</version>
+            <exclusions>
+               <exclusion>
+                  <!-- We exclude this dep as it is GPL licensed.  Instead we include the Geronimo annotations -->
+                  <groupId>org.jboss.spec.javax.annotation</groupId>
+                  <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+               </exclusion>
+            </exclusions>
             <!-- License: Apache 2.0 -->
          </dependency>
          <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson-provider</artifactId>
             <version>${resteasy.version}</version>
+            <exclusions>
+               <exclusion>
+                  <!-- We exclude this dep as it is GPL licensed.  Instead we include the Geronimo annotations -->
+                  <groupId>org.jboss.spec.javax.annotation</groupId>
+                  <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+               </exclusion>
+            </exclusions>
             <!-- License: Apache 2.0 -->
          </dependency>
          <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-atom-provider</artifactId>
             <version>${resteasy.version}</version>
+            <exclusions>
+               <exclusion>
+                  <!-- We exclude this dep as it is GPL licensed.  Instead we include the Geronimo annotations -->
+                  <groupId>org.jboss.spec.javax.annotation</groupId>
+                  <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+               </exclusion>
+            </exclusions>
             <!-- License: Apache 2.0 -->
          </dependency>
          <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>tjws</artifactId>
             <version>${resteasy.version}</version>
+            <exclusions>
+               <exclusion>
+                  <!-- We exclude this dep as it is GPL licensed.  Instead we include the Geronimo annotations -->
+                  <groupId>org.jboss.spec.javax.annotation</groupId>
+                  <artifactId>jboss-annotations-api_1.1_spec</artifactId>
+               </exclusion>
+            </exclusions>
+            <!-- License: Apache 2.0 -->
+         </dependency>
+
+         <!-- Replacement for jboss annotations -->
+         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
+            <version>1.0.1</version>
             <!-- License: Apache 2.0 -->
          </dependency>