From ee58c28327303fda3e3e097d94f6beb254266da9 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Sat, 20 Apr 2024 18:27:29 -0700
Subject: [PATCH] Fix #68: change junit4 dep from regular to managed

---
 base/pom.xml              | 20 ++++++++------------
 release-notes/VERSION-2.x |  3 ++-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/base/pom.xml b/base/pom.xml
index ec8c0de..94041a1 100644
--- a/base/pom.xml
+++ b/base/pom.xml
@@ -35,18 +35,6 @@ of Jackson: application code should only rely on `jackson-bom`
     <project.build.outputTimestamp>2024-02-27T01:23:07Z</project.build.outputTimestamp>
   </properties>
 
-  <dependencies>
-    <dependency> <!-- all components use junit for testing -->
-      <!-- 19-Feb-2024, tatu: This is for JUnit4 and we'll be migrating
-	  to JUnit5 finally... so this will be dropped at some point
-	-->
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${version.junit}</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
   <dependencyManagement>
     <dependencies>
       <!-- JPMS Libraries-->
@@ -63,6 +51,14 @@ of Jackson: application code should only rely on `jackson-bom`
         <version>${version.assertj}</version>
         <scope>test</scope>
       </dependency>
+      <!-- JUnit4 still used for many components (but not core) -->
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${version.junit}</version>
+        <scope>test</scope>
+      </dependency>
+
       <!-- Starting to migrate to JUnit5 -->
       <dependency>
         <groupId>org.junit</groupId>
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index fd36b75..06feb6f 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -11,7 +11,8 @@ Jackson components (core, modules)
 
 2.18.0 (not yet released)
 
-No changes since 2.17
+#68: Remove `junit` 4.x dependency from `jackson-base` 2.18.x to help
+  junit5 migration
 
 2.17.0 (12-Mar-2024)