Update JUnit to 5.3.1 Mark it as optional to prevent issues in OSGi environment
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5dcf63dd Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5dcf63dd Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5dcf63dd Branch: refs/heads/WICKET-6563 Commit: 5dcf63dd7ff5d1e0b1692836e76986199686ee97 Parents: 5d97035 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Wed Sep 26 16:53:54 2018 +0300 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Wed Sep 26 16:53:54 2018 +0300 ---------------------------------------------------------------------- pom.xml | 5 ++++- .../src/main/java/org/apache/wicket/util/WicketTestTag.java | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/5dcf63dd/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index bd8de55..c5b5d9c 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ <cglib.version>3.2.8</cglib.version> <jacoco.version>0.8.2</jacoco.version> <jetty.version>9.4.12.v20180830</jetty.version> - <junit.version>5.2.0</junit.version> + <junit.version>5.3.1</junit.version> <spring.version>5.1.0.RELEASE</spring.version> <servlet-api.version>3.1.0</servlet-api.version> <maven.javadoc.version>3.0.1</maven.javadoc.version> @@ -559,18 +559,21 @@ <artifactId>junit-jupiter-engine</artifactId> <version>${junit.version}</version> <scope>test</scope> + <optional>true</optional> </dependency> <dependency> <groupId>org.junit.jupiter</groupId> <artifactId>junit-jupiter-params</artifactId> <version>${junit.version}</version> <scope>test</scope> + <optional>true</optional> </dependency> <dependency> <groupId>org.junit.vintage</groupId> <artifactId>junit-vintage-engine</artifactId> <version>${junit.version}</version> <scope>test</scope> + <optional>true</optional> </dependency> <dependency> <groupId>org.mockito</groupId> http://git-wip-us.apache.org/repos/asf/wicket/blob/5dcf63dd/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java b/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java index cf92bca..5c4e7e7 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/WicketTestTag.java @@ -21,5 +21,6 @@ package org.apache.wicket.util; * Used to mark slow running tests which are not executed with Maven profile 'fast' */ public interface WicketTestTag { - public static final String SLOW = "SLOW"; + + String SLOW = "SLOW"; }
