geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r1056295 [2/2] - in /geronimo/server/branches/3.0-M2: ./ assemblies/ assemblies/geronimo-jetty8-javaee6-web/ assemblies/geronimo-jetty8-javaee6/ assemblies/geronimo-jetty8-minimal/ assemblies/geronimo-tomcat7-javaee6-web/ assemblies/geronim...
Date Fri, 07 Jan 2011 12:50:29 GMT

Propchange: geronimo/server/branches/3.0-M2/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Jan  7 12:50:16 2011
@@ -0,0 +1,4 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:428851
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk:428882
+bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/server-trunk:16301
+bdd66121-cd02-4950-91dc-3687ae657a63:/geronimo/trunk-reorg:12578

Propchange: geronimo/server/branches/3.0-M2/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan  7 12:50:16 2011
@@ -0,0 +1,10 @@
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+*.log
+junit*.properties
+target
+bin
+.settings

Propchange: geronimo/server/branches/3.0-M2/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jan  7 12:50:16 2011
@@ -0,0 +1,2 @@
+/geronimo/server/branches/2.2:832538,885058
+/geronimo/server/branches/3.0-M1:948864,951792

Modified: geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=1056295&r1=1056243&r2=1056295&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml
(original)
+++ geronimo/server/branches/3.0-M2/plugins/openejb/openejb/src/main/history/dependencies.xml
Fri Jan  7 12:50:16 2011
@@ -143,6 +143,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.openwebbeans</groupId>
+        <artifactId>openwebbeans-ee-common</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.openwebbeans</groupId>
         <artifactId>openwebbeans-ejb</artifactId>
         <type>jar</type>
     </dependency>
@@ -187,16 +192,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-bundleutils</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-finder</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-spec-corba</artifactId>
         <type>jar</type>



Mime
View raw message