geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r514014 - in /geronimo/server/branches/1.2: modules/ge-activemq-rar/pom.xml modules/geronimo-activemq-gbean/pom.xml pom.xml
Date Fri, 02 Mar 2007 23:36:27 GMT
Author: jdillon
Date: Fri Mar  2 15:36:26 2007
New Revision: 514014

URL: http://svn.apache.org/viewvc?view=rev&rev=514014
Log:
Update AMQ versions to pick up the JDK 1.4 happy bits
Drop activeio-core dep from geronimo-activemq-gbean, as it should get picked up transitively

Modified:
    geronimo/server/branches/1.2/modules/ge-activemq-rar/pom.xml
    geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/pom.xml
    geronimo/server/branches/1.2/pom.xml

Modified: geronimo/server/branches/1.2/modules/ge-activemq-rar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/ge-activemq-rar/pom.xml?view=diff&rev=514014&r1=514013&r2=514014
==============================================================================
--- geronimo/server/branches/1.2/modules/ge-activemq-rar/pom.xml (original)
+++ geronimo/server/branches/1.2/modules/ge-activemq-rar/pom.xml Fri Mar  2 15:36:26 2007
@@ -132,7 +132,6 @@
                     <groupId>org.apache.activemq</groupId>
                     <artifactId>activeio-core</artifactId>
                 </exclusion>
-                
             </exclusions>
         </dependency>
         

Modified: geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/pom.xml?view=diff&rev=514014&r1=514013&r2=514014
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/pom.xml (original)
+++ geronimo/server/branches/1.2/modules/geronimo-activemq-gbean/pom.xml Fri Mar  2 15:36:26
2007
@@ -33,7 +33,6 @@
     <name>Geronimo :: ActiveMQ GBeans</name>
     
     <dependencies>
-
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-activemq-gbean-management</artifactId>
@@ -68,12 +67,6 @@
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
         </dependency>
-        
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activeio-core</artifactId>
-        </dependency>
-        
     </dependencies>
     
 </project>

Modified: geronimo/server/branches/1.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/pom.xml?view=diff&rev=514014&r1=514013&r2=514014
==============================================================================
--- geronimo/server/branches/1.2/pom.xml (original)
+++ geronimo/server/branches/1.2/pom.xml Fri Mar  2 15:36:26 2007
@@ -523,26 +523,25 @@
             </dependency>
             
             <!--
-            NOTE: Using AMQ 4.1-SNAPSHOT (AIO 3.1-SNAPSHOT) to 
-                  pick up spec compliance fix for AMQ-1165 until AMQ 4.1.1 is released.
+            NOTE: Using AMQ 4.1-SNAPSHOT to pick up spec compliance fix for AMQ-1165 until
AMQ 4.1.1 is released.
             -->
             
             <dependency>
                 <groupId>org.apache.activemq</groupId>
-                <artifactId>activeio-core</artifactId>
-                <version>3.1-SNAPSHOT</version>
+                <artifactId>activemq-core</artifactId>
+                <version>4.1-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.activemq</groupId>
-                <artifactId>activemq-core</artifactId>
+                <artifactId>activemq-ra</artifactId>
                 <version>4.1-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.activemq</groupId>
-                <artifactId>activemq-ra</artifactId>
-                <version>4.1-SNAPSHOT</version>
+                <artifactId>activeio-core</artifactId>
+                <version>3.0.0-incubator</version>
             </dependency>
 
             <dependency>



Mime
View raw message