geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r429095 - in /geronimo/branches/dain/notcm: bootstrap configs/rmi-naming/pom.xml modules/transaction/pom.xml pom.xml
Date Sun, 06 Aug 2006 02:54:57 GMT
Author: dain
Date: Sat Aug  5 19:54:56 2006
New Revision: 429095

URL: http://svn.apache.org/viewvc?rev=429095&view=rev
Log:
Fixed m2 build

Modified:
    geronimo/branches/dain/notcm/bootstrap
    geronimo/branches/dain/notcm/configs/rmi-naming/pom.xml
    geronimo/branches/dain/notcm/modules/transaction/pom.xml
    geronimo/branches/dain/notcm/pom.xml

Modified: geronimo/branches/dain/notcm/bootstrap
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/bootstrap?rev=429095&r1=429094&r2=429095&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/bootstrap (original)
+++ geronimo/branches/dain/notcm/bootstrap Sat Aug  5 19:54:56 2006
@@ -82,7 +82,7 @@
     (
         cd "$DIRNAME/thirdparty"
         
-        svn co http://svn.codehaus.org/openejb/trunk/openejb2 openejb2
+        svn co http://svn.codehaus.org/openejb/branches/dain-2.2-merge/notcm openejb2
         (
             cd openejb2
             mvn -Dmaven.test.skip=true install

Modified: geronimo/branches/dain/notcm/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/configs/rmi-naming/pom.xml?rev=429095&r1=429094&r2=429095&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/configs/rmi-naming/pom.xml (original)
+++ geronimo/branches/dain/notcm/configs/rmi-naming/pom.xml Sat Aug  5 19:54:56 2006
@@ -133,6 +133,12 @@
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-core</artifactId>
             <version>${pom.version}</version>
         </dependency>

Modified: geronimo/branches/dain/notcm/modules/transaction/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/modules/transaction/pom.xml?rev=429095&r1=429094&r2=429095&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/modules/transaction/pom.xml (original)
+++ geronimo/branches/dain/notcm/modules/transaction/pom.xml Sat Aug  5 19:54:56 2006
@@ -69,15 +69,12 @@
         </dependency>
 
         <dependency>
-<<<<<<< .mine
-=======
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
             <version>${pom.version}</version>
         </dependency>
 
         <dependency>
->>>>>>> .r427184
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
         </dependency>

Modified: geronimo/branches/dain/notcm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/dain/notcm/pom.xml?rev=429095&r1=429094&r2=429095&view=diff
==============================================================================
--- geronimo/branches/dain/notcm/pom.xml (original)
+++ geronimo/branches/dain/notcm/pom.xml Sat Aug  5 19:54:56 2006
@@ -218,6 +218,12 @@
                 <artifactId>asm</artifactId>
                 <version>1.4.3</version>
             </dependency>
+
+            <dependency>
+                <groupId>backport-util-concurrent</groupId>
+                <artifactId>backport-util-concurrent</artifactId>
+                <version>2.0_01_pd</version>
+            </dependency>
             
             <dependency>
                 <groupId>castor</groupId>



Mime
View raw message