From ffb11fd98f82fa6151d7fc86fbfb241b718e55a5 Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Thu, 6 Sep 2018 07:36:12 +1000
Subject: [PATCH] Fix junit version in jetty-maven-plugin

---
 jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml    | 8 ++++----
 .../src/it/jetty-deploy-war-mojo-it/pom.xml               | 6 +++---
 .../jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml  | 7 ++++---
 .../jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml  | 7 ++++---
 .../src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml  | 8 ++++----
 .../jetty-simple-webapp/pom.xml                           | 7 ++++---
 .../it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml  | 6 +++---
 .../it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml    | 7 ++++---
 .../src/it/run-mojo-gwt-it/beer-server/pom.xml            | 6 +++---
 9 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml b/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml
index d0ec9a3b7d5..397663d132e 100644
--- a/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml
+++ b/jetty-maven-plugin/src/it/jetty-cdi-run-forked/pom.xml
@@ -28,9 +28,9 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -115,4 +115,4 @@
     </plugins>
   </build>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml
index 922f4e294b5..3f5bdeb270f 100644
--- a/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml
+++ b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml
@@ -25,9 +25,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml
index 4bc1474abf3..8f251f25620 100644
--- a/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml
+++ b/jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/pom.xml
@@ -42,11 +42,12 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
 
   <build>
diff --git a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml
index b9abdc035c9..6fe149d962c 100644
--- a/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml
+++ b/jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/pom.xml
@@ -44,11 +44,12 @@
 
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
 
   <build>
diff --git a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml
index ad1069296e6..97aa7933c44 100644
--- a/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml
+++ b/jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/pom.xml
@@ -44,10 +44,10 @@
       <scope>test</scope>
     </dependency>
 
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+     <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml
index 456c2232cde..9ded127e8c2 100644
--- a/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml
+++ b/jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/pom.xml
@@ -42,11 +42,12 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
 
   <build>
diff --git a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml
index 7bb4e40d157..350e013c70b 100644
--- a/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml
+++ b/jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/pom.xml
@@ -43,9 +43,9 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml
index 4aa97fefa17..8d7096ad978 100644
--- a/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml
+++ b/jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/pom.xml
@@ -41,11 +41,12 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
 
   <build>
diff --git a/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml b/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml
index be6cd2f74e0..2a394059626 100644
--- a/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml
+++ b/jetty-maven-plugin/src/it/run-mojo-gwt-it/beer-server/pom.xml
@@ -56,9 +56,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>@junit.version@</version>
       <scope>test</scope>
     </dependency>
     <dependency>