geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r786753 - in /geronimo/server/trunk: framework/configs/j2ee-security/src/main/history/dependencies.xml plugins/client/client/src/main/history/dependencies.xml plugins/openejb/openejb/src/main/history/dependencies.xml pom.xml
Date Sat, 20 Jun 2009 04:06:36 GMT
Author: xuhaihong
Date: Sat Jun 20 04:06:36 2009
New Revision: 786753

URL: http://svn.apache.org/viewvc?rev=786753&view=rev
Log:
GERONIMO-4693 Update OpenEJB version from 3.1.1 to 3.1.2

Modified:
    geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml?rev=786753&r1=786752&r2=786753&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/src/main/history/dependencies.xml
Sat Jun 20 04:06:36 2009
@@ -26,9 +26,4 @@
         <artifactId>rmi-naming</artifactId>
         <type>car</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jaspi_1.0_spec</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml?rev=786753&r1=786752&r2=786753&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/history/dependencies.xml Sat Jun
20 04:06:36 2009
@@ -120,22 +120,7 @@
         <groupId>org.apache.openejb</groupId>
         <artifactId>openejb-server</artifactId>
         <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>xbean-asm-shaded</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>xbean-finder-shaded</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>xbean-reflect</artifactId>
-        <type>jar</type>
-    </dependency>
+    </dependency>    
     <dependency>
         <groupId>org.apache.openjpa</groupId>
         <artifactId>openjpa</artifactId>
@@ -147,6 +132,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.xbean</groupId>
+        <artifactId>xbean-asm-shaded</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.codehaus.swizzle</groupId>
         <artifactId>swizzle-stream</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=786753&r1=786752&r2=786753&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Sat Jun
20 04:06:36 2009
@@ -92,20 +92,10 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.openejb</groupId>
+        <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-asm-shaded</artifactId>
         <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>xbean-finder-shaded</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.openejb</groupId>
-        <artifactId>xbean-reflect</artifactId>
-        <type>jar</type>
-    </dependency>
+    </dependency>    
     <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-spec-corba</artifactId>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=786753&r1=786752&r2=786753&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Sat Jun 20 04:06:36 2009
@@ -76,7 +76,7 @@
         <tomcatVersion>6.0.18-SNAPSHOT</tomcatVersion>
         <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
 
-        <openejbVersion>3.1.1</openejbVersion>
+        <openejbVersion>3.1.2-SNAPSHOT</openejbVersion>
         <derbyVersion>10.4.2.0</derbyVersion>
         <cxfVersion>2.1.4</cxfVersion>
         <axis2Version>1.5</axis2Version>
@@ -2455,7 +2455,7 @@
                             <assembly>
                                 <id>jetty</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
-                                <artifactId>geronimo-jetty6-javaee5</artifactId>
+                                <artifactId>geronimo-jetty7-javaee5</artifactId>
                                 <version>${version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>
@@ -2464,7 +2464,7 @@
                             <assembly>
                                 <id>jetty-minimal</id>
                                 <groupId>org.apache.geronimo.assemblies</groupId>
-                                <artifactId>geronimo-jetty6-minimal</artifactId>
+                                <artifactId>geronimo-jetty7-minimal</artifactId>
                                 <version>${version}</version>
                                 <classifier>bin</classifier>
                                 <type>zip</type>



Mime
View raw message