geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r423690 - in /geronimo/sandbox/svkmerge/m2migration/modules: activemq-gbean-management/pom.xml activemq-gbean/pom.xml
Date Thu, 20 Jul 2006 01:10:58 GMT
Author: jdillon
Date: Wed Jul 19 18:10:58 2006
New Revision: 423690

URL: http://svn.apache.org/viewvc?rev=423690&view=rev
Log:
Fix build

Modified:
    geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management/pom.xml
    geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean/pom.xml

Modified: geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management/pom.xml?rev=423690&r1=423689&r2=423690&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management/pom.xml Wed Jul
19 18:10:58 2006
@@ -29,8 +29,11 @@
     </parent>
 
     <artifactId>geronimo-activemq-gbean-management</artifactId>
-    <name>Geronimo :: ActiveMQ :: GBean Interfaces</name>
-    <description>ActiveMQ Management Interfaces used by Geronimo</description>
+    <name>Geronimo :: ActiveMQ GBean Management Interfaces</name>
+    
+    <description>
+        ActiveMQ Management Interfaces used by Geronimo
+    </description>
     
     <!--
     
@@ -53,16 +56,13 @@
             <artifactId>geronimo-management</artifactId>
             <version>${pom.version}</version>
         </dependency>
-        
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-        </dependency>
-        
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-        </dependency>
 
     </dependencies>
+    
+    <build>
+        <!-- FIXME: Remove when the default is to use the m2 standard layout -->
+        <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
+        <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
+    </build>
+    
 </project>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean/pom.xml?rev=423690&r1=423689&r2=423690&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean/pom.xml Wed Jul 19 18:10:58
2006
@@ -29,8 +29,11 @@
     </parent>
 
     <artifactId>geronimo-activemq-gbean</artifactId>
-    <name>ActiveMQ :: GBeans</name>
-    <description>Geronimo ActiveMQ Integration</description>
+    <name>Geronimo :: ActiveMQ GBeans</name>
+    
+    <description>
+        Geronimo ActiveMQ Integration
+    </description>
     
     <!--
     
@@ -49,18 +52,6 @@
     <dependencies>
 
         <dependency>
-            <groupId>incubator-activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <version>4.0-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>incubator-activemq</groupId>
-            <artifactId>activeio-core</artifactId>
-            <version>3.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-activemq-gbean-management</artifactId>
             <version>${pom.version}</version>
@@ -89,17 +80,41 @@
             <artifactId>geronimo-j2ee</artifactId>
             <version>${pom.version}</version>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>incubator-activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>4.0.1</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>incubator-activemq</groupId>
+            <artifactId>activeio-core</artifactId>
+            <version>3.0-beta3</version>
+        </dependency>
+        
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>mx4j</groupId>
             <artifactId>mx4j</artifactId>
         </dependency>
-
+        
     </dependencies>
-
+    
+    <build>
+        <!-- FIXME: Remove when the default is to use the m2 standard layout -->
+        <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
+        <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
+    </build>
+    
 </project>



Mime
View raw message