Update to junit5 and mockito

fabric8io · May 25, 2022 · 3dd6acd · 3dd6acd
1 parent ddf3029
commit 3dd6acd
Show file tree

Hide file tree

Showing 108 changed files with 5,662 additions and 6,842 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -41,9 +41,7 @@ jobs:
     - run:
         command: |
           mvn clean install -DskipTests
-          PROJECT_VERSION=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
           cd it/
-          find . -type f -exec sed -i 's/0.40-SNAPSHOT/'"$PROJECT_VERSION"'/g' {} +
           mvn clean install
     - save_cache:
         key: dmp-{{ checksum "pom.xml" }}

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -12,6 +12,8 @@
   <packaging>pom</packaging>
 
   <properties>
+    <maven.compiler.source>8</maven.compiler.source>
+    <maven.compiler.target>8</maven.compiler.target>
     <maven.version>3.3.9</maven.version>
 
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,6 +44,11 @@
           <version>3.3.0</version>
         </plugin>
 
+        <plugin>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.1</version>
+        </plugin>
+
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
           <version>2.8.2</version>
@@ -105,6 +112,11 @@
           <version>3.0.0-M2</version>
         </plugin>
 
+        <plugin>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>3.3.1</version>
+        </plugin>
+
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>exec-maven-plugin</artifactId>
@@ -127,28 +139,4 @@
     </pluginManagement>
   </build>
 
-  <profiles>
-    <profile>
-      <id>java8</id>
-      <activation>
-        <jdk>1.8</jdk>
-      </activation>
-      <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-      </properties>
-    </profile>
-    <profile>
-      <id>java1</id>
-      <activation>
-        <jdk>[11,]</jdk>
-      </activation>
-      <properties>
-        <maven.compiler.release>11</maven.compiler.release>
-        <maven.compiler.source>${maven.compiler.release}</maven.compiler.source>
-        <maven.compiler.target>${maven.compiler.release}</maven.compiler.target>
-      </properties>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/pom.xml b/pom.xml
@@ -38,6 +38,7 @@
       </roles>
     </developer>
   </developers>
+
   <prerequisites>
     <maven>3.0.3</maven>
   </prerequisites>
@@ -68,14 +69,17 @@
   </distributionManagement>
 
   <properties>
-    <excludedGroups>io.fabric8.maven.docker.UnixOnlyTests</excludedGroups>
+    <byte-buddy.version>1.12.10</byte-buddy.version>
     <httpclient.version>4.5.13</httpclient.version>
     <jib-core.version>0.18.0</jib-core.version>
     <jmockit.version>1.43</jmockit.version>
+    <junit.jupiter.version>5.8.2</junit.jupiter.version>
     <maven.version>3.3.9</maven.version>
+    <mockito.version>4.5.1</mockito.version>
     <project.build.outputTimestamp>2020-11-14T11:57:00Z</project.build.outputTimestamp>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <surefire.version>3.0.0-M2</surefire.version>
+    <system-stubs.version>2.0.1</system-stubs.version>
   </properties>
 
   <dependencies>
@@ -86,13 +90,6 @@
       <version>0.38.17</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.github.stefanbirkner</groupId>
-      <artifactId>system-rules</artifactId>
-      <version>1.19.0</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>com.google.cloud.tools</groupId>
       <artifactId>jib-core</artifactId>
@@ -112,9 +109,9 @@
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <groupId>net.bytebuddy</groupId>
+      <artifactId>byte-buddy-agent</artifactId>
+      <version>${byte-buddy.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -136,8 +133,6 @@
       <version>1.1</version>
     </dependency>
 
-    <!-- =============================================================================== -->
-
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpclient</artifactId>
@@ -164,6 +159,7 @@
       <version>${maven.version}</version>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
@@ -195,13 +191,6 @@
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <version>2.6.0</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcpkix-jdk15on</artifactId>
@@ -234,26 +223,45 @@
       <version>1.16</version>
     </dependency>
 
-    <!-- =============================================================================== -->
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>${junit.jupiter.version}</version>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>1.3</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>${junit.jupiter.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.jmockit</groupId>
-      <artifactId>jmockit</artifactId>
-      <version>${jmockit.version}</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>${junit.jupiter.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.skyscreamer</groupId>
-      <artifactId>jsonassert</artifactId>
-      <version>1.5.0</version>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-inline</artifactId>
+      <version>${mockito.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <version>${mockito.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -271,11 +279,19 @@
     </dependency>
 
     <dependency>
-      <groupId>pl.pragmatists</groupId>
-      <artifactId>JUnitParams</artifactId>
-      <version>1.1.0</version>
+      <groupId>uk.org.webcompere</groupId>
+      <artifactId>system-stubs-core</artifactId>
+      <version>${system-stubs.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>uk.org.webcompere</groupId>
+      <artifactId>system-stubs-jupiter</artifactId>
+      <version>${system-stubs.version}</version>
       <scope>test</scope>
     </dependency>
+
   </dependencies>
 
   <build>
@@ -299,28 +315,25 @@
         </plugin>
 
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>3.2.0</version>
         </plugin>
+
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
           <version>3.0.0-M1</version>
         </plugin>
 
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
           <version>3.2.0</version>
         </plugin>
 
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>${surefire.version}</version>
           <configuration>
-            <argLine>-javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit.version}/jmockit-${jmockit.version}.jar</argLine>
+            <argLine>-javaagent:${settings.localRepository}/net/bytebuddy/byte-buddy-agent/${byte-buddy.version}/byte-buddy-agent-${byte-buddy.version}.jar</argLine>
           </configuration>
         </plugin>
 
@@ -365,7 +378,6 @@
       </plugin>
 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
         <version>3.6.0</version>
         <configuration>
@@ -576,6 +588,7 @@
               </systemPropertyVariables>
             </configuration>
           </plugin>
+
           <plugin>
             <groupId>org.jacoco</groupId>
             <artifactId>jacoco-maven-plugin</artifactId>
@@ -645,17 +658,7 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>unix-test</id>
-      <activation>
-        <os>
-          <family>unix</family>
-        </os>
-      </activation>
-      <properties>
-        <excludedGroups></excludedGroups>
-      </properties>
-    </profile>
+
     <profile>
       <id>sonar</id>
       <properties>

diff --git a/src/main/java/io/fabric8/maven/docker/AbstractDockerMojo.java b/src/main/java/io/fabric8/maven/docker/AbstractDockerMojo.java
@@ -207,7 +207,7 @@ public abstract class AbstractDockerMojo extends AbstractMojo implements Context
      * Image configurations configured directly.
      */
     @Parameter
-    private List<ImageConfiguration> images;
+    List<ImageConfiguration> images;
 
     /**
      * Image configurations configured via maps to allow overriding.
@@ -227,7 +227,7 @@ public abstract class AbstractDockerMojo extends AbstractMojo implements Context
 
     // Images resolved with external image resolvers and hooks for subclass to
     // mangle the image configurations.
-    private List<ImageConfiguration> resolvedImages;
+    List<ImageConfiguration> resolvedImages;
 
     // Handler dealing with authentication credentials
     AuthConfigFactory authConfigFactory;

diff --git a/src/main/java/io/fabric8/maven/docker/CopyMojo.java b/src/main/java/io/fabric8/maven/docker/CopyMojo.java
@@ -52,22 +52,22 @@ public class CopyMojo extends AbstractDockerMojo {
      * Whether to create containers or to copy from existing containers.
      */
     @Parameter(property = "docker.createContainers", defaultValue = "false")
-    private boolean createContainers;
+    boolean createContainers;
 
     @Parameter(property = "docker.pull.registry")
-    private String pullRegistry;
+    String pullRegistry;
 
     /**
      * Naming pattern for how to name containers when created.
      */
     @Parameter(property = "docker.containerNamePattern")
-    private String containerNamePattern = ContainerNamingUtil.DEFAULT_CONTAINER_NAME_PATTERN;
+    String containerNamePattern = ContainerNamingUtil.DEFAULT_CONTAINER_NAME_PATTERN;
 
     /**
      * Whether to copy from all containers matching configured images or only from the newest ones.
      */
     @Parameter(property = "docker.copyAll", defaultValue = "false")
-    private boolean copyAll;
+    boolean copyAll;
 
     @Override
     protected void executeInternal(ServiceHub hub) throws IOException, MojoExecutionException {

diff --git a/src/main/java/io/fabric8/maven/docker/PushMojo.java b/src/main/java/io/fabric8/maven/docker/PushMojo.java
@@ -23,7 +23,7 @@ public class PushMojo extends AbstractDockerMojo {
     private String pushRegistry;
 
     @Parameter(property = "docker.skip.push", defaultValue = "false")
-    private boolean skipPush;
+    boolean skipPush;
 
     /** 
      * Skip building tags

diff --git a/src/main/java/io/fabric8/maven/docker/RemoveMojo.java b/src/main/java/io/fabric8/maven/docker/RemoveMojo.java
@@ -54,19 +54,19 @@ public class RemoveMojo extends AbstractDockerMojo {
     // Should all configured images should be removed?
     @Parameter(property = "docker.removeAll")
     @Deprecated
-    private Boolean removeAll;
+    Boolean removeAll;
 
     @Parameter(property = "docker.removeMode")
-    private String removeMode;
+    String removeMode;
 
     /** 
      * Skip building tags
      */
     @Parameter(property = "docker.skip.tag", defaultValue = "false")
-    private boolean skipTag;
+    boolean skipTag;
 
     @Parameter(property = "docker.removeNamePattern")
-    private String removeNamePattern;
+    String removeNamePattern;
 
     @Override
     protected void executeInternal(ServiceHub hub) throws DockerAccessException, MojoExecutionException {