Simplify configuration after BND 7.x upgrade

BND 7.x supports multi-release JARs, so we can remove many manual
overrides of module names.

We also **add** an override from `disruptor` to
`com.conversantmedia.disruptor`, since new (Java 11 based) versions of
`com.conversantmetida:disruptor` have a JPMS descriptor.

Author: ppkarwasz

log4j-api/pom.xml

@@ -36,10 +36,6 @@
     <bnd-multi-release>true</bnd-multi-release>
     <!-- Differs from OSGi bundle name -->
     <bnd-module-name>org.apache.logging.log4j</bnd-module-name>
-    <bnd-extra-package-options>
-      <!-- This is a Java 9 only package, so BND can not detect it as private -->
-      !org.apache.logging.log4j.util.internal
-    </bnd-extra-package-options>
     <bnd-extra-module-options>
       <!-- Used in StringBuilders through reflection -->
       java.sql;static=true,

log4j-core-test/pom.xml

@@ -55,7 +55,6 @@
       org.hamcrest;transitive=false,
       org.junit.jupiter.api;transitive=false,
       <!-- Name changes -->
-      org.assertj.core;substitute="assertj-core",
       java.allocation.instrumenter;substitute="java-allocation-instrumenter",
       spring.test;substitute="spring-test"
     </bnd-extra-module-options>

log4j-core/pom.xml

@@ -66,15 +66,16 @@
       <!-- Remove `transitive` from optional dependencies -->
       com.fasterxml.jackson.annotation;transitive=false,
       com.lmax.disruptor;transitive=false,
-      com.fasterxml.jackson.core;substitute="jackson-core";transitive=false,
-      com.fasterxml.jackson.databind;substitute="jackson-databind";transitive=false,
-      com.fasterxml.jackson.dataformat.xml;substitute="jackson-dataformat-xml";transitive=false,
-      com.fasterxml.jackson.dataformat.yaml;substitute="jackson-dataformat-yaml";transitive=false,
+      com.fasterxml.jackson.core;transitive=false,
+      com.fasterxml.jackson.databind;transitive=false,
+      com.fasterxml.jackson.dataformat.xml;transitive=false,
+      com.fasterxml.jackson.dataformat.yaml;transitive=false,
       java.naming;transitive=false,
       org.apache.commons.csv;transitive=false,
       org.fusesource.jansi;transitive=false,
+      <!-- Newer versions have a module descriptor -->
+      com.conversantmedia.disruptor;substitute="disruptor";transitive=false;static=true,
       <!-- Filebased module names: MUST be static -->
-      disruptor;transitive=false;static=true,
       kafka.clients;substitute="kafka-clients";transitive=false;static=true,
       javax.jms.api;substitute="javax.jms-api";transitive=false;static=true,
       javax.mail.api;substitute="javax.mail-api";transitive=false;static=true,

log4j-docker/pom.xml

@@ -32,11 +32,6 @@
     <!--
       ~ OSGi and JPMS options
       -->
-    <bnd-extra-module-options>
-      <!-- Non detected module names -->
-      com.fasterxml.jackson.core;substitute="jackson-core",
-      com.fasterxml.jackson.databind;substitute="jackson-databind"
-    </bnd-extra-module-options>
     <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
   </properties>
   <dependencies>

log4j-jcl/pom.xml

@@ -27,12 +27,7 @@
   <packaging>jar</packaging>
   <name>Apache Log4j Commons Logging Bridge</name>
   <description>The Apache Log4j Commons Logging Adapter</description>
-  <properties>
-    <bnd-extra-module-options>
-      <!-- Filebase module names: MUST be static -->
-      commons.logging;substitute="commons-logging";transitive=false;static=true
-    </bnd-extra-module-options>
-  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>

log4j-jdbc-dbcp2/pom.xml

@@ -33,10 +33,6 @@
       ~ OSGi and JPMS options
       -->
     <bnd-module-name>org.apache.logging.log4j.core.appender.db.jdbc</bnd-module-name>
-    <bnd-extra-module-options>
-      <!-- Module names -->
-      org.apache.commons.dbcp2;substitute="commons-dbcp2"
-    </bnd-extra-module-options>
     <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
   </properties>
 

log4j-jpa/pom.xml

@@ -32,11 +32,6 @@
     <!--
       ~ OSGi and JPMS options
       -->
-    <bnd-extra-module-options>
-      <!-- Non detected module names -->
-      com.fasterxml.jackson.core;substitute="jackson-core",
-      com.fasterxml.jackson.databind;substitute="jackson-databind"
-    </bnd-extra-module-options>
     <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
   </properties>
 

log4j-slf4j2-impl/pom.xml

@@ -27,17 +27,7 @@
   <packaging>jar</packaging>
   <name>Apache Log4j SLF4J 2.0 Binding</name>
   <description>The Apache Log4j SLF4J 2.0 API binding to Log4j 2 Core</description>
-  <properties>
 
-    <!--
-      ~ OSGi and JPMS options
-      -->
-    <bnd-extra-module-options>
-      <!-- The module descriptor is in `META-INF/versions/9`
-           BND can not find it -->
-      org.slf4j;substitute="slf4j-api"
-    </bnd-extra-module-options>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>org.osgi</groupId>

log4j-to-slf4j/pom.xml

@@ -37,11 +37,6 @@
       <!-- This bridge also support SLF4J 2.x -->
       org.slf4j.*;version="${slf4j.support.range}"
     </bnd-extra-package-options>
-    <bnd-extra-module-options>
-      <!-- The module descriptor is in `META-INF/versions/9`
-           BND 6.x can not find it -->
-      org.slf4j;substitute="slf4j-api"
-    </bnd-extra-module-options>
   </properties>
   <dependencies>
     <dependency>

log4j-web/pom.xml

@@ -36,7 +36,7 @@
       -->
     <bnd-extra-module-options>
       <!-- Filebased module names: MUST be static -->
-      javax.servlet.api;substitute="javax.servlet-api";transitive=true;static=true
+      javax.servlet.api;substitute="javax.servlet-api";transitive=false;static=true
     </bnd-extra-module-options>
     <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
   </properties>