Remove BND overrides for jctools-core

Version 4.0.2 is a named module, the overrides are no longer necessary.

This also adds an optional resolution for `jctools-core` to the OSGi
descriptor of JTL.

Author: ppkarwasz

log4j-core/pom.xml

@@ -73,7 +73,6 @@
       java.naming;transitive=false,
       org.apache.commons.csv;transitive=false,
       org.fusesource.jansi;transitive=false,
-      org.jctools.core;substitute="jctools-core";transitive=false;static=true,
       <!-- Filebased module names: MUST be static -->
       disruptor;transitive=false;static=true,
       kafka.clients;substitute="kafka-clients";transitive=false;static=true,

log4j-layout-template-json/pom.xml

@@ -40,10 +40,10 @@
       ~ OSGi and JPMS options
       -->
     <bnd-module-name>org.apache.logging.log4j.layout.template.json</bnd-module-name>
-    <bnd-extra-module-options>
+    <bnd-extra-package-options>
       <!-- JCTools is optional (#1895) -->
-      org.jctools.core;substitute="jctools-core";static=true
-    </bnd-extra-module-options>
+      org.jctools.*;resolution:=optional,
+    </bnd-extra-package-options>
     <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
 
   </properties>