You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/04/28 22:47:19 UTC
svn commit: r1590787 [4/4] - in /tomee/tomee/trunk: ./ arquillian/
arquillian/arquillian-openejb-embedded-4/
arquillian/arquillian-openejb-embedded-4/src/test/java/org/apache/openejb/arquillian/openejb/
arquillian/arquillian-tomee-embedded/src/test/jav...
Modified: tomee/tomee/trunk/examples/transaction-rollback/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/transaction-rollback/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/transaction-rollback/pom.xml (original)
+++ tomee/tomee/trunk/examples/transaction-rollback/pom.xml Mon Apr 28 20:47:14 2014
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -60,7 +60,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
Modified: tomee/tomee/trunk/examples/troubleshooting/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/troubleshooting/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/troubleshooting/pom.xml (original)
+++ tomee/tomee/trunk/examples/troubleshooting/pom.xml Mon Apr 28 20:47:14 2014
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -60,7 +60,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<!-- openejb container for running tests -->
Modified: tomee/tomee/trunk/examples/webservice-attachments/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-attachments/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-attachments/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-attachments/pom.xml Mon Apr 28 20:47:14 2014
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -59,7 +59,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<!--
Modified: tomee/tomee/trunk/examples/webservice-handlerchain/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-handlerchain/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-handlerchain/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-handlerchain/pom.xml Mon Apr 28 20:47:14 2014
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -59,7 +59,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<!--
Modified: tomee/tomee/trunk/examples/webservice-holder/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-holder/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-holder/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-holder/pom.xml Mon Apr 28 20:47:14 2014
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -59,7 +59,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<!--
Modified: tomee/tomee/trunk/examples/webservice-inheritance/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-inheritance/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-inheritance/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-inheritance/pom.xml Mon Apr 28 20:47:14 2014
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -59,7 +59,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<!--
Modified: tomee/tomee/trunk/examples/webservice-security/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-security/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-security/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-security/pom.xml Mon Apr 28 20:47:14 2014
@@ -35,7 +35,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -59,7 +59,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<!--
Modified: tomee/tomee/trunk/examples/webservice-ws-security/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-security/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-security/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-ws-security/pom.xml Mon Apr 28 20:47:14 2014
@@ -45,7 +45,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
@@ -75,15 +75,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
+ <version>2.17</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
Modified: tomee/tomee/trunk/examples/webservice-ws-with-resources-config/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-with-resources-config/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-with-resources-config/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-ws-with-resources-config/pom.xml Mon Apr 28 20:47:14 2014
@@ -44,7 +44,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -54,7 +54,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/ContextLookupBmpBean.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.test.entity.bmp;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.stateful.BasicStatefulHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/bmp/EncBmpBean.java Mon Apr 28 20:47:14 2014
@@ -34,7 +34,7 @@ import javax.jms.TopicConnectionFactory;
import javax.jms.QueueConnectionFactory;
import javax.jms.JMSException;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/ContextLookupCmpBean.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.test.entity.cmp;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.stateful.BasicStatefulHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmp2Bean.java Mon Apr 28 20:47:14 2014
@@ -32,7 +32,7 @@ import javax.jms.TopicConnectionFactory;
import javax.jms.QueueConnectionFactory;
import javax.jms.JMSException;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.stateful.BasicStatefulHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/entity/cmp/EncCmpBean.java Mon Apr 28 20:47:14 2014
@@ -35,7 +35,7 @@ import javax.jms.TopicConnectionFactory;
import javax.jms.QueueConnectionFactory;
import javax.jms.JMSException;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/AnnotatedFieldInjectionMdbBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/AnnotatedFieldInjectionMdbBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/AnnotatedFieldInjectionMdbBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/AnnotatedFieldInjectionMdbBean.java Mon Apr 28 20:47:14 2014
@@ -17,7 +17,7 @@
*/
package org.apache.openejb.test.mdb;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbBean.java Mon Apr 28 20:47:14 2014
@@ -17,7 +17,7 @@
*/
package org.apache.openejb.test.mdb;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbPojoBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbPojoBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbPojoBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/ContextLookupMdbPojoBean.java Mon Apr 28 20:47:14 2014
@@ -17,7 +17,7 @@
*/
package org.apache.openejb.test.mdb;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/EncMdbBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/EncMdbBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/EncMdbBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/EncMdbBean.java Mon Apr 28 20:47:14 2014
@@ -48,7 +48,7 @@ import javax.jms.Message;
import javax.persistence.EntityManagerFactory;
import javax.persistence.EntityManager;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
public class EncMdbBean implements EncMdbObject, MessageDrivenBean, MessageListener {
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/FieldInjectionMdbBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/FieldInjectionMdbBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/FieldInjectionMdbBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/FieldInjectionMdbBean.java Mon Apr 28 20:47:14 2014
@@ -17,7 +17,7 @@
*/
package org.apache.openejb.test.mdb;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/InterceptorMdbBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/InterceptorMdbBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/InterceptorMdbBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/InterceptorMdbBean.java Mon Apr 28 20:47:14 2014
@@ -18,7 +18,7 @@
package org.apache.openejb.test.mdb;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/SetterInjectionMdbBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/SetterInjectionMdbBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/SetterInjectionMdbBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/mdb/SetterInjectionMdbBean.java Mon Apr 28 20:47:14 2014
@@ -17,7 +17,7 @@
*/
package org.apache.openejb.test.mdb;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/AnnotatedFieldInjectionSingletonBean.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.test.singleton;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonBean.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.test.singleton;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonPojoBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonPojoBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonPojoBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/ContextLookupSingletonPojoBean.java Mon Apr 28 20:47:14 2014
@@ -30,7 +30,7 @@ import javax.naming.NamingException;
import javax.persistence.EntityManagerFactory;
import javax.persistence.EntityManager;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import java.rmi.RemoteException;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/EncSingletonBean.java Mon Apr 28 20:47:14 2014
@@ -34,7 +34,7 @@ import javax.jms.TopicConnectionFactory;
import javax.jms.QueueConnectionFactory;
import javax.jms.JMSException;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/FieldInjectionSingletonBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/FieldInjectionSingletonBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/FieldInjectionSingletonBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/FieldInjectionSingletonBean.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.test.singleton;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/SetterInjectionSingletonBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/SetterInjectionSingletonBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/SetterInjectionSingletonBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/singleton/SetterInjectionSingletonBean.java Mon Apr 28 20:47:14 2014
@@ -38,7 +38,7 @@ import javax.jms.QueueConnectionFactory;
import javax.jms.TopicConnectionFactory;
import javax.jms.JMSException;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import java.rmi.RemoteException;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/AnnotatedFieldInjectionStatefulBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/AnnotatedFieldInjectionStatefulBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/AnnotatedFieldInjectionStatefulBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/AnnotatedFieldInjectionStatefulBean.java Mon Apr 28 20:47:14 2014
@@ -44,7 +44,7 @@ import javax.jms.QueueConnectionFactory;
import javax.jms.TopicConnectionFactory;
import javax.jms.JMSException;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
@RemoteHome(org.apache.openejb.test.stateful.EncStatefulHome.class)
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulBean.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.test.stateful;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/ContextLookupStatefulPojoBean.java Mon Apr 28 20:47:14 2014
@@ -42,7 +42,7 @@ import javax.jms.JMSException;
import javax.naming.InitialContext;
import javax.annotation.Resource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
public class ContextLookupStatefulPojoBean {
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/EncStatefulBean.java Mon Apr 28 20:47:14 2014
@@ -37,7 +37,7 @@ import javax.jms.TopicConnectionFactory;
import javax.jms.QueueConnectionFactory;
import javax.jms.JMSException;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/FieldInjectionStatefulBean.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.test.stateful;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/PersistenceContextStatefulBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/PersistenceContextStatefulBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/PersistenceContextStatefulBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/PersistenceContextStatefulBean.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.test.stateful;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateful/SetterInjectionStatefulBean.java Mon Apr 28 20:47:14 2014
@@ -38,7 +38,7 @@ import javax.jms.QueueConnectionFactory;
import javax.jms.TopicConnectionFactory;
import javax.jms.JMSException;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import java.rmi.RemoteException;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/AnnotatedFieldInjectionStatelessBean.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.test.stateless;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessBean.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.test.stateless;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/ContextLookupStatelessPojoBean.java Mon Apr 28 20:47:14 2014
@@ -33,7 +33,7 @@ import javax.naming.NamingException;
import javax.persistence.EntityManagerFactory;
import javax.persistence.EntityManager;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import java.rmi.RemoteException;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/EncStatelessBean.java Mon Apr 28 20:47:14 2014
@@ -35,7 +35,7 @@ import javax.jms.QueueConnectionFactory;
import javax.jms.JMSException;
import javax.rmi.PortableRemoteObject;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/FieldInjectionStatelessBean.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.test.stateless;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
Modified: tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-beans/src/main/java/org/apache/openejb/test/stateless/SetterInjectionStatelessBean.java Mon Apr 28 20:47:14 2014
@@ -38,7 +38,7 @@ import javax.jms.QueueConnectionFactory;
import javax.jms.TopicConnectionFactory;
import javax.jms.JMSException;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import java.rmi.RemoteException;
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/NumberedTestCase.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/NumberedTestCase.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/NumberedTestCase.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/NumberedTestCase.java Mon Apr 28 20:47:14 2014
@@ -20,7 +20,7 @@ import java.lang.reflect.InvocationTarge
import java.lang.reflect.Method;
import java.util.Iterator;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.Protectable;
import junit.framework.Test;
import junit.framework.TestResult;
Modified: tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrMappingTests.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrMappingTests.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrMappingTests.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/CmrMappingTests.java Mon Apr 28 20:47:14 2014
@@ -17,7 +17,7 @@
*/
package org.apache.openejb.test.entity.cmr;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.AssertionFailedError;
import org.apache.openejb.test.TestFailureException;
import org.apache.openejb.test.entity.cmr.cmrmapping.ManyOwningSideLocal;
Modified: tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/AnnotatedServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/AnnotatedServlet.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/AnnotatedServlet.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/AnnotatedServlet.java Mon Apr 28 20:47:14 2014
@@ -40,7 +40,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.openejb.test.entity.bmp.BasicBmpHome;
import org.apache.openejb.test.stateful.BasicStatefulBusinessLocal;
import org.apache.openejb.test.stateful.BasicStatefulBusinessRemote;
Modified: tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/EjbServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/EjbServlet.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/EjbServlet.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/EjbServlet.java Mon Apr 28 20:47:14 2014
@@ -28,7 +28,7 @@ import javax.servlet.ServletOutputStream
import javax.ejb.EJB;
import org.apache.openejb.test.stateless.BasicStatelessBusinessLocal;
-import junit.framework.Assert;
+import org.junit.Assert;
public class EjbServlet extends HttpServlet {
@EJB
Modified: tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/RunAsServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/RunAsServlet.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/RunAsServlet.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/RunAsServlet.java Mon Apr 28 20:47:14 2014
@@ -29,7 +29,7 @@ import java.io.PrintStream;
import java.security.Principal;
import java.lang.reflect.Method;
-import junit.framework.Assert;
+import org.junit.Assert;
public class RunAsServlet extends HttpServlet {
@EJB
Modified: tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/SecureServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/SecureServlet.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/SecureServlet.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/SecureServlet.java Mon Apr 28 20:47:14 2014
@@ -29,7 +29,7 @@ import java.io.PrintStream;
import java.security.Principal;
import java.lang.reflect.Method;
-import junit.framework.Assert;
+import org.junit.Assert;
public class SecureServlet extends HttpServlet {
@EJB
Modified: tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/WebserviceServlet.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/WebserviceServlet.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/WebserviceServlet.java (original)
+++ tomee/tomee/trunk/itests/openejb-itests-servlets/src/main/java/org/apache/openejb/test/servlet/WebserviceServlet.java Mon Apr 28 20:47:14 2014
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse;
import javax.xml.ws.WebServiceRef;
-import junit.framework.Assert;
+import org.junit.Assert;
public class WebserviceServlet extends HttpServlet {
@WebServiceRef
Modified: tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ tomee/tomee/trunk/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml Mon Apr 28 20:47:14 2014
@@ -81,13 +81,13 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
+ <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.17</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Mon Apr 28 20:47:14 2014
@@ -41,6 +41,10 @@
</description>
<url>http://openejb.apache.org/</url>
<inceptionYear>1999</inceptionYear>
+
+ <prerequisites>
+ <maven>3.0.5</maven>
+ </prerequisites>
<issueManagement>
<system>jira</system>
@@ -156,7 +160,7 @@
<commons-net.version>3.3</commons-net.version>
<bval.version>0.5</bval.version>
- <org.apache.activemq.version>5.9.0</org.apache.activemq.version>
+ <org.apache.activemq.version>5.9.1</org.apache.activemq.version>
<quartz.version>2.2.1</quartz.version>
<org.springframework.version>3.1.3.RELEASE</org.springframework.version>
<junit.version>4.11</junit.version>
@@ -173,7 +177,7 @@
<version.hsqldb>2.3.0</version.hsqldb>
<version.axiom>1.2.14</version.axiom>
<version.xalan>2.7.1</version.xalan>
- <version.hibernate>4.2.8.Final</version.hibernate>
+ <version.hibernate>4.2.12.Final</version.hibernate>
<version.eclipselink>2.4.2</version.eclipselink>
<!-- arquillian related -->
@@ -224,7 +228,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.16</version>
+ <version>2.17</version>
</plugin>
<plugin> <!-- maven-dependency-plugin:properties doesn't work as well as this one for us -->
<groupId>org.apache.geronimo.buildsupport</groupId>
@@ -1851,12 +1855,14 @@
</dependency>
</dependencies>
</dependencyManagement>
+
<distributionManagement>
<site>
<id>openejb-website</id>
<url>scp://people.apache.org/www/openejb.apache.org/openejb/maven</url>
</site>
</distributionManagement>
+
<reporting>
<plugins>
<plugin>
Modified: tomee/tomee/trunk/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/TypeInfoTestUtil.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/TypeInfoTestUtil.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/TypeInfoTestUtil.java (original)
+++ tomee/tomee/trunk/server/openejb-axis/src/test/java/org/apache/openejb/server/axis/assembler/TypeInfoTestUtil.java Mon Apr 28 20:47:14 2014
@@ -27,7 +27,7 @@ import java.util.HashSet;
import java.util.ArrayList;
import java.lang.reflect.Field;
-import junit.framework.Assert;
+import org.junit.Assert;
public final class TypeInfoTestUtil {
private TypeInfoTestUtil() {
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomExceptionMapperTest.java Mon Apr 28 20:47:14 2014
@@ -33,7 +33,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class CustomExceptionMapperTest {
private static EJBContainer container;
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderTest.java Mon Apr 28 20:47:14 2014
@@ -40,7 +40,7 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class CustomProviderTest {
private static EJBContainer container;
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/CustomProviderWithConfigTest.java Mon Apr 28 20:47:14 2014
@@ -39,7 +39,7 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class CustomProviderWithConfigTest {
private static EJBContainer container;
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DiscoverCustomProviderTest.java Mon Apr 28 20:47:14 2014
@@ -40,7 +40,7 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class DiscoverCustomProviderTest {
private static EJBContainer container;
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/DynamicSubclassEjbDeploymentTest.java Mon Apr 28 20:47:14 2014
@@ -37,8 +37,8 @@ import java.lang.reflect.InvocationHandl
import java.lang.reflect.Method;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
public class DynamicSubclassEjbDeploymentTest {
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/EjbDeploymentTest.java Mon Apr 28 20:47:14 2014
@@ -35,8 +35,8 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Request;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
public class EjbDeploymentTest {
private static EJBContainer container;
Modified: tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java (original)
+++ tomee/tomee/trunk/server/openejb-cxf-rs/src/test/java/org/apache/openejb/server/cxf/rs/PathParamAtClassLevelTest.java Mon Apr 28 20:47:14 2014
@@ -31,7 +31,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class PathParamAtClassLevelTest {
private static EJBContainer container;
Modified: tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/KeepAilveTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/KeepAilveTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/KeepAilveTest.java (original)
+++ tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/KeepAilveTest.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.server.ejbd;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
Modified: tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/Server2ServerEjbRefTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/Server2ServerEjbRefTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/Server2ServerEjbRefTest.java (original)
+++ tomee/tomee/trunk/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/Server2ServerEjbRefTest.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.server.ejbd;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.openejb.OpenEJB;
import org.apache.openejb.assembler.classic.Assembler;
Propchange: tomee/tomee/trunk/shade/quartz/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 28 20:47:14 2014
@@ -1,2 +1,3 @@
dependency-reduced-pom.xml
target
+*.iml
Modified: tomee/tomee/trunk/tck/bval-embedded/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/bval-embedded/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/bval-embedded/pom.xml (original)
+++ tomee/tomee/trunk/tck/bval-embedded/pom.xml Mon Apr 28 20:47:14 2014
@@ -59,10 +59,12 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>${slf4j.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate.jsr303.tck</groupId>
@@ -86,8 +88,8 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.17</version>
<configuration>
<useFile>false</useFile>
<disableXmlReport>true</disableXmlReport>
Modified: tomee/tomee/trunk/tck/bval-tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/bval-tomee/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/bval-tomee/pom.xml (original)
+++ tomee/tomee/trunk/tck/bval-tomee/pom.xml Mon Apr 28 20:47:14 2014
@@ -66,12 +66,13 @@
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
<type>zip</type>
- <version>1.6.1-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<classifier>webprofile</classifier>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.hibernate.jsr303.tck</groupId>
@@ -174,7 +175,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
+ <version>2.17</version>
<configuration>
<useFile>false</useFile>
<disableXmlReport>true</disableXmlReport>
Modified: tomee/tomee/trunk/tck/cdi-embedded/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/cdi-embedded/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/cdi-embedded/pom.xml (original)
+++ tomee/tomee/trunk/tck/cdi-embedded/pom.xml Mon Apr 28 20:47:14 2014
@@ -64,7 +64,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.8</version>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -74,7 +74,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
<configuration>
<useFile>false</useFile>
<disableXmlReport>true</disableXmlReport>
Modified: tomee/tomee/trunk/tck/cdi-tomee-embedded/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/cdi-tomee-embedded/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/cdi-tomee-embedded/pom.xml (original)
+++ tomee/tomee/trunk/tck/cdi-tomee-embedded/pom.xml Mon Apr 28 20:47:14 2014
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-embedded</artifactId>
- <version>1.6.1-SNAPSHOT</version>
+ <version>${tomee.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -74,7 +74,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
<configuration>
<useFile>false</useFile>
<disableXmlReport>true</disableXmlReport>
@@ -84,7 +83,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<id>reserve-network-port</id>
@@ -107,7 +105,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.6</version>
<executions>
<execution>
<id>copy</id>
Modified: tomee/tomee/trunk/tck/cdi-tomee/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/cdi-tomee/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/cdi-tomee/pom.xml (original)
+++ tomee/tomee/trunk/tck/cdi-tomee/pom.xml Mon Apr 28 20:47:14 2014
@@ -58,28 +58,28 @@
<!--<groupId>org.apache.openejb</groupId>-->
<!--<artifactId>apache-tomee</artifactId>-->
<!--<type>zip</type>-->
- <!--<version>1.6.1-SNAPSHOT</version>-->
+ <!--<version>${tomee.version}</version>-->
<!--<classifier>webprofile</classifier>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.openejb</groupId>-->
<!--<artifactId>apache-tomee</artifactId>-->
<!--<type>zip</type>-->
- <!--<version>1.6.1-SNAPSHOT</version>-->
+ <!--<version>${tomee.version}</version>-->
<!--<classifier>jaxrs</classifier>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.openejb</groupId>-->
<!--<artifactId>apache-tomee</artifactId>-->
<!--<type>zip</type>-->
- <!--<version>1.6.1-SNAPSHOT</version>-->
+ <!--<version>${tomee.version}</version>-->
<!--<classifier>plus</classifier>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.openejb</groupId>-->
<!--<artifactId>apache-tomee</artifactId>-->
<!--<type>zip</type>-->
- <!--<version>1.6.1-SNAPSHOT</version>-->
+ <!--<version>${tomee.version}</version>-->
<!--<classifier>plume</classifier>-->
<!--</dependency>-->
<dependency>
@@ -111,6 +111,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
<build>
@@ -124,7 +125,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<id>reserve-network-port</id>
@@ -147,7 +147,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
<configuration>
<useFile>false</useFile>
<disableXmlReport>true</disableXmlReport>
@@ -157,7 +156,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.6</version>
<executions>
<execution>
<id>unpack</id>
@@ -214,7 +212,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.7</version>
<executions>
<execution>
<id>remove-apps</id>
@@ -240,7 +237,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.13</version>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>${suiteXmlFile}</suiteXmlFile>
@@ -311,7 +307,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
<type>zip</type>
- <version>1.6.1-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<classifier>${tomee.classifier}</classifier>
</dependency>
</dependencies>
@@ -327,7 +323,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
<type>zip</type>
- <version>1.6.1-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<classifier>${tomee.classifier}</classifier>
</dependency>
</dependencies>
@@ -343,7 +339,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
<type>zip</type>
- <version>1.6.1-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<classifier>${tomee.classifier}</classifier>
</dependency>
</dependencies>
@@ -359,7 +355,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>apache-tomee</artifactId>
<type>zip</type>
- <version>1.6.1-SNAPSHOT</version>
+ <version>${tomee.version}</version>
<classifier>${tomee.classifier}</classifier>
</dependency>
</dependencies>
Modified: tomee/tomee/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/pom.xml (original)
+++ tomee/tomee/trunk/tck/pom.xml Mon Apr 28 20:47:14 2014
@@ -55,20 +55,4 @@
</repository>
</repositories>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>${slf4j.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.8</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
Modified: tomee/tomee/trunk/tck/tck-common/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/tck-common/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/tck-common/pom.xml (original)
+++ tomee/tomee/trunk/tck/tck-common/pom.xml Mon Apr 28 20:47:14 2014
@@ -67,7 +67,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
<configuration>
<useFile>false</useFile>
<disableXmlReport>true</disableXmlReport>
Modified: tomee/tomee/trunk/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/Archive.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/Archive.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/Archive.java (original)
+++ tomee/tomee/trunk/tck/tck-common/src/main/java/org/apache/openejb/tck/impl/Archive.java Mon Apr 28 20:47:14 2014
@@ -31,8 +31,8 @@ import java.net.URL;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/EmbeddedTomEEContainerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/EmbeddedTomEEContainerTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/EmbeddedTomEEContainerTest.java (original)
+++ tomee/tomee/trunk/tomee/tomee-embedded/src/test/java/org/apache/tomee/embedded/EmbeddedTomEEContainerTest.java Mon Apr 28 20:47:14 2014
@@ -31,8 +31,8 @@ import java.io.IOException;
import java.net.URL;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
public class EmbeddedTomEEContainerTest {
@Test