From 02e13e4cf0f7056aa2c5d155eb475043548f71f7 Mon Sep 17 00:00:00 2001
From: Paulo Lobo <pauloeduardolobo@gmail.com>
Date: Sun, 27 Jan 2019 22:00:06 -0200
Subject: [PATCH] For #939: Corrected todo

---
 pom.xml                                          |  5 +++++
 qulice-maven-plugin/pom.xml                      | 16 +++++++---------
 .../java/com/qulice/maven/CheckMojoTest.java     |  2 +-
 .../maven/DefaultMavenEnvironmentTest.java       |  2 +-
 .../maven/DefaultValidatorsProviderTest.java     |  2 +-
 .../qulice/maven/DependenciesValidatorTest.java  |  4 ++--
 .../com/qulice/maven/PomXpathValidatorTest.java  |  2 +-
 .../qulice/maven/SvnPropertiesValidatorTest.java |  3 +--
 8 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index e6394a96b..2bbe1af40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,11 @@
                 <artifactId>commons-lang3</artifactId>
                 <version>3.7</version>
             </dependency>
+            <!--
+            @todo #939:30min Upgrade to Junit5. Continue to upgrade to Junit5
+             updating qulice-maven-plugin sub-module and removing remaining
+             junit4 tags.
+            -->
             <dependency>
                 <groupId>org.junit.jupiter</groupId>
                 <artifactId>junit-jupiter-api</artifactId>
diff --git a/qulice-maven-plugin/pom.xml b/qulice-maven-plugin/pom.xml
index 0f2780f30..9bac6b497 100644
--- a/qulice-maven-plugin/pom.xml
+++ b/qulice-maven-plugin/pom.xml
@@ -178,6 +178,12 @@
             <artifactId>maven-plugin-testing-harness</artifactId>
             <version>3.1.0</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>junit</groupId>
+                    <artifactId>junit</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
@@ -218,14 +224,6 @@
             <version>5.0.0.Final</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -262,7 +260,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-plugin-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.4</version>
                 <configuration>
                     <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
                 </configuration>
diff --git a/qulice-maven-plugin/src/test/java/com/qulice/maven/CheckMojoTest.java b/qulice-maven-plugin/src/test/java/com/qulice/maven/CheckMojoTest.java
index f19c503e2..8b4806399 100644
--- a/qulice-maven-plugin/src/test/java/com/qulice/maven/CheckMojoTest.java
+++ b/qulice-maven-plugin/src/test/java/com/qulice/maven/CheckMojoTest.java
@@ -35,7 +35,7 @@
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.context.Context;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.mockito.Mockito;
 
 /**
diff --git a/qulice-maven-plugin/src/test/java/com/qulice/maven/DefaultMavenEnvironmentTest.java b/qulice-maven-plugin/src/test/java/com/qulice/maven/DefaultMavenEnvironmentTest.java
index fa6a356cb..83b7e27af 100644
--- a/qulice-maven-plugin/src/test/java/com/qulice/maven/DefaultMavenEnvironmentTest.java
+++ b/qulice-maven-plugin/src/test/java/com/qulice/maven/DefaultMavenEnvironmentTest.java
@@ -34,7 +34,7 @@
 import org.apache.maven.project.MavenProject;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.mockito.Mockito;
 
 /**
diff --git a/qulice-maven-plugin/src/test/java/com/qulice/maven/DefaultValidatorsProviderTest.java b/qulice-maven-plugin/src/test/java/com/qulice/maven/DefaultValidatorsProviderTest.java
index ef12a9de5..d9a68f87e 100644
--- a/qulice-maven-plugin/src/test/java/com/qulice/maven/DefaultValidatorsProviderTest.java
+++ b/qulice-maven-plugin/src/test/java/com/qulice/maven/DefaultValidatorsProviderTest.java
@@ -32,7 +32,7 @@
 import com.qulice.spi.Environment;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 /**
  * Test case for {@link ValidatorsProvider} class.
diff --git a/qulice-maven-plugin/src/test/java/com/qulice/maven/DependenciesValidatorTest.java b/qulice-maven-plugin/src/test/java/com/qulice/maven/DependenciesValidatorTest.java
index 0bd9f1a78..917719e71 100644
--- a/qulice-maven-plugin/src/test/java/com/qulice/maven/DependenciesValidatorTest.java
+++ b/qulice-maven-plugin/src/test/java/com/qulice/maven/DependenciesValidatorTest.java
@@ -39,7 +39,7 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalysis;
 import org.apache.maven.shared.dependency.analyzer.ProjectDependencyAnalyzer;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 import org.mockito.Mockito;
 
 /**
@@ -89,7 +89,7 @@ public void passesIfNoDependencyProblemsFound() throws Exception {
      * DependencyValidator can catch dependency problems.
      * @throws Exception If something wrong happens inside
      */
-    @org.junit.Test(expected = ValidationException.class)
+    @Test(expected = ValidationException.class)
     public void catchesDependencyProblemsAndThrowsException() throws Exception {
         final ProjectDependencyAnalysis analysis =
             Mockito.mock(ProjectDependencyAnalysis.class);
diff --git a/qulice-maven-plugin/src/test/java/com/qulice/maven/PomXpathValidatorTest.java b/qulice-maven-plugin/src/test/java/com/qulice/maven/PomXpathValidatorTest.java
index 265eae669..bf5ae735c 100644
--- a/qulice-maven-plugin/src/test/java/com/qulice/maven/PomXpathValidatorTest.java
+++ b/qulice-maven-plugin/src/test/java/com/qulice/maven/PomXpathValidatorTest.java
@@ -35,7 +35,7 @@
 import org.apache.commons.io.FileUtils;
 import org.cactoos.io.ResourceOf;
 import org.cactoos.text.TextOf;
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 /**
  * Test case for {@link PomXpathValidator} class.
diff --git a/qulice-maven-plugin/src/test/java/com/qulice/maven/SvnPropertiesValidatorTest.java b/qulice-maven-plugin/src/test/java/com/qulice/maven/SvnPropertiesValidatorTest.java
index 75482d756..2e4acc971 100644
--- a/qulice-maven-plugin/src/test/java/com/qulice/maven/SvnPropertiesValidatorTest.java
+++ b/qulice-maven-plugin/src/test/java/com/qulice/maven/SvnPropertiesValidatorTest.java
@@ -29,8 +29,7 @@
  */
 package com.qulice.maven;
 
-
-import org.junit.jupiter.api.Test;
+import org.junit.Test;
 
 /**
  * Test case for {@link SvnPropertiesValidator}.