You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by km...@apache.org on 2010/08/13 20:17:23 UTC

svn commit: r985312 - in /openejb/trunk/openejb3: ./ container/openejb-core/src/test/java/org/apache/openejb/config/ container/openejb-jee/src/test/resources/jsf/ examples/alternate-descriptors/src/main/resources/META-INF/ examples/applicationexception...

Author: kmalhi
Date: Fri Aug 13 18:17:22 2010
New Revision: 985312

URL: http://svn.apache.org/viewvc?rev=985312&view=rev
Log:
merge surefire-plugin version fix from jcdi branch to trunk

Modified:
    openejb/trunk/openejb3/   (props changed)
    openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java   (props changed)
    openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jsf/   (props changed)
    openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml   (props changed)
    openejb/trunk/openejb3/examples/applicationexception/pom.xml
    openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml
    openejb/trunk/openejb3/examples/webapps/ejb-webservice/pom.xml
    openejb/trunk/openejb3/examples/webapps/moviefun/pom.xml
    openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml
    openejb/trunk/openejb3/pom.xml

Propchange: openejb/trunk/openejb3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 13 18:17:22 2010
@@ -1,2 +1,3 @@
 /openejb/branches/openejb-3.1.1:779593
 /openejb/branches/openejb-3.1.x:945409,945448
+/openejb/branches/openejb-jcdi:984659-985270

Propchange: openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 13 18:17:22 2010
@@ -1,2 +1,3 @@
 /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593
 /openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:945409,945448
+/openejb/branches/openejb-jcdi/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:984659-985270

Propchange: openejb/trunk/openejb3/container/openejb-jee/src/test/resources/jsf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 13 18:17:22 2010
@@ -1,3 +1,4 @@
 /geronimo/server/branches/2.2/plugins/myfaces/geronimo-myfaces-builder/src/test/resources:832538,885058
 /geronimo/server/branches/3.0-M1/plugins/myfaces/geronimo-myfaces-builder/src/test/resources:948864,951792
 /geronimo/server/trunk/plugins/j2ee/myfaces/geronimo-myfaces-builder/src/test/resources:887507
+/openejb/branches/openejb-jcdi/container/openejb-jee/src/test/resources/jsf:984659-985270

Propchange: openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 13 18:17:22 2010
@@ -1,2 +1,3 @@
 /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593
 /openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:945409,945448
+/openejb/branches/openejb-jcdi/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:984659-985270

Modified: openejb/trunk/openejb3/examples/applicationexception/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/applicationexception/pom.xml?rev=985312&r1=985311&r2=985312&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/applicationexception/pom.xml (original)
+++ openejb/trunk/openejb3/examples/applicationexception/pom.xml Fri Aug 13 18:17:22 2010
@@ -45,7 +45,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.4.2</version>
+        <version>2.5</version>
         <configuration>
           <systemProperties>
             <property>

Modified: openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml?rev=985312&r1=985311&r2=985312&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/ejb-examples/pom.xml Fri Aug 13 18:17:22 2010
@@ -48,7 +48,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.2</version>
+          <version>2.5</version>
         </plugin>
       </plugins>
     </pluginManagement>

Modified: openejb/trunk/openejb3/examples/webapps/ejb-webservice/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/ejb-webservice/pom.xml?rev=985312&r1=985311&r2=985312&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/ejb-webservice/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/ejb-webservice/pom.xml Fri Aug 13 18:17:22 2010
@@ -49,7 +49,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.2</version>
+          <version>2.5</version>
         </plugin>
       </plugins>
     </pluginManagement>

Modified: openejb/trunk/openejb3/examples/webapps/moviefun/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webapps/moviefun/pom.xml?rev=985312&r1=985311&r2=985312&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webapps/moviefun/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webapps/moviefun/pom.xml Fri Aug 13 18:17:22 2010
@@ -55,7 +55,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.2</version>
+          <version>2.5</version>
         </plugin>
       </plugins>
     </pluginManagement>

Modified: openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml?rev=985312&r1=985311&r2=985312&view=diff
==============================================================================
--- openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml (original)
+++ openejb/trunk/openejb3/examples/webservice-ws-security/pom.xml Fri Aug 13 18:17:22 2010
@@ -85,7 +85,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.2</version>
+          <version>2.5</version>
         </plugin>
       </plugins>
     </pluginManagement>

Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=985312&r1=985311&r2=985312&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Fri Aug 13 18:17:22 2010
@@ -122,7 +122,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.4.2</version>
+          <version>2.5</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>