activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r982934 - in /activemq/trunk: activemq-all/pom.xml activemq-camel/pom.xml activemq-core/pom.xml activemq-karaf/src/main/resources/features.xml activemq-pool/pom.xml activemq-ra/pom.xml activemq-spring/pom.xml pom.xml
Date Fri, 06 Aug 2010 11:34:07 GMT
Author: dejanb
Date: Fri Aug  6 11:34:06 2010
New Revision: 982934

URL: http://svn.apache.org/viewvc?rev=982934&view=rev
Log:
reverting to annotation spec 1.0 and including activemq-ra in the feature

Modified:
    activemq/trunk/activemq-all/pom.xml
    activemq/trunk/activemq-camel/pom.xml
    activemq/trunk/activemq-core/pom.xml
    activemq/trunk/activemq-karaf/src/main/resources/features.xml
    activemq/trunk/activemq-pool/pom.xml
    activemq/trunk/activemq-ra/pom.xml
    activemq/trunk/activemq-spring/pom.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-all/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-all/pom.xml?rev=982934&r1=982933&r2=982934&view=diff
==============================================================================
--- activemq/trunk/activemq-all/pom.xml (original)
+++ activemq/trunk/activemq-all/pom.xml Fri Aug  6 11:34:06 2010
@@ -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>
 

Modified: activemq/trunk/activemq-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/pom.xml?rev=982934&r1=982933&r2=982934&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/pom.xml (original)
+++ activemq/trunk/activemq-camel/pom.xml Fri Aug  6 11:34:06 2010
@@ -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>
 

Modified: activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/pom.xml?rev=982934&r1=982933&r2=982934&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-core/pom.xml Fri Aug  6 11:34:06 2010
@@ -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>

Modified: activemq/trunk/activemq-karaf/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/src/main/resources/features.xml?rev=982934&r1=982933&r2=982934&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/src/main/resources/features.xml (original)
+++ activemq/trunk/activemq-karaf/src/main/resources/features.xml Fri Aug  6 11:34:06 2010
@@ -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>

Modified: activemq/trunk/activemq-pool/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-pool/pom.xml?rev=982934&r1=982933&r2=982934&view=diff
==============================================================================
--- activemq/trunk/activemq-pool/pom.xml (original)
+++ activemq/trunk/activemq-pool/pom.xml Fri Aug  6 11:34:06 2010
@@ -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>

Modified: activemq/trunk/activemq-ra/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-ra/pom.xml?rev=982934&r1=982933&r2=982934&view=diff
==============================================================================
--- activemq/trunk/activemq-ra/pom.xml (original)
+++ activemq/trunk/activemq-ra/pom.xml Fri Aug  6 11:34:06 2010
@@ -32,6 +32,7 @@
 
   <properties>
     <activemq.osgi.import.pkg>
+      javax.resource*;resolution:=optional,
       *
     </activemq.osgi.import.pkg>
     <activemq.osgi.export>

Modified: activemq/trunk/activemq-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-spring/pom.xml?rev=982934&r1=982933&r2=982934&view=diff
==============================================================================
--- activemq/trunk/activemq-spring/pom.xml (original)
+++ activemq/trunk/activemq-spring/pom.xml Fri Aug  6 11:34:06 2010
@@ -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>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=982934&r1=982933&r2=982934&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Aug  6 11:34:06 2010
@@ -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>
 
 



Mime
View raw message