From 3d06efe93d8560d7836cc5d1caf42bf6916d1c2b Mon Sep 17 00:00:00 2001
From: "Christopher L. Shannon (cshannon)" <christopher.l.shannon@gmail.com>
Date: Tue, 8 Mar 2022 11:23:23 -0500
Subject: [PATCH] AMQ-8530 - Update to geronimo-annotation_1.3_spec

---
 activemq-all/pom.xml                                | 8 ++++----
 activemq-jms-pool/pom.xml                           | 2 +-
 activemq-kahadb-store/pom.xml                       | 2 +-
 activemq-karaf/src/main/resources/features-core.xml | 2 +-
 activemq-mqtt/pom.xml                               | 2 +-
 activemq-osgi/pom.xml                               | 4 ++--
 activemq-pool/pom.xml                               | 2 +-
 activemq-spring/pom.xml                             | 2 +-
 activemq-unit-tests/pom.xml                         | 2 +-
 activemq-web-console/pom.xml                        | 2 +-
 assembly/pom.xml                                    | 2 +-
 assembly/src/main/descriptors/common-bin.xml        | 2 +-
 pom.xml                                             | 4 ++--
 13 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index 02c55cab5f..561eafb16a 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -57,7 +57,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+      <artifactId>geronimo-annotation_1.3_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
@@ -103,7 +103,7 @@
                   <include>jakarta.jms:jakarta.jms-api</include>
                   <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
                   <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
-                  <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
+                  <include>org.apache.geronimo.specs:geronimo-annotation_1.3_spec</include>
                   <include>org.slf4j:slf4j-api</include>
                   <include>org.apache.logging.log4j:log4j-slf4j-impl</include>
                   <include>org.slf4j:jcl-over-slf4j</include>
@@ -329,8 +329,8 @@
         </dependency>
         <dependency>
           <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-annotation_1.0_spec</artifactId>
-          <version>1.1.1</version>
+          <artifactId>geronimo-annotation_1.3_spec</artifactId>
+          <version>1.0</version>
           <classifier>sources</classifier>
           <optional>true</optional>
         </dependency>
diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml
index f340dcc042..d685316470 100644
--- a/activemq-jms-pool/pom.xml
+++ b/activemq-jms-pool/pom.xml
@@ -54,7 +54,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+      <artifactId>geronimo-annotation_1.3_spec</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
index 2460883b8c..b303b6ff3b 100644
--- a/activemq-kahadb-store/pom.xml
+++ b/activemq-kahadb-store/pom.xml
@@ -76,7 +76,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+      <artifactId>geronimo-annotation_1.3_spec</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/activemq-karaf/src/main/resources/features-core.xml b/activemq-karaf/src/main/resources/features-core.xml
index e7f1c0f1e5..9a6f7fb565 100644
--- a/activemq-karaf/src/main/resources/features-core.xml
+++ b/activemq-karaf/src/main/resources/features-core.xml
@@ -24,7 +24,7 @@
     <feature name="activemq-client" description="ActiveMQ client libraries" version="${project.version}">
         <feature version="[5,6)">spring</feature>
         <feature>aries-blueprint</feature>
-        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
+        <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-annotation_1.3_spec/1.0</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-jms_2.0_spec/1.0-alpha-2</bundle>
         <bundle dependency="true">mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle>
diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml
index e972f7a7c6..18eb59f5fc 100644
--- a/activemq-mqtt/pom.xml
+++ b/activemq-mqtt/pom.xml
@@ -86,7 +86,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+      <artifactId>geronimo-annotation_1.3_spec</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index d955fb2ba8..dfdd7cdc94 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -493,8 +493,8 @@
         </dependency>
         <dependency>
           <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-annotation_1.0_spec</artifactId>
-          <version>1.1.1</version>
+          <artifactId>geronimo-annotation_1.3_spec</artifactId>
+          <version>1.0</version>
           <classifier>sources</classifier>
           <optional>true</optional>
         </dependency>
diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml
index 1a05f6f808..f1512f1809 100644
--- a/activemq-pool/pom.xml
+++ b/activemq-pool/pom.xml
@@ -58,7 +58,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+      <artifactId>geronimo-annotation_1.3_spec</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 319ba8cd78..7ee360df4e 100644
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -134,7 +134,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+      <artifactId>geronimo-annotation_1.3_spec</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 275f4055f7..f450c18392 100644
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -113,7 +113,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+      <artifactId>geronimo-annotation_1.3_spec</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 5213d28a3b..89b88d687c 100644
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -325,7 +325,7 @@
     
      <dependency>
        <groupId>org.apache.geronimo.specs</groupId>
-       <artifactId>geronimo-annotation_1.0_spec</artifactId>
+       <artifactId>geronimo-annotation_1.3_spec</artifactId>
     </dependency>
 
 	<dependency>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index bf08846a0c..43b7cefbef 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -368,7 +368,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
+      <artifactId>geronimo-annotation_1.3_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ow2.asm</groupId>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index ffe1b8f1ff..f410f361b1 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -280,7 +280,7 @@
         <include>org.mortbay.jasper:apache-el</include>
         <include>org.apache.taglibs:taglibs-standard-impl</include>
 
-        <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
+        <include>org.apache.geronimo.specs:geronimo-annotation_1.3_spec</include>
         <include>org.ow2.asm:asm</include>
         <include>org.eclipse.jdt:ecj</include>
 
diff --git a/pom.xml b/pom.xml
index 41e6b7ca7b..71c7b9a43b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -500,8 +500,8 @@
 
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        <version>1.1.1</version>
+        <artifactId>geronimo-annotation_1.3_spec</artifactId>
+        <version>1.0</version>
       </dependency>