From 474a30d7ce6a6fdc8f2106a4d7e075d04169eecb Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Fri, 6 Aug 2010 11:34:06 +0000
Subject: [PATCH] reverting to annotation spec 1.0 and including activemq-ra in
 the feature

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@982934 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-all/pom.xml                           | 2 +-
 activemq-camel/pom.xml                         | 2 +-
 activemq-core/pom.xml                          | 2 +-
 activemq-karaf/src/main/resources/features.xml | 5 +++--
 activemq-pool/pom.xml                          | 4 ++--
 activemq-ra/pom.xml                            | 1 +
 activemq-spring/pom.xml                        | 2 +-
 pom.xml                                        | 4 ++--
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
index 2e022d0a7c..417494c363 100644
--- a/activemq-all/pom.xml
+++ b/activemq-all/pom.xml
@@ -51,7 +51,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.1_spec</artifactId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml
index 4da624b41a..76917de0f9 100755
--- a/activemq-camel/pom.xml
+++ b/activemq-camel/pom.xml
@@ -79,7 +79,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.1_spec</artifactId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
       <optional>true</optional>
     </dependency>
 
diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index 135bde5e7b..b423a86579 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -116,7 +116,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.1_spec</artifactId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
index cbdd4b9f67..f4fadfaab7 100644
--- a/activemq-karaf/src/main/resources/features.xml
+++ b/activemq-karaf/src/main/resources/features.xml
@@ -2,7 +2,7 @@
     <repository>mvn:org.apache.karaf/apache-karaf/${karaf-version}/xml/features</repository>
         
     <feature name="activemq" version="${activemq-version}">
-        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.1_spec/1.0</bundle>
+        <bundle>mvn:org.apache.geronimo.specs/geronimo-annotation_1.0_spec/1.1.1</bundle>
         <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle> 
         <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/1.1.1</bundle> 
         <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-management_1.1_spec/1.0.1</bundle> 
@@ -13,7 +13,8 @@
         <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.velocity/1.6.2_3</bundle>
         <bundle>mvn:org.apache.activemq/activemq-core/${activemq-version}</bundle> 
         <bundle>mvn:org.apache.activemq/kahadb/${activemq-version}</bundle> 
-        <bundle>mvn:org.apache.activemq/activemq-console/${activemq-version}</bundle> 
+        <bundle>mvn:org.apache.activemq/activemq-console/${activemq-version}</bundle>
+        <bundle>mvn:org.apache.activemq/activemq-ra/${activemq-version}</bundle> 
         <bundle>mvn:org.apache.activemq/activemq-pool/${activemq-version}</bundle>
         <bundle>mvn:org.apache.activemq/activemq-karaf/${activemq-version}</bundle> 
         <bundle>mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/0.1-incubating</bundle>
diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml
index 3be00c26cd..fbc0f757a6 100755
--- a/activemq-pool/pom.xml
+++ b/activemq-pool/pom.xml
@@ -59,7 +59,7 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>activemq-ra</artifactId>
       <optional>true</optional>
-    </dependency>
+    </dependency> 
     <dependency>
       <groupId>org.apache.geronimo.components</groupId>
       <artifactId>geronimo-transaction</artifactId>
@@ -71,7 +71,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.1_spec</artifactId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index 46dfc268b5..3b0d2fe370 100755
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -32,6 +32,7 @@
 
   <properties>
     <activemq.osgi.import.pkg>
+      javax.resource*;resolution:=optional,
       *
     </activemq.osgi.import.pkg>
     <activemq.osgi.export>
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index 541a8144dc..aba6a654ac 100755
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -72,7 +72,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.1_spec</artifactId>
+      <artifactId>geronimo-annotation_1.0_spec</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 346867783e..d88403c064 100755
--- a/pom.xml
+++ b/pom.xml
@@ -403,8 +403,8 @@
       
       <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-annotation_1.1_spec</artifactId>
-        <version>1.0</version>
+        <artifactId>geronimo-annotation_1.0_spec</artifactId>
+        <version>1.1.1</version>
       </dependency>