Move MongoDB depds to log4j-mongodb modules

apache · Mar 30, 2024 · b0143d9 · b0143d9
1 parent 50b0896
commit b0143d9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 28 deletions.
diff --git a/log4j-mongodb3/pom.xml b/log4j-mongodb3/pom.xml
@@ -42,12 +42,10 @@
     </bnd-extra-module-options>
     <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
 
-    <!-- Override of the parent POM version -->
+    <!-- Dependency versions -->
     <mongodb.version>3.12.11</mongodb.version>
   </properties>
 
-  <!-- Use explicit versions as a temporary workaround to a Coursier/Ivy bug:
-    https://github.com/apache/logging-log4j2/issues/2065 -->
   <dependencyManagement>
     <dependencies>
       <dependency>

diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb4/pom.xml
@@ -37,8 +37,36 @@
       ~ OSGi and JPMS options
       -->
     <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
+
+    <!-- Dependency versions -->
+    <mongodb.version>4.11.1</mongodb.version>
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.mongodb</groupId>
+        <artifactId>bson</artifactId>
+        <version>${mongodb.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mongodb</groupId>
+        <artifactId>mongodb-driver-core</artifactId>
+        <version>${mongodb.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mongodb</groupId>
+        <artifactId>mongodb-driver-legacy</artifactId>
+        <version>${mongodb.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.mongodb</groupId>
+        <artifactId>mongodb-driver-sync</artifactId>
+        <version>${mongodb.version}</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>

diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
@@ -126,7 +126,6 @@
     <logback.version>1.3.14</logback.version>
     <maven.version>3.9.6</maven.version>
     <mockito.version>4.11.0</mockito.version>
-    <mongodb.version>4.11.1</mongodb.version>
     <nashorn.version>15.4</nashorn.version>
     <netty.version>4.1.108.Final</netty.version>
     <org.eclipse.osgi.version>3.13.0.v20180226-1711</org.eclipse.osgi.version>
@@ -290,12 +289,6 @@
         <version>${bsh.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.mongodb</groupId>
-        <artifactId>bson</artifactId>
-        <version>${mongodb.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>org.apache.cassandra</groupId>
         <artifactId>cassandra-all</artifactId>
@@ -837,24 +830,6 @@
         <version>${maven.version}</version>
       </dependency>
 
-      <dependency>
-        <groupId>org.mongodb</groupId>
-        <artifactId>mongodb-driver-core</artifactId>
-        <version>${mongodb.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.mongodb</groupId>
-        <artifactId>mongodb-driver-legacy</artifactId>
-        <version>${mongodb.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.mongodb</groupId>
-        <artifactId>mongodb-driver-sync</artifactId>
-        <version>${mongodb.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>org.openjdk.nashorn</groupId>
         <artifactId>nashorn-core</artifactId>