Merge branch 'refs/heads/develop'

Author: bbottema

modules/authenticated-socks-module/pom.xml

@@ -7,9 +7,8 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <!--suppress MavenPropertyInParent -->
         <version>8.8.4</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>authenticated-socks-module</artifactId>

modules/batch-module/pom.xml

@@ -7,9 +7,8 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <!--suppress MavenPropertyInParent -->
         <version>8.8.4</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>batch-module</artifactId>

modules/cli-module/pom.xml

@@ -7,9 +7,8 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <!--suppress MavenPropertyInParent -->
         <version>8.8.4</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>cli-module</artifactId>

modules/cli-module/src/test/java/org/simplejavamail/api/internal/clisupport/model/CliBuilderApiTypeTest.java

@@ -1,6 +1,6 @@
 package org.simplejavamail.api.internal.clisupport.model;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.simplejavamail.api.internal.clisupport.model.CliBuilderApiType.EMAIL;

modules/cli-module/src/test/java/org/simplejavamail/internal/clisupport/BuilderApiToPicocliCommandsMapperTest.java

@@ -1,6 +1,6 @@
 package org.simplejavamail.internal.clisupport;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;

modules/cli-module/src/test/java/org/simplejavamail/internal/clisupport/CliCommandLineConsumerTest.java

@@ -3,7 +3,7 @@
 import org.bbottema.javareflection.ClassUtils;
 import org.bbottema.javareflection.model.MethodModifier;
 import org.jetbrains.annotations.Nullable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

modules/cli-module/src/test/java/org/simplejavamail/internal/clisupport/CliDeclaredOptionSpecTest.java

@@ -1,7 +1,7 @@
 package org.simplejavamail.internal.clisupport;
 
 import org.jetbrains.annotations.NotNull;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.simplejavamail.api.internal.clisupport.model.CliDeclaredOptionSpec;
 
 import java.lang.reflect.Method;

modules/cli-module/src/test/java/org/simplejavamail/internal/clisupport/GenerateCliHelpTest.java

@@ -1,8 +1,8 @@
 package org.simplejavamail.internal.clisupport;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
@@ -12,14 +12,14 @@ public class GenerateCliHelpTest {
 	private PrintStream sysOut;
 	private final ByteArrayOutputStream outContent = new ByteArrayOutputStream();
 
-	@Before
+	@BeforeEach
 	public void setUpStreams() {
 		System.out.println("GenerateCliHelpTest.setUpStreams(): DISABLING System.out during CLI debug logging");
 		sysOut = System.out;
 		System.setOut(new PrintStream(outContent));
 	}
 
-	@After
+	@AfterEach
 	public void revertStreams() {
 		System.setOut(sysOut);
 	}

modules/core-module/pom.xml

@@ -7,9 +7,8 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <!--suppress MavenPropertyInParent -->
         <version>8.8.4</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>core-module</artifactId>

modules/core-test-module/pom.xml

@@ -7,9 +7,8 @@
     <parent>
         <groupId>org.simplejavamail</groupId>
         <artifactId>maven-master-project</artifactId>
-        <!--suppress MavenPropertyInParent -->
         <version>8.8.4</version>
-        <relativePath>../../</relativePath>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>core-test-module</artifactId>
@@ -37,12 +36,12 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.7</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.21.0</version>
+            <scope>compile</scope>
         </dependency>
     </dependencies>
 </project>