updating junit and surefire versions and cleaning activemq dependencies

git-svn-id: https://svn.apache.org/repos/asf/openejb/trunk@1338573 13f79535-47bb-0310-9956-ffa450edef68
apache · May 15, 2012 · 3e3d7e9 · 3e3d7e9
1 parent 0517c16
commit 3e3d7e9
Show file tree

Hide file tree

Showing 94 changed files with 145 additions and 133 deletions.
diff --git a/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml b/openejb/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml
@@ -38,7 +38,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.9</version>
+        <version>2.12</version>
         <configuration> <!-- see ARQ-282 -->
           <forkMode>always</forkMode>
         </configuration>

diff --git a/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml b/openejb/arquillian-tomee/arquillian-tomee-tests/pom.xml
@@ -95,7 +95,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.11</version>
+        <version>2.12</version>
       </plugin>
 
       <plugin>

diff --git a/openejb/container/openejb-core/pom.xml b/openejb/container/openejb-core/pom.xml
@@ -458,20 +458,6 @@
     <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-core</artifactId>
-      <exclusions>
-        <exclusion>
-          <artifactId>jasypt</artifactId>
-          <groupId>org.jasypt</groupId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.springframework</groupId>
-          <artifactId>spring-context</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.osgi</groupId>
-          <artifactId>org.osgi.core</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.geronimo.components</groupId>

diff --git a/openejb/examples/access-timeout-meta/pom.xml b/openejb/examples/access-timeout-meta/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/access-timeout/pom.xml b/openejb/examples/access-timeout/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/alternate-descriptors/pom.xml b/openejb/examples/alternate-descriptors/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/application-composer/pom.xml b/openejb/examples/application-composer/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/openejb/examples/applicationexception/pom.xml b/openejb/examples/applicationexception/pom.xml
@@ -44,7 +44,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.6</version>
+        <version>2.12</version>
         <configuration>
           <systemPropertyVariables>
             <openejb.applicationexceptions.inherited>true</openejb.applicationexceptions.inherited>
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/openejb/examples/async-methods/pom.xml b/openejb/examples/async-methods/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/bean-validation-design-by-contract/pom.xml b/openejb/examples/bean-validation-design-by-contract/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/cdi-alternative-and-stereotypes/pom.xml b/openejb/examples/cdi-alternative-and-stereotypes/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/cdi-application-scope/pom.xml b/openejb/examples/cdi-application-scope/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/openejb/examples/cdi-basic/pom.xml b/openejb/examples/cdi-basic/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!-- The <scope>test</scope> guarantees that none of your runtime code 

diff --git a/openejb/examples/cdi-events/pom.xml b/openejb/examples/cdi-events/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/cdi-interceptors/pom.xml b/openejb/examples/cdi-interceptors/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/openejb/examples/cdi-produces-disposes/pom.xml b/openejb/examples/cdi-produces-disposes/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/openejb/examples/cdi-produces-field/pom.xml b/openejb/examples/cdi-produces-field/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/openejb/examples/cdi-request-scope/pom.xml b/openejb/examples/cdi-request-scope/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/openejb/examples/component-interfaces/pom.xml b/openejb/examples/component-interfaces/pom.xml
@@ -44,7 +44,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.6</version>
+        <version>2.12</version>
         <configuration>
           <!-- argLine>-agentlib:jdwp=transport=dt_socket,server=y,address=5005</argLine -->
         </configuration>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/custom-injection/pom.xml b/openejb/examples/custom-injection/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/datasource-ciphered-password/pom.xml b/openejb/examples/datasource-ciphered-password/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/datasource-definition/pom.xml b/openejb/examples/datasource-definition/pom.xml
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/decorators/pom.xml b/openejb/examples/decorators/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/openejb/examples/dynamic-dao-implementation/pom.xml b/openejb/examples/dynamic-dao-implementation/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/openejb/examples/dynamic-datasource-routing/pom.xml b/openejb/examples/dynamic-datasource-routing/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/dynamic-implementation/pom.xml b/openejb/examples/dynamic-implementation/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/openejb/examples/dynamic-proxy-to-access-mbean/pom.xml b/openejb/examples/dynamic-proxy-to-access-mbean/pom.xml
@@ -40,7 +40,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.9</version>
+        <version>2.12</version>
         <configuration>
           <argLine>-Dcom.sun.management.jmxremote.port=8243 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false</argLine>
         </configuration>
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/openejb/examples/ear-testing/business-logic/pom.xml b/openejb/examples/ear-testing/business-logic/pom.xml
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/ear-testing/pom.xml b/openejb/examples/ear-testing/pom.xml
@@ -57,7 +57,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.6</version>
+          <version>2.12</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -72,7 +72,7 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.8.1</version>
+        <version>4.10</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/openejb/examples/helloworld-weblogic/pom.xml b/openejb/examples/helloworld-weblogic/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/openejb/examples/injection-of-connectionfactory/pom.xml b/openejb/examples/injection-of-connectionfactory/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/openejb/examples/injection-of-datasource/pom.xml b/openejb/examples/injection-of-datasource/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
 

diff --git a/openejb/examples/injection-of-ejbs/pom.xml b/openejb/examples/injection-of-ejbs/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/injection-of-entitymanager/pom.xml b/openejb/examples/injection-of-entitymanager/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/injection-of-env-entry/pom.xml b/openejb/examples/injection-of-env-entry/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/interceptors/pom.xml b/openejb/examples/interceptors/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/jpa-eclipselink/pom.xml b/openejb/examples/jpa-eclipselink/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!-- openejb container for running tests -->

diff --git a/openejb/examples/jpa-enumerated/pom.xml b/openejb/examples/jpa-enumerated/pom.xml
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/openejb/examples/jpa-hibernate/pom.xml b/openejb/examples/jpa-hibernate/pom.xml
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
+      <version>4.10</version>
       <scope>test</scope>
     </dependency>
     <!-- openejb (with hibernate) container for running tests -->