Manual merge of #555 changes to master (pom.xml's won't auto-merge)

Author: cowtowncoder

avro/pom.xml

@@ -63,6 +63,15 @@ abstractions.
       <artifactId>assertj-core</artifactId>
       <scope>test</scope>
     </dependency>
+
+    <!-- 14-Jan-2025, joohyukkim: [JSTEP-10] Most tests have been migrated to
+          JUnit5, but except `avro` modules `/interop` tests
+     -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

ion/src/test/java/tools/jackson/dataformat/ion/PrettyPrintWriteTest.java

@@ -1,12 +1,14 @@
 package tools.jackson.dataformat.ion;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
 import tools.jackson.databind.SerializationFeature;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 // For [dataformats-binary#245]: no pretty-printing for textual format
 public class PrettyPrintWriteTest
 {
@@ -24,17 +26,17 @@ public void testBasicPrettyPrintTextual() throws Exception
         IonObjectMapper mapper = IonObjectMapper.builder(IonFactory.forTextualWriters()).build();
         String ion = mapper.writerWithDefaultPrettyPrinter()
                 .writeValueAsString(new Point());
-        Assert.assertEquals(EXP, ion.trim());
+        assertEquals(EXP, ion.trim());
 
         ion = mapper.writer()
                 .with(SerializationFeature.INDENT_OUTPUT)
                 .writeValueAsString(new Point());
-        Assert.assertEquals(EXP, ion.trim());
+        assertEquals(EXP, ion.trim());
 
         // But also no indentation if not requested
         ion = mapper.writer()
                 .writeValueAsString(new Point());
-        Assert.assertEquals("{x:1,y:2}", ion.trim());
+        assertEquals("{x:1,y:2}", ion.trim());
     }
 
     // and with binary format, should simply be no-op
@@ -43,6 +45,6 @@ public void testIgnorePrettyPrintForBinary() throws Exception
     {
         IonObjectMapper mapper = IonObjectMapper.builder(IonFactory.forBinaryWriters()).build();
         byte[] encoded = mapper.writerWithDefaultPrettyPrinter().writeValueAsBytes(new Point());
-        Assert.assertNotNull(encoded);
+        assertNotNull(encoded);
     }
 }

ion/src/test/java/tools/jackson/dataformat/ion/SimpleIonReadTest.java

@@ -16,12 +16,14 @@
 
 import java.io.*;
 
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
 
 import tools.jackson.core.JsonParser;
 import tools.jackson.core.JsonToken;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 public class SimpleIonReadTest {
     private final IonObjectMapper MAPPER = new IonObjectMapper();
 

pom.xml

@@ -63,12 +63,6 @@
       <artifactId>jackson-core</artifactId>
     </dependency>
 
-    <!-- 20-Apr-2024, tatu: JUnit4 no longer from jackson-base, so: -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
     <!-- 11-Jan-2025, joohyukkim: For JSTEP-10, migrate to JUnit5 -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>