update to junit jupiter 5.2.0

Author: stefanseifert

parent_toplevel/pom.xml

@@ -25,7 +25,7 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>19</version>
+    <version>20-SNAPSHOT</version>
     <relativePath />
   </parent>
 
@@ -88,14 +88,6 @@
     <site.url>http://devops.wcm.io</site.url>
     <site.deploy.id>ssh-wcm.io</site.deploy.id>
     <site.deploy.url />
-    
-    <!-- junit5 versions -->
-    <org.junit.jupiter.version>5.0.2</org.junit.jupiter.version>
-    <org.junit.vintage.version>4.12.2</org.junit.vintage.version>
-    <org.junit.platform.version>1.0.2</org.junit.platform.version>
-
-    <!-- we'll have to switch back to 2.19.1 because JUnit 5 provider is not yet compatbile with surefire 2.20/2.20.1 - see https://github.com/junit-team/junit5-samples/pull/27 -->
-    <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
 
   </properties>
 
@@ -112,23 +104,21 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <!-- Required to run tests in an IDE that bundles an older version - also required for Eclipse 4.7 -->
-    <dependency>
-      <groupId>org.junit.platform</groupId>
-      <artifactId>junit-platform-launcher</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-      <scope>test</scope>
-    </dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-params</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<scope>test</scope>
+		</dependency>
 
   </dependencies>
   <dependencyManagement>
@@ -167,30 +157,13 @@
         <artifactId>mockito-core</artifactId>
         <version>2.13.0</version>
       </dependency>
-
-      <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-api</artifactId>
-        <version>${org.junit.jupiter.version}</version>
-      </dependency>
-  
-      <!-- Required when the project contains JUnit 4 tests -->
-      <dependency>
-        <groupId>org.junit.vintage</groupId>
-        <artifactId>junit-vintage-engine</artifactId>
-        <version>${org.junit.vintage.version}</version>
-      </dependency>
-
-      <!-- Required to run tests in an IDE that bundles an older version - also required for Eclipse 4.7 -->
-      <dependency>
-        <groupId>org.junit.platform</groupId>
-        <artifactId>junit-platform-launcher</artifactId>
-        <version>${org.junit.platform.version}</version>
-      </dependency>
+      <!-- Import all JUnit 5 dependencies -->
       <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-engine</artifactId>
-        <version>${org.junit.jupiter.version}</version>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.2.0</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
 
     </dependencies>
@@ -312,25 +285,6 @@
           </dependencies>
         </plugin>
 
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-
-          <!-- TODO: move this to global-parent once the surefire-junit5 integration is stable? -->
-          <dependencies>
-            <dependency>
-              <groupId>org.junit.platform</groupId>
-              <artifactId>junit-platform-surefire-provider</artifactId>
-              <version>${org.junit.platform.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.junit.jupiter</groupId>
-              <artifactId>junit-jupiter-engine</artifactId>
-              <version>${org.junit.jupiter.version}</version>
-            </dependency>
-          </dependencies>
-        </plugin>
-
       </plugins>
 
     </pluginManagement>