openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1051043 - in /openwebbeans/trunk: ./ samples/ejb-sample/ samples/ejb-telephone/ samples/reservation/ webbeans-ejb/ webbeans-jee5-ejb-resource/ webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/ webbeans-tck/
Date Mon, 20 Dec 2010 10:37:43 GMT
Author: struberg
Date: Mon Dec 20 10:37:42 2010
New Revision: 1051043

URL: http://svn.apache.org/viewvc?rev=1051043&view=rev
Log:
OWB-506 upgrade to newer plugins and dependencies

this also includes an upgrade from OpenEJB-3.1.2 to 3.1.4

Modified:
    openwebbeans/trunk/pom.xml
    openwebbeans/trunk/samples/ejb-sample/pom.xml
    openwebbeans/trunk/samples/ejb-telephone/pom.xml
    openwebbeans/trunk/samples/reservation/pom.xml
    openwebbeans/trunk/webbeans-ejb/pom.xml
    openwebbeans/trunk/webbeans-jee5-ejb-resource/   (props changed)
    openwebbeans/trunk/webbeans-jee5-ejb-resource/pom.xml
    openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/ResourceInjectionProcessor.java
    openwebbeans/trunk/webbeans-tck/pom.xml

Modified: openwebbeans/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/pom.xml?rev=1051043&r1=1051042&r2=1051043&view=diff
==============================================================================
--- openwebbeans/trunk/pom.xml (original)
+++ openwebbeans/trunk/pom.xml Mon Dec 20 10:37:42 2010
@@ -68,8 +68,8 @@
         <geronimo_jaxws.version>1.0</geronimo_jaxws.version>
         <geronimo_servlet.version>1.2</geronimo_servlet.version>
         <dom4j.version>1.6.1</dom4j.version>
-        <geronimo_ejb.version>1.0.1</geronimo_ejb.version>
-        <geronimo_el.version>1.0</geronimo_el.version>
+        <geronimo_ejb.version>1.0.2</geronimo_ejb.version>
+        <geronimo_el.version>1.0.1</geronimo_el.version>
         <scannatation.version>1.0.2</scannatation.version>
         <geronimo_annotation.version>1.0.1</geronimo_annotation.version>
         <geronimo_jpa.version>1.1</geronimo_jpa.version>
@@ -80,8 +80,8 @@
         <geronimo_interceptor.version>1.0</geronimo_interceptor.version>
         <geronimo_validation.version>1.1</geronimo_validation.version>
         <javassist.version>3.12.0.GA</javassist.version>
-        <openejb.version>3.1.2</openejb.version>
-        <myfaces.version>2.0.2</myfaces.version>
+        <openejb.version>3.1.4</openejb.version>
+        <myfaces.version>2.0.3</myfaces.version>
         <siteId>/OWB/1.0.0-alpha-2/plugins</siteId>
     </properties>
     
@@ -471,7 +471,7 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-ejb_3.0_spec</artifactId>
+                <artifactId>geronimo-ejb_3.1_spec</artifactId>
                 <version>${geronimo_ejb.version}</version>
             </dependency>
 
@@ -527,7 +527,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.8.1</version>
+                <version>4.8.2</version>
                 <scope>test</scope>
             </dependency>
 

Modified: openwebbeans/trunk/samples/ejb-sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-sample/pom.xml?rev=1051043&r1=1051042&r2=1051043&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-sample/pom.xml (original)
+++ openwebbeans/trunk/samples/ejb-sample/pom.xml Mon Dec 20 10:37:42 2010
@@ -139,7 +139,7 @@ under the License.
         <!-- EJB API -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: openwebbeans/trunk/samples/ejb-telephone/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/ejb-telephone/pom.xml?rev=1051043&r1=1051042&r2=1051043&view=diff
==============================================================================
--- openwebbeans/trunk/samples/ejb-telephone/pom.xml (original)
+++ openwebbeans/trunk/samples/ejb-telephone/pom.xml Mon Dec 20 10:37:42 2010
@@ -138,7 +138,7 @@ under the License.
         <!-- EJB API -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: openwebbeans/trunk/samples/reservation/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/pom.xml?rev=1051043&r1=1051042&r2=1051043&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/pom.xml (original)
+++ openwebbeans/trunk/samples/reservation/pom.xml Mon Dec 20 10:37:42 2010
@@ -47,7 +47,7 @@ under the License.
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>openjpa-maven-plugin</artifactId>
-                <version>1.0</version>
+                <version>1.2</version>
                 <configuration>
                     <includes>org/apache/webbeans/reservation/entity/*.class</includes>
                     <addDefaultConstructor>true</addDefaultConstructor>
@@ -73,7 +73,7 @@ under the License.
                     <dependency>
                         <groupId>org.apache.openjpa</groupId>
                         <artifactId>openjpa</artifactId>
-                        <version>2.0.0-M3</version>
+                        <version>2.0.1</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -199,7 +199,7 @@ under the License.
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
-            <version>2.0.0-M3</version>
+            <version>2.0.1</version>
         </dependency>
 
     </dependencies>

Modified: openwebbeans/trunk/webbeans-ejb/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-ejb/pom.xml?rev=1051043&r1=1051042&r2=1051043&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-ejb/pom.xml (original)
+++ openwebbeans/trunk/webbeans-ejb/pom.xml Mon Dec 20 10:37:42 2010
@@ -65,8 +65,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>1.0.1</version>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
         </dependency>
 
     </dependencies>

Propchange: openwebbeans/trunk/webbeans-jee5-ejb-resource/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Dec 20 10:37:42 2010
@@ -0,0 +1,11 @@
+target
+.metadata
+.classpath
+.project
+.settings
+*.iml
+*.ipr
+*.iws
+.git
+.gitignore
+

Modified: openwebbeans/trunk/webbeans-jee5-ejb-resource/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jee5-ejb-resource/pom.xml?rev=1051043&r1=1051042&r2=1051043&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-jee5-ejb-resource/pom.xml (original)
+++ openwebbeans/trunk/webbeans-jee5-ejb-resource/pom.xml Mon Dec 20 10:37:42 2010
@@ -48,8 +48,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>${geronimo_ejb.version}</version>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/ResourceInjectionProcessor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/ResourceInjectionProcessor.java?rev=1051043&r1=1051042&r2=1051043&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/ResourceInjectionProcessor.java
(original)
+++ openwebbeans/trunk/webbeans-openejb/src/main/java/org/apache/webbeans/ejb/resource/ResourceInjectionProcessor.java
Mon Dec 20 10:37:42 2010
@@ -158,7 +158,7 @@ class ResourceInjectionProcessor
 
         EntityManagerFactory factory = getPersistenceUnit(context, unitName, EntityManagerFactory.class);
 
-        JtaEntityManager jtaEntityManager = new JtaEntityManager(jtaEntityManagerRegistry,
factory, null, false);
+        JtaEntityManager jtaEntityManager = new JtaEntityManager(unitName, jtaEntityManagerRegistry,
factory, null, false);
 
         return clazz.cast(jtaEntityManager);
     }

Modified: openwebbeans/trunk/webbeans-tck/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tck/pom.xml?rev=1051043&r1=1051042&r2=1051043&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tck/pom.xml (original)
+++ openwebbeans/trunk/webbeans-tck/pom.xml Mon Dec 20 10:37:42 2010
@@ -102,8 +102,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-ejb_3.0_spec</artifactId>
-            <version>1.0.1</version>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
         </dependency>
 
     </dependencies>



Mime
View raw message