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 [2/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/container/openejb-core/src/test/java/org/apache/openejb/bval/BeanValidationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/bval/BeanValidationTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/bval/BeanValidationTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/bval/BeanValidationTest.java Mon Apr 28 20:47:14 2014
@@ -46,10 +46,10 @@ import javax.validation.constraints.NotN
import javax.validation.constraints.Size;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
@RunWith(ApplicationComposer.class)
public class BeanValidationTest {
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/AbstractCDIInjectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/AbstractCDIInjectionTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/AbstractCDIInjectionTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/AbstractCDIInjectionTest.java Mon Apr 28 20:47:14 2014
@@ -29,7 +29,7 @@ import org.junit.runner.RunWith;
import javax.ejb.Stateless;
import javax.inject.Inject;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
@RunWith(ApplicationComposer.class)
public class AbstractCDIInjectionTest {
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/AbstractInjectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/AbstractInjectionTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/AbstractInjectionTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/AbstractInjectionTest.java Mon Apr 28 20:47:14 2014
@@ -29,7 +29,7 @@ import org.junit.runner.RunWith;
import javax.ejb.EJB;
import javax.ejb.Stateless;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
@RunWith(ApplicationComposer.class)
public class AbstractInjectionTest {
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/BasicObserverTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/BasicObserverTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/BasicObserverTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/BasicObserverTest.java Mon Apr 28 20:47:14 2014
@@ -28,8 +28,8 @@ import javax.inject.Inject;
import java.util.ArrayList;
import java.util.List;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/StatefulDecoratorInjectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/StatefulDecoratorInjectionTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/StatefulDecoratorInjectionTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/StatefulDecoratorInjectionTest.java Mon Apr 28 20:47:14 2014
@@ -38,9 +38,9 @@ import javax.inject.Inject;
import java.io.Serializable;
import java.security.Principal;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/StatefulDependentInjectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/StatefulDependentInjectionTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/StatefulDependentInjectionTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/cdi/StatefulDependentInjectionTest.java Mon Apr 28 20:47:14 2014
@@ -32,9 +32,9 @@ import javax.ejb.Stateful;
import javax.enterprise.inject.Produces;
import javax.inject.Inject;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/AutoDeployerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/AutoDeployerTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/AutoDeployerTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/AutoDeployerTest.java Mon Apr 28 20:47:14 2014
@@ -45,9 +45,9 @@ import java.util.concurrent.locks.Condit
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
/**
* @version $Rev$ $Date$
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/EjbModuleIdTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/EjbModuleIdTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/EjbModuleIdTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/EjbModuleIdTest.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.config;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
import org.apache.openejb.assembler.classic.EjbJarInfo;
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/EntitiesScanningPackageLimitedTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/EntitiesScanningPackageLimitedTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/EntitiesScanningPackageLimitedTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/EntitiesScanningPackageLimitedTest.java Mon Apr 28 20:47:14 2014
@@ -32,7 +32,7 @@ import javax.persistence.Id;
import javax.persistence.PersistenceUnit;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
@RunWith(ApplicationComposer.class)
public class EntitiesScanningPackageLimitedTest {
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/EntitiesScanningTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/EntitiesScanningTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/EntitiesScanningTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/EntitiesScanningTest.java Mon Apr 28 20:47:14 2014
@@ -32,7 +32,7 @@ import javax.persistence.Id;
import javax.persistence.PersistenceUnit;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
@RunWith(ApplicationComposer.class)
public class EntitiesScanningTest {
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/MBeanDeployerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/MBeanDeployerTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/MBeanDeployerTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/MBeanDeployerTest.java Mon Apr 28 20:47:14 2014
@@ -45,8 +45,8 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
public class MBeanDeployerTest {
private static final MBeanServer server = LocalMBeanServer.get();
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationAssertions.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationAssertions.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationAssertions.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/config/rules/ValidationAssertions.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.config.rules;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.openejb.config.ValidationException;
import org.apache.openejb.config.ValidationFailedException;
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/InheritedAppExceptionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/InheritedAppExceptionTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/InheritedAppExceptionTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/InheritedAppExceptionTest.java Mon Apr 28 20:47:14 2014
@@ -29,7 +29,7 @@ import org.junit.Test;
import java.util.HashMap;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
/**
* @version $Rev:$ $Date:$
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTestObject.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTestObject.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTestObject.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/JpaTestObject.java Mon Apr 28 20:47:14 2014
@@ -34,7 +34,7 @@ import java.sql.SQLException;
import java.sql.Statement;
import java.util.Set;
-public class JpaTestObject extends junit.framework.Assert {
+public class JpaTestObject extends org.junit.Assert {
private EntityManagerFactory entityManagerFactory;
private TransactionManager transactionManager;
private DataSource nonJtaDs;
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/UnenhancedUnits.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/UnenhancedUnits.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/UnenhancedUnits.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/cmp/jpa/UnenhancedUnits.java Mon Apr 28 20:47:14 2014
@@ -17,7 +17,7 @@
*/
package org.apache.openejb.core.cmp.jpa;
-import junit.framework.Assert;
+import org.junit.Assert;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/CustomMdbContainerTest.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.core.mdb;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/QuartzMdbContainerTest.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.apache.openejb.core.mdb;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/security/SQLLoginModuleTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/security/SQLLoginModuleTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/security/SQLLoginModuleTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/security/SQLLoginModuleTest.java Mon Apr 28 20:47:14 2014
@@ -35,7 +35,7 @@ import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class SQLLoginModuleTest {
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java Mon Apr 28 20:47:14 2014
@@ -165,8 +165,8 @@ public class JaxRpcInvocationTest extend
*/
MessageContext messageContext = ctx.getMessageContext();
- junit.framework.Assert.assertNotNull("message context should not be null", messageContext);
- junit.framework.Assert.assertTrue("the Web Service Provider's message context should be used", messageContext instanceof FakeMessageContext);
+ org.junit.Assert.assertNotNull("message context should not be null", messageContext);
+ org.junit.Assert.assertTrue("the Web Service Provider's message context should be used", messageContext instanceof FakeMessageContext);
calls.add(Call.Bean_Invoke_BEFORE);
Object o = context.proceed();
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxWsInvocationTest.java Mon Apr 28 20:47:14 2014
@@ -174,23 +174,23 @@ public class JaxWsInvocationTest extends
*/
MessageContext messageContext = (MessageContext)context.getContextData();
- junit.framework.Assert.assertNotNull("message context should not be null", messageContext);
- junit.framework.Assert.assertTrue("the Web Service Provider's message context should be used", messageContext instanceof FakeMessageContext);
+ org.junit.Assert.assertNotNull("message context should not be null", messageContext);
+ org.junit.Assert.assertTrue("the Web Service Provider's message context should be used", messageContext instanceof FakeMessageContext);
// Try to get JAX-RPC context, should throw an exception since it's JAX-WS
try {
ctx.getMessageContext();
- junit.framework.Assert.fail("Did not throw exception");
+ org.junit.Assert.fail("Did not throw exception");
} catch (IllegalStateException e) {
// that's expected since it's JAX-WS
}
// test @Resource WebServiceContext injection
- junit.framework.Assert.assertNotNull("web service context should not be null", wsContext);
- junit.framework.Assert.assertEquals("msg context should be the smae", messageContext, wsContext.getMessageContext());
+ org.junit.Assert.assertNotNull("web service context should not be null", wsContext);
+ org.junit.Assert.assertEquals("msg context should be the smae", messageContext, wsContext.getMessageContext());
- junit.framework.Assert.assertFalse("user in role 'foo'", wsContext.isUserInRole("foo"));
- junit.framework.Assert.assertNotNull("user principal", wsContext.getUserPrincipal());
+ org.junit.Assert.assertFalse("user in role 'foo'", wsContext.isUserInRole("foo"));
+ org.junit.Assert.assertNotNull("user principal", wsContext.getUserPrincipal());
calls.add(Call.Bean_Invoke_BEFORE);
Object o = context.proceed();
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/junit/AppComposerAsJUnitRuleTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/junit/AppComposerAsJUnitRuleTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/junit/AppComposerAsJUnitRuleTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/junit/AppComposerAsJUnitRuleTest.java Mon Apr 28 20:47:14 2014
@@ -47,10 +47,10 @@ import javax.validation.constraints.NotN
import javax.validation.constraints.Size;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
public class AppComposerAsJUnitRuleTest {
@Rule
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/junit/AppComposerAsJUnitRuleWithReusableModulesTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/junit/AppComposerAsJUnitRuleWithReusableModulesTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/junit/AppComposerAsJUnitRuleWithReusableModulesTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/junit/AppComposerAsJUnitRuleWithReusableModulesTest.java Mon Apr 28 20:47:14 2014
@@ -16,10 +16,10 @@
*/
package org.apache.openejb.junit;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Properties;
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/junit/PreDestroyTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/junit/PreDestroyTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/junit/PreDestroyTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/junit/PreDestroyTest.java Mon Apr 28 20:47:14 2014
@@ -28,7 +28,7 @@ import javax.ejb.Singleton;
import javax.inject.Inject;
import java.util.concurrent.atomic.AtomicBoolean;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
/**
* Test for https://issues.apache.org/jira/browse/OPENEJB-2014
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/MetaTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/MetaTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/MetaTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/meta/MetaTest.java Mon Apr 28 20:47:14 2014
@@ -53,7 +53,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.apache.openejb.config.DeploymentFilterable.DEPLOYMENTS_CLASSPATH_PROPERTY;
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/persistence/ReloadableEntityManagerFactoryTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/persistence/ReloadableEntityManagerFactoryTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/persistence/ReloadableEntityManagerFactoryTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/persistence/ReloadableEntityManagerFactoryTest.java Mon Apr 28 20:47:14 2014
@@ -32,8 +32,8 @@ import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotSame;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
@RunWith(ApplicationComposer.class)
public class ReloadableEntityManagerFactoryTest {
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalCdiEmTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalCdiEmTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalCdiEmTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalCdiEmTest.java Mon Apr 28 20:47:14 2014
@@ -33,8 +33,8 @@ import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import java.util.Properties;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
@RunWith(ApplicationComposer.class)
public class ResourceLocalCdiEmTest {
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalEmInjectionTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalEmInjectionTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalEmInjectionTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/persistence/ResourceLocalEmInjectionTest.java Mon Apr 28 20:47:14 2014
@@ -35,8 +35,8 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import java.util.Properties;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
@RunWith(ApplicationComposer.class)
public class ResourceLocalEmInjectionTest {
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/EJBCronTriggerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/EJBCronTriggerTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/EJBCronTriggerTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/timer/EJBCronTriggerTest.java Mon Apr 28 20:47:14 2014
@@ -26,8 +26,8 @@ import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/Archives.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/Archives.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/Archives.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/Archives.java Mon Apr 28 20:47:14 2014
@@ -33,8 +33,8 @@ import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
/**
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/DynamicEJBImplTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/DynamicEJBImplTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/DynamicEJBImplTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/DynamicEJBImplTest.java Mon Apr 28 20:47:14 2014
@@ -50,10 +50,10 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
@RunWith(ApplicationComposer.class)
public class DynamicEJBImplTest {
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/HexConverterTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/HexConverterTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/HexConverterTest.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/HexConverterTest.java Mon Apr 28 20:47:14 2014
@@ -18,7 +18,7 @@ package org.apache.openejb.util;
import org.junit.Test;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class HexConverterTest {
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/WebArchives.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/WebArchives.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/WebArchives.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/util/WebArchives.java Mon Apr 28 20:47:14 2014
@@ -33,7 +33,7 @@ import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
/**
Modified: tomee/tomee/trunk/examples/access-timeout-meta/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/access-timeout-meta/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/access-timeout-meta/pom.xml (original)
+++ tomee/tomee/trunk/examples/access-timeout-meta/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/access-timeout/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/access-timeout/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/access-timeout/pom.xml (original)
+++ tomee/tomee/trunk/examples/access-timeout/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/alternate-descriptors/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/alternate-descriptors/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/alternate-descriptors/pom.xml (original)
+++ tomee/tomee/trunk/examples/alternate-descriptors/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>
@@ -76,7 +76,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/applet/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/applet/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/applet/pom.xml (original)
+++ tomee/tomee/trunk/examples/applet/pom.xml Mon Apr 28 20:47:14 2014
@@ -32,7 +32,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -58,7 +58,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/examples/application-composer/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/application-composer/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/application-composer/pom.xml (original)
+++ tomee/tomee/trunk/examples/application-composer/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/applicationexception/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/applicationexception/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/applicationexception/pom.xml (original)
+++ tomee/tomee/trunk/examples/applicationexception/pom.xml Mon Apr 28 20:47:14 2014
@@ -19,7 +19,8 @@
<!-- $Rev$ $Date$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.superbiz</groupId>
<artifactId>applicationexception</artifactId>
@@ -35,7 +36,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>
@@ -44,7 +45,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
+ <version>2.17</version>
<configuration>
<systemPropertyVariables>
<openejb.applicationexceptions.inherited>true</openejb.applicationexceptions.inherited>
@@ -70,7 +71,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/async-methods/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/async-methods/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/async-methods/pom.xml (original)
+++ tomee/tomee/trunk/examples/async-methods/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/async-postconstruct/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/async-postconstruct/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/async-postconstruct/pom.xml (original)
+++ tomee/tomee/trunk/examples/async-postconstruct/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/async-postconstruct/src/test/java/org/superbiz/asyncpost/SlowStarterTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/async-postconstruct/src/test/java/org/superbiz/asyncpost/SlowStarterTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/async-postconstruct/src/test/java/org/superbiz/asyncpost/SlowStarterTest.java (original)
+++ tomee/tomee/trunk/examples/async-postconstruct/src/test/java/org/superbiz/asyncpost/SlowStarterTest.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.superbiz.asyncpost;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
import javax.ejb.EJB;
Modified: tomee/tomee/trunk/examples/bean-validation-design-by-contract/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bean-validation-design-by-contract/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/bean-validation-design-by-contract/pom.xml (original)
+++ tomee/tomee/trunk/examples/bean-validation-design-by-contract/pom.xml Mon Apr 28 20:47:14 2014
@@ -32,7 +32,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>
@@ -57,7 +57,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/bean-validation-design-by-contract/src/test/java/org/superbiz/designbycontract/OlympicGamesTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/bean-validation-design-by-contract/src/test/java/org/superbiz/designbycontract/OlympicGamesTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/bean-validation-design-by-contract/src/test/java/org/superbiz/designbycontract/OlympicGamesTest.java (original)
+++ tomee/tomee/trunk/examples/bean-validation-design-by-contract/src/test/java/org/superbiz/designbycontract/OlympicGamesTest.java Mon Apr 28 20:47:14 2014
@@ -29,9 +29,9 @@ import javax.naming.Context;
import javax.validation.ConstraintViolationException;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
public class OlympicGamesTest {
Modified: tomee/tomee/trunk/examples/cdi-alternative-and-stereotypes/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-alternative-and-stereotypes/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-alternative-and-stereotypes/pom.xml (original)
+++ tomee/tomee/trunk/examples/cdi-alternative-and-stereotypes/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/cdi-application-scope/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-application-scope/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-application-scope/pom.xml (original)
+++ tomee/tomee/trunk/examples/cdi-application-scope/pom.xml Mon Apr 28 20:47:14 2014
@@ -22,7 +22,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>
@@ -47,7 +47,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/cdi-basic/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-basic/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-basic/pom.xml (original)
+++ tomee/tomee/trunk/examples/cdi-basic/pom.xml Mon Apr 28 20:47:14 2014
@@ -33,7 +33,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>
@@ -58,7 +58,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<!-- The <scope>test</scope> guarantees that none of your runtime code
Modified: tomee/tomee/trunk/examples/cdi-ejbcontext-jaas/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-ejbcontext-jaas/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-ejbcontext-jaas/pom.xml (original)
+++ tomee/tomee/trunk/examples/cdi-ejbcontext-jaas/pom.xml Mon Apr 28 20:47:14 2014
@@ -55,7 +55,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/examples/cdi-events/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-events/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-events/pom.xml (original)
+++ tomee/tomee/trunk/examples/cdi-events/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/cdi-events/src/test/java/org/superbiz/cdi/events/EventTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-events/src/test/java/org/superbiz/cdi/events/EventTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-events/src/test/java/org/superbiz/cdi/events/EventTest.java (original)
+++ tomee/tomee/trunk/examples/cdi-events/src/test/java/org/superbiz/cdi/events/EventTest.java Mon Apr 28 20:47:14 2014
@@ -26,7 +26,7 @@ import javax.ejb.embeddable.EJBContainer
import javax.inject.Inject;
import javax.naming.NamingException;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
public class EventTest {
Modified: tomee/tomee/trunk/examples/cdi-interceptors/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-interceptors/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-interceptors/pom.xml (original)
+++ tomee/tomee/trunk/examples/cdi-interceptors/pom.xml Mon Apr 28 20:47:14 2014
@@ -29,7 +29,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>
@@ -54,7 +54,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/cdi-produces-disposes/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-produces-disposes/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-produces-disposes/pom.xml (original)
+++ tomee/tomee/trunk/examples/cdi-produces-disposes/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/cdi-produces-disposes/src/test/java/org/superbiz/cdi/produces/disposes/LoggerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-produces-disposes/src/test/java/org/superbiz/cdi/produces/disposes/LoggerTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-produces-disposes/src/test/java/org/superbiz/cdi/produces/disposes/LoggerTest.java (original)
+++ tomee/tomee/trunk/examples/cdi-produces-disposes/src/test/java/org/superbiz/cdi/produces/disposes/LoggerTest.java Mon Apr 28 20:47:14 2014
@@ -23,7 +23,7 @@ import org.junit.Test;
import javax.ejb.embeddable.EJBContainer;
import javax.inject.Inject;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Modified: tomee/tomee/trunk/examples/cdi-produces-field/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-produces-field/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-produces-field/pom.xml (original)
+++ tomee/tomee/trunk/examples/cdi-produces-field/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/cdi-produces-field/src/test/java/org/superbiz/cdi/produces/field/LoggerTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-produces-field/src/test/java/org/superbiz/cdi/produces/field/LoggerTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-produces-field/src/test/java/org/superbiz/cdi/produces/field/LoggerTest.java (original)
+++ tomee/tomee/trunk/examples/cdi-produces-field/src/test/java/org/superbiz/cdi/produces/field/LoggerTest.java Mon Apr 28 20:47:14 2014
@@ -23,7 +23,7 @@ import org.junit.Test;
import javax.ejb.embeddable.EJBContainer;
import javax.inject.Inject;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Modified: tomee/tomee/trunk/examples/cdi-query/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-query/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-query/pom.xml (original)
+++ tomee/tomee/trunk/examples/cdi-query/pom.xml Mon Apr 28 20:47:14 2014
@@ -69,7 +69,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -86,7 +86,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/examples/cdi-query/src/test/java/org/superbiz/dynamic/CdiQueryTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-query/src/test/java/org/superbiz/dynamic/CdiQueryTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-query/src/test/java/org/superbiz/dynamic/CdiQueryTest.java (original)
+++ tomee/tomee/trunk/examples/cdi-query/src/test/java/org/superbiz/dynamic/CdiQueryTest.java Mon Apr 28 20:47:14 2014
@@ -30,7 +30,7 @@ import javax.naming.NamingException;
import java.util.Collection;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
/**
* the UserDao can be injected but doesn't manage transaction so we create
Modified: tomee/tomee/trunk/examples/cdi-realm/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-realm/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-realm/pom.xml (original)
+++ tomee/tomee/trunk/examples/cdi-realm/pom.xml Mon Apr 28 20:47:14 2014
@@ -33,7 +33,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/examples/cdi-request-scope/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-request-scope/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-request-scope/pom.xml (original)
+++ tomee/tomee/trunk/examples/cdi-request-scope/pom.xml Mon Apr 28 20:47:14 2014
@@ -22,7 +22,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>
@@ -47,7 +47,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/cdi-session-scope/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cdi-session-scope/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cdi-session-scope/pom.xml (original)
+++ tomee/tomee/trunk/examples/cdi-session-scope/pom.xml Mon Apr 28 20:47:14 2014
@@ -28,7 +28,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>
@@ -75,7 +75,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tomee/tomee/trunk/examples/change-jaxws-url/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/change-jaxws-url/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/change-jaxws-url/pom.xml (original)
+++ tomee/tomee/trunk/examples/change-jaxws-url/pom.xml Mon Apr 28 20:47:14 2014
@@ -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>
@@ -101,7 +101,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/change-jaxws-url/src/test/java/org/superbiz/jaxws/Rot13Test.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/change-jaxws-url/src/test/java/org/superbiz/jaxws/Rot13Test.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/change-jaxws-url/src/test/java/org/superbiz/jaxws/Rot13Test.java (original)
+++ tomee/tomee/trunk/examples/change-jaxws-url/src/test/java/org/superbiz/jaxws/Rot13Test.java Mon Apr 28 20:47:14 2014
@@ -24,14 +24,12 @@ import org.jboss.shrinkwrap.api.ArchiveP
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.net.URL;
-import static org.junit.Assert.assertThat;
-import static org.junit.internal.matchers.StringContains.containsString;
-
@RunWith(Arquillian.class)
public class Rot13Test {
@@ -41,13 +39,13 @@ public class Rot13Test {
@Deployment(testable = false)
public static WebArchive war() {
return ShrinkWrap.create(WebArchive.class)
- .addClass(Rot13.class)
- .addAsWebInfResource(new ClassLoaderAsset("META-INF/openejb-jar.xml"), ArchivePaths.create("openejb-jar.xml"));
+ .addClass(Rot13.class)
+ .addAsWebInfResource(new ClassLoaderAsset("META-INF/openejb-jar.xml"), ArchivePaths.create("openejb-jar.xml"));
}
@Test
public void checkWSDLIsDeployedWhereItIsConfigured() throws Exception {
final String wsdl = IO.slurp(new URL(url.toExternalForm() + "tool/rot13?wsdl"));
- assertThat(wsdl, containsString("Rot13"));
+ Assert.assertTrue(wsdl.contains("Rot13"));
}
}
Modified: tomee/tomee/trunk/examples/client-resource-lookup-preview/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/client-resource-lookup-preview/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/client-resource-lookup-preview/pom.xml (original)
+++ tomee/tomee/trunk/examples/client-resource-lookup-preview/pom.xml Mon Apr 28 20:47:14 2014
@@ -32,7 +32,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>
@@ -78,7 +78,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: tomee/tomee/trunk/examples/component-interfaces/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/component-interfaces/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/component-interfaces/pom.xml (original)
+++ tomee/tomee/trunk/examples/component-interfaces/pom.xml Mon Apr 28 20:47:14 2014
@@ -34,8 +34,8 @@
<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>
@@ -43,8 +43,8 @@
</plugin>
<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>
<!-- 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.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<!--
Modified: tomee/tomee/trunk/examples/cucumber-jvm/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/cucumber-jvm/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/cucumber-jvm/pom.xml (original)
+++ tomee/tomee/trunk/examples/cucumber-jvm/pom.xml Mon Apr 28 20:47:14 2014
@@ -33,7 +33,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>
@@ -58,7 +58,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<!-- The <scope>test</scope> guarantees that none of your runtime code
Modified: tomee/tomee/trunk/examples/custom-injection/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/custom-injection/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/custom-injection/pom.xml (original)
+++ tomee/tomee/trunk/examples/custom-injection/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/datasource-ciphered-password/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/datasource-ciphered-password/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/datasource-ciphered-password/pom.xml (original)
+++ tomee/tomee/trunk/examples/datasource-ciphered-password/pom.xml Mon Apr 28 20:47:14 2014
@@ -32,7 +32,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>
@@ -57,7 +57,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/datasource-ciphered-password/src/test/java/org/superbiz/DataSourceCipheredExampleTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/datasource-ciphered-password/src/test/java/org/superbiz/DataSourceCipheredExampleTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/datasource-ciphered-password/src/test/java/org/superbiz/DataSourceCipheredExampleTest.java (original)
+++ tomee/tomee/trunk/examples/datasource-ciphered-password/src/test/java/org/superbiz/DataSourceCipheredExampleTest.java Mon Apr 28 20:47:14 2014
@@ -30,7 +30,7 @@ import java.sql.DriverManager;
import java.sql.Statement;
import java.util.Properties;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
public class DataSourceCipheredExampleTest {
Modified: tomee/tomee/trunk/examples/datasource-definition/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/datasource-definition/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/datasource-definition/pom.xml (original)
+++ tomee/tomee/trunk/examples/datasource-definition/pom.xml Mon Apr 28 20:47:14 2014
@@ -56,8 +56,8 @@
</plugin>
<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>
@@ -68,8 +68,8 @@
</plugin>
<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>
<systemPropertyVariables>
<java.endorsed.dirs>${annotations.endorsed}</java.endorsed.dirs>
@@ -106,7 +106,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/decorators/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/decorators/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/decorators/pom.xml (original)
+++ tomee/tomee/trunk/examples/decorators/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/deltaspike-configproperty/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-configproperty/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-configproperty/pom.xml (original)
+++ tomee/tomee/trunk/examples/deltaspike-configproperty/pom.xml Mon Apr 28 20:47:14 2014
@@ -33,7 +33,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>
@@ -68,7 +68,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<!-- The <scope>test</scope> guarantees that none of your runtime code
Modified: tomee/tomee/trunk/examples/deltaspike-exception-handling/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-exception-handling/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-exception-handling/pom.xml (original)
+++ tomee/tomee/trunk/examples/deltaspike-exception-handling/pom.xml Mon Apr 28 20:47:14 2014
@@ -33,7 +33,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>
@@ -68,7 +68,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<!-- The <scope>test</scope> guarantees that none of your runtime code
Propchange: tomee/tomee/trunk/examples/deltaspike-fullstack/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr 28 20:47:14 2014
@@ -0,0 +1 @@
+target
Modified: tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml (original)
+++ tomee/tomee/trunk/examples/deltaspike-fullstack/pom.xml Mon Apr 28 20:47:14 2014
@@ -12,7 +12,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.superbiz</groupId>
- <artifactId>deltaspike-stack001</artifactId>
+ <artifactId>deltaspike-fullstack</artifactId>
<name>OpenEJB :: Examples :: JSF2/CDI/BV/JPA/DeltaSpike</name>
<version>1.0-SNAPSHOT</version>
@@ -31,7 +31,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/examples/deltaspike-i18n/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/deltaspike-i18n/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/deltaspike-i18n/pom.xml (original)
+++ tomee/tomee/trunk/examples/deltaspike-i18n/pom.xml Mon Apr 28 20:47:14 2014
@@ -33,7 +33,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>
@@ -68,7 +68,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<!-- The <scope>test</scope> guarantees that none of your runtime code
Modified: tomee/tomee/trunk/examples/dynamic-dao-implementation/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/dynamic-dao-implementation/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/dynamic-dao-implementation/pom.xml (original)
+++ tomee/tomee/trunk/examples/dynamic-dao-implementation/pom.xml Mon Apr 28 20:47:14 2014
@@ -32,7 +32,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>
@@ -57,7 +57,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/dynamic-dao-implementation/src/test/java/org/superbiz/dynamic/DynamicUserDaoTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/dynamic-dao-implementation/src/test/java/org/superbiz/dynamic/DynamicUserDaoTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/dynamic-dao-implementation/src/test/java/org/superbiz/dynamic/DynamicUserDaoTest.java (original)
+++ tomee/tomee/trunk/examples/dynamic-dao-implementation/src/test/java/org/superbiz/dynamic/DynamicUserDaoTest.java Mon Apr 28 20:47:14 2014
@@ -16,7 +16,7 @@
*/
package org.superbiz.dynamic;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -32,9 +32,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
public class DynamicUserDaoTest {
Modified: tomee/tomee/trunk/examples/dynamic-datasource-routing/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/dynamic-datasource-routing/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/dynamic-datasource-routing/pom.xml (original)
+++ tomee/tomee/trunk/examples/dynamic-datasource-routing/pom.xml Mon Apr 28 20:47:14 2014
@@ -32,7 +32,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>
@@ -57,7 +57,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/dynamic-implementation/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/dynamic-implementation/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/dynamic-implementation/pom.xml (original)
+++ tomee/tomee/trunk/examples/dynamic-implementation/pom.xml Mon Apr 28 20:47:14 2014
@@ -31,7 +31,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>
@@ -61,7 +61,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/dynamic-implementation/src/test/java/org/superbiz/dynamic/SocialTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/dynamic-implementation/src/test/java/org/superbiz/dynamic/SocialTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/dynamic-implementation/src/test/java/org/superbiz/dynamic/SocialTest.java (original)
+++ tomee/tomee/trunk/examples/dynamic-implementation/src/test/java/org/superbiz/dynamic/SocialTest.java Mon Apr 28 20:47:14 2014
@@ -22,7 +22,7 @@ import org.junit.Test;
import javax.ejb.embeddable.EJBContainer;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
public class SocialTest {
Modified: tomee/tomee/trunk/examples/dynamic-proxy-to-access-mbean/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/dynamic-proxy-to-access-mbean/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/dynamic-proxy-to-access-mbean/pom.xml (original)
+++ tomee/tomee/trunk/examples/dynamic-proxy-to-access-mbean/pom.xml Mon Apr 28 20:47:14 2014
@@ -30,8 +30,8 @@
<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>
@@ -39,8 +39,8 @@
</plugin>
<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>
<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.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
Modified: tomee/tomee/trunk/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClientTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClientTest.java?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClientTest.java (original)
+++ tomee/tomee/trunk/examples/dynamic-proxy-to-access-mbean/src/test/java/org/superbiz/dynamic/mbean/DynamicMBeanClientTest.java Mon Apr 28 20:47:14 2014
@@ -30,7 +30,7 @@ import javax.management.Attribute;
import javax.management.ObjectName;
import java.lang.management.ManagementFactory;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
public class DynamicMBeanClientTest {
Modified: tomee/tomee/trunk/examples/ear-testing/business-logic/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ear-testing/business-logic/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ear-testing/business-logic/pom.xml (original)
+++ tomee/tomee/trunk/examples/ear-testing/business-logic/pom.xml Mon Apr 28 20:47:14 2014
@@ -67,7 +67,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/ear-testing/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ear-testing/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ear-testing/pom.xml (original)
+++ tomee/tomee/trunk/examples/ear-testing/pom.xml Mon Apr 28 20:47:14 2014
@@ -47,8 +47,8 @@
<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>
@@ -56,8 +56,8 @@
</plugin>
<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>
</plugin>
</plugins>
</pluginManagement>
@@ -72,7 +72,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified: tomee/tomee/trunk/examples/ejb-examples/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-examples/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-examples/pom.xml (original)
+++ tomee/tomee/trunk/examples/ejb-examples/pom.xml Mon Apr 28 20:47:14 2014
@@ -41,13 +41,13 @@
<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>
</plugin>
<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>
@@ -83,7 +83,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tomee/tomee/trunk/examples/ejb-webservice/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/ejb-webservice/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/ejb-webservice/pom.xml (original)
+++ tomee/tomee/trunk/examples/ejb-webservice/pom.xml Mon Apr 28 20:47:14 2014
@@ -41,13 +41,13 @@
<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>
</plugin>
<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>
@@ -65,7 +65,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: tomee/tomee/trunk/examples/groovy-jpa/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/groovy-jpa/pom.xml?rev=1590787&r1=1590786&r2=1590787&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/groovy-jpa/pom.xml (original)
+++ tomee/tomee/trunk/examples/groovy-jpa/pom.xml Mon Apr 28 20:47:14 2014
@@ -38,7 +38,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.0</version>
+ <version>3.1</version>
<configuration>
<compilerId>groovy-eclipse-compiler</compilerId>
<source>1.6</source>
@@ -83,7 +83,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
+ <version>4.11</version>
<scope>test</scope>
</dependency>
<dependency>