updated pom.xml with new junit dependency
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/67e228d5 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/67e228d5 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/67e228d5 Branch: refs/heads/master Commit: 67e228d5c57efee9894b2db41c6418ed275816fb Parents: 7d07e19 Author: renoth <[email protected]> Authored: Sat Sep 1 07:52:38 2018 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Sep 26 15:39:30 2018 +0300 ---------------------------------------------------------------------- .../main/resources/archetype-resources/pom.xml | 4 +-- pom.xml | 8 ------ testing/wicket-arquillian/pom.xml | 30 ++++++++++++++++++++ .../deployment/AbstractDeploymentTest.java | 21 +++++++------- testing/wicket-common-tests/pom.xml | 5 ++-- testing/wicket-threadtest/pom.xml | 5 ++-- wicket-bean-validation/pom.xml | 5 ++-- wicket-cdi/pom.xml | 5 ---- wicket-ioc/pom.xml | 5 ---- .../wicket-native-websocket-core/pom.xml | 5 ++-- .../wicket-native-websocket-javax/pom.xml | 5 ++++ .../handler/RedirectRequestHandlerTest.java | 4 +-- 12 files changed, 61 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml index b689f38..3d49b04 100644 --- a/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml +++ b/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml @@ -74,8 +74,8 @@ <!-- JUNIT DEPENDENCY FOR TESTING --> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> <version>${junit.version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index df3df06..cf61347 100644 --- a/pom.xml +++ b/pom.xml @@ -990,14 +990,6 @@ </includes> </configuration> - <dependencies> - <dependency> - <!-- force 4.7 runner to enable excludedGroups on Categories (& parallel) --> - <groupId>org.apache.maven.surefire</groupId> - <artifactId>surefire-junit47</artifactId> - <version>${maven.surefire.version}</version> - </dependency> - </dependencies> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/testing/wicket-arquillian/pom.xml ---------------------------------------------------------------------- diff --git a/testing/wicket-arquillian/pom.xml b/testing/wicket-arquillian/pom.xml index 10271b3..3c47b5e 100644 --- a/testing/wicket-arquillian/pom.xml +++ b/testing/wicket-arquillian/pom.xml @@ -107,6 +107,36 @@ <groupId>org.jboss.spec</groupId> <artifactId>jboss-javaee-7.0</artifactId> <type>pom</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.wildfly</groupId> + <artifactId>wildfly-weld</artifactId> + <version>${wildfly.version}</version> + <exclusions> + <exclusion> + <groupId>sun.jdk</groupId> + <artifactId>jconsole</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.wildfly.arquillian</groupId> + <artifactId>wildfly-arquillian-container-embedded</artifactId> + <version>2.1.0.Final</version> + <scope>test</scope> + </dependency> + + + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + <scope>test</scope> </dependency> <!-- Wicket CDI integration. --> <dependency> http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java ---------------------------------------------------------------------- diff --git a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java index cb3c3eb..1615def 100644 --- a/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java +++ b/testing/wicket-arquillian/src/test/java/org/apache/wicket/arquillian/testing/deployment/AbstractDeploymentTest.java @@ -16,17 +16,9 @@ */ package org.apache.wicket.arquillian.testing.deployment; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.File; -import java.util.Locale; - -import javax.servlet.ServletContext; - import org.apache.wicket.arquillian.testing.TestWicketJavaEEApplication; import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.util.SlowTests; +import org.apache.wicket.util.WicketTestTag; import org.apache.wicket.util.tester.WicketTester; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.shrinkwrap.api.Filters; @@ -36,10 +28,17 @@ import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; import org.jboss.shrinkwrap.api.importer.ExplodedImporter; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.jboss.shrinkwrap.resolver.api.maven.Maven; -import org.junit.experimental.categories.Category; +import org.junit.jupiter.api.Tag; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.ServletContext; +import java.io.File; +import java.util.Locale; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + /** * <b>WARNING: If this error occurs - org.jboss.arquillian.container.spi.client.container.LifecycleException: The server is already running! Managed containers do not support connecting to running server instances due to the possible harmful effect of connecting to the wrong server. Please stop server before running or change to another type of container. * To disable this check and allow Arquillian to connect to a running server, set allowConnectingToRunningServer to true in the container configuration.</b> @@ -52,7 +51,7 @@ import org.slf4j.LoggerFactory; * @since 06/23/2015 * */ -@Category(SlowTests.class) +@Tag(WicketTestTag.SLOW) public abstract class AbstractDeploymentTest { private static final Logger log = LoggerFactory.getLogger(AbstractDeploymentTest.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/testing/wicket-common-tests/pom.xml ---------------------------------------------------------------------- diff --git a/testing/wicket-common-tests/pom.xml b/testing/wicket-common-tests/pom.xml index 83079db..ecb8402 100644 --- a/testing/wicket-common-tests/pom.xml +++ b/testing/wicket-common-tests/pom.xml @@ -34,8 +34,9 @@ <dependencies> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.wicket</groupId> http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/testing/wicket-threadtest/pom.xml ---------------------------------------------------------------------- diff --git a/testing/wicket-threadtest/pom.xml b/testing/wicket-threadtest/pom.xml index 118c71a..132727e 100644 --- a/testing/wicket-threadtest/pom.xml +++ b/testing/wicket-threadtest/pom.xml @@ -82,8 +82,9 @@ <artifactId>jcl-over-slf4j</artifactId> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/wicket-bean-validation/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-bean-validation/pom.xml b/wicket-bean-validation/pom.xml index 77fa72c..f1240cd 100644 --- a/wicket-bean-validation/pom.xml +++ b/wicket-bean-validation/pom.xml @@ -25,8 +25,9 @@ <artifactId>wicket-core</artifactId> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>org.glassfish.web</groupId> http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/wicket-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-cdi/pom.xml b/wicket-cdi/pom.xml index 29de4bb..fb40f46 100644 --- a/wicket-cdi/pom.xml +++ b/wicket-cdi/pom.xml @@ -64,10 +64,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> <groupId>org.jglue.cdi-unit</groupId> <artifactId>cdi-unit</artifactId> <exclusions> @@ -77,7 +73,6 @@ </exclusion> </exclusions> </dependency> - </dependencies> <build> <pluginManagement> http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/wicket-ioc/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-ioc/pom.xml b/wicket-ioc/pom.xml index 5eaa0ab..d557623 100644 --- a/wicket-ioc/pom.xml +++ b/wicket-ioc/pom.xml @@ -60,11 +60,6 @@ <artifactId>asm-util</artifactId> </dependency> <dependency> - <groupId>org.jboss.weld.se</groupId> - <artifactId>weld-se-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/wicket-native-websocket/wicket-native-websocket-core/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-core/pom.xml b/wicket-native-websocket/wicket-native-websocket-core/pom.xml index 267746c..090faf1 100644 --- a/wicket-native-websocket/wicket-native-websocket-core/pom.xml +++ b/wicket-native-websocket/wicket-native-websocket-core/pom.xml @@ -37,8 +37,9 @@ </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/wicket-native-websocket/wicket-native-websocket-javax/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml index 6c1586b..ca24277 100644 --- a/wicket-native-websocket/wicket-native-websocket-javax/pom.xml +++ b/wicket-native-websocket/wicket-native-websocket-javax/pom.xml @@ -38,6 +38,11 @@ <artifactId>javax.websocket-api</artifactId> </dependency> <dependency> + <groupId>org.junit.jupiter</groupId> + <artifactId>junit-jupiter-engine</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.wicket</groupId> <artifactId>wicket-core</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/wicket/blob/67e228d5/wicket-request/src/test/java/org/apache/wicket/request/http/handler/RedirectRequestHandlerTest.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/test/java/org/apache/wicket/request/http/handler/RedirectRequestHandlerTest.java b/wicket-request/src/test/java/org/apache/wicket/request/http/handler/RedirectRequestHandlerTest.java index ef917d3..bc200fe 100644 --- a/wicket-request/src/test/java/org/apache/wicket/request/http/handler/RedirectRequestHandlerTest.java +++ b/wicket-request/src/test/java/org/apache/wicket/request/http/handler/RedirectRequestHandlerTest.java @@ -16,13 +16,13 @@ */ package org.apache.wicket.request.http.handler; -import javax.servlet.http.HttpServletResponse; - import org.apache.wicket.request.IRequestCycle; import org.apache.wicket.request.http.WebResponse; import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import javax.servlet.http.HttpServletResponse; + /** * RedirectRequestHandlerTest */
