Remove remaining JUnit 4 tests. upgrade compiler target version

confectory-core/pom.xml

@@ -36,7 +36,7 @@
         <jsonmerge.version>1.2.1</jsonmerge.version>
         <json-path.version>2.9.0</json-path.version>
         <json-smart.version>2.5.0</json-smart.version>
-        <performetrics.version>2.4.0</performetrics.version>
+        <performetrics.version>2.5.0</performetrics.version>
         <objenesis.version>3.3</objenesis.version>
     </properties>
 

confectory-core/src/test/java/net/obvj/confectory/ConfigurationContainerTest.java

@@ -19,7 +19,7 @@
 import static org.hamcrest.CoreMatchers.either;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Properties;
 

confectory-core/src/test/java/net/obvj/confectory/ConfigurationSourceExceptionTest.java

@@ -41,7 +41,7 @@ void constructor_validMessage_validMessageAndNoCause()
         },
         throwsException(ConfigurationSourceException.class)
                 .withMessage(DETAILED_MESSAGE1)
-                .withCause(null));
+                        .withNoCause());
     }
 
     @Test

confectory-core/src/test/java/net/obvj/confectory/ConfigurationTest.java

@@ -20,9 +20,9 @@
 import static net.obvj.junit.utils.matchers.AdvancedMatchers.throwsException;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
 
 import java.util.Arrays;
 import java.util.HashSet;

confectory-core/src/test/java/net/obvj/confectory/mapper/INIToJSONObjectMapperTest.java

@@ -19,7 +19,7 @@
 import static net.obvj.junit.utils.matchers.AdvancedMatchers.throwsException;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

confectory-core/src/test/java/net/obvj/confectory/mapper/INIToObjectMapperTest.java

@@ -21,8 +21,8 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

confectory-core/src/test/java/net/obvj/confectory/merger/PropertiesConfigurationMergerTest.java

@@ -19,9 +19,10 @@
 import static net.obvj.junit.utils.matchers.AdvancedMatchers.throwsException;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.mockito.Mockito.*;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.mockito.Mockito.when;
+
 import java.util.Properties;
 
 import org.junit.jupiter.api.Test;

confectory-core/src/test/java/net/obvj/confectory/source/AbstractSourceTest.java

@@ -16,7 +16,7 @@
 
 package net.obvj.confectory.source;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import java.util.Arrays;

confectory-core/src/test/java/net/obvj/confectory/source/DummySourceTest.java

@@ -18,7 +18,7 @@
 
 import static net.obvj.junit.utils.matchers.AdvancedMatchers.throwsException;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 import java.util.Arrays;

confectory-core/src/test/java/net/obvj/confectory/source/DynamicSourceTest.java

@@ -20,7 +20,9 @@
 import static net.obvj.junit.utils.matchers.AdvancedMatchers.throwsException;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.*;
 
 import java.io.FileNotFoundException;

confectory-core/src/test/java/net/obvj/confectory/util/ParseExceptionTest.java

@@ -41,7 +41,7 @@ void constructor_validMessage_validMessageAndNoCause()
         },
         throwsException(ParseException.class)
                 .withMessage(DETAILED_MESSAGE1)
-                .withCause(null));
+                .withNoCause());
     }
 
     @Test

pom.xml

@@ -46,8 +46,8 @@
     <properties>
 
         <!-- Global properties -->
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <!-- Compile dependencies -->