This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch bnd in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit a3bcfbb9112bab160f350728e4846bb5e69b4c67 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Mon Sep 25 10:57:24 2023 +0200 Remove references to `maven-bundle-plugin` --- log4j-1.2-api/pom.xml | 20 -------------------- log4j-api-test/pom.xml | 12 ------------ log4j-api/pom.xml | 17 ----------------- log4j-appserver/pom.xml | 17 ----------------- log4j-cassandra/pom.xml | 14 -------------- log4j-core-its/pom.xml | 4 ---- log4j-core-test/pom.xml | 19 ------------------- log4j-core/pom.xml | 20 -------------------- log4j-couchdb/pom.xml | 14 -------------- log4j-docker/pom.xml | 8 -------- log4j-flume-ng/pom.xml | 11 ----------- log4j-iostreams/pom.xml | 14 +------------- log4j-jakarta-smtp/pom.xml | 14 -------------- log4j-jakarta-web/pom.xml | 16 ---------------- log4j-jcl/pom.xml | 16 +--------------- log4j-jdbc-dbcp2/pom.xml | 14 -------------- log4j-jpa/pom.xml | 14 -------------- log4j-jpl/pom.xml | 17 ----------------- log4j-jul/pom.xml | 10 ---------- log4j-kubernetes/pom.xml | 9 --------- log4j-layout-template-json-test/pom.xml | 11 ----------- log4j-layout-template-json/pom.xml | 11 ----------- log4j-mongodb3/pom.xml | 10 ---------- log4j-mongodb4/pom.xml | 10 ---------- log4j-osgi/pom.xml | 10 ---------- log4j-perf/pom.xml | 10 ---------- log4j-slf4j-impl/pom.xml | 11 ----------- log4j-slf4j2-impl/pom.xml | 13 ------------- log4j-spring-boot/pom.xml | 15 --------------- .../log4j-spring-cloud-config-client/pom.xml | 15 --------------- log4j-taglib/pom.xml | 4 ---- log4j-to-jul/pom.xml | 15 +-------------- log4j-to-slf4j/pom.xml | 16 +--------------- log4j-web/pom.xml | 18 ------------------ pom.xml | 19 +------------------ 35 files changed, 5 insertions(+), 463 deletions(-) diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml index bb5caf8fa7..10d62defce 100644 --- a/log4j-1.2-api/pom.xml +++ b/log4j-1.2-api/pom.xml @@ -124,24 +124,4 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Export-Package>org.apache.log4j.*</Export-Package> - <Import-Package> - javax.jms;version="[1.1,3)";resolution:=optional, - <!-- used by org.apache.log4j.jmx.Agent --> - com.sun.jdmk.comm;resolution:=optional, - * - </Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml index 477c84a944..f436a9629c 100644 --- a/log4j-api-test/pom.xml +++ b/log4j-api-test/pom.xml @@ -107,18 +107,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.api</Fragment-Host> - <Export-Package>org.apache.logging.log4j.*</Export-Package> - <Import-Package /> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml index 6fa8f7abf6..b0f5f347c7 100644 --- a/log4j-api/pom.xml +++ b/log4j-api/pom.xml @@ -59,23 +59,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Private-Package>*.internal</Private-Package> - <Export-Package>!*.internal, - org.apache.logging.log4j.*</Export-Package> - <Import-Package>!*.internal, - sun.reflect;resolution:=optional, - *</Import-Package> - <Bundle-Activator>org.apache.logging.log4j.util.Activator</Bundle-Activator> - <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy> - <_fixupmessages>"Classes found in the wrong directory";is:=warning</_fixupmessages> - </instructions> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml index fb253852e4..b17706fb4f 100644 --- a/log4j-appserver/pom.xml +++ b/log4j-appserver/pom.xml @@ -54,21 +54,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <!-- we compile against 3.0, but require 2.5 minimum --> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Import-Package>javax.servlet;version="[2.5,4)",*</Import-Package> - <Export-Package>org.apache.logging.log4j.web</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> - </project> diff --git a/log4j-cassandra/pom.xml b/log4j-cassandra/pom.xml index f69a812c44..8e777fed2a 100644 --- a/log4j-cassandra/pom.xml +++ b/log4j-cassandra/pom.xml @@ -112,18 +112,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Export-Package>*</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml index 4a959ab958..3222cb4d37 100644 --- a/log4j-core-its/pom.xml +++ b/log4j-core-its/pom.xml @@ -183,10 +183,6 @@ </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> <executions> diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml index aa10147fc9..70f614f5a1 100644 --- a/log4j-core-test/pom.xml +++ b/log4j-core-test/pom.xml @@ -349,25 +349,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.logging.log4j.core</Bundle-SymbolicName> - <!-- TODO: exclude internal classes from export --> - <Export-Package>org.apache.logging.log4j.core.*</Export-Package> - <Import-Package>javax.activation;version="[1.2,2)";resolution:=optional, - javax.jms;version="[1.1,3)";resolution:=optional, - javax.mail;version="[1.6,2)";resolution:=optional, - javax.mail.internet;version="[1.6,2)";resolution:=optional, - javax.mail.util;version="[1.6,2)";resolution:=optional, - sun.reflect;resolution:=optional, - *</Import-Package> - <Bundle-Activator>org.apache.logging.log4j.core.osgi.Activator</Bundle-Activator> - </instructions> - </configuration> - </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> <executions> diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml index ccdc60678a..b9f5fc08b0 100644 --- a/log4j-core/pom.xml +++ b/log4j-core/pom.xml @@ -177,26 +177,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.logging.log4j.core</Bundle-SymbolicName> - <!-- TODO: exclude internal classes from export --> - <Export-Package>org.apache.logging.log4j.core.*</Export-Package> - <Import-Package>javax.activation;version="[1.2,2)";resolution:=optional, - javax.jms;version="[1.1,3)";resolution:=optional, - javax.mail;version="[1.6,2)";resolution:=optional, - javax.mail.internet;version="[1.6,2)";resolution:=optional, - javax.mail.util;version="[1.6,2)";resolution:=optional, - sun.reflect;resolution:=optional, - *</Import-Package> - <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy> - <Bundle-Activator>org.apache.logging.log4j.core.osgi.Activator</Bundle-Activator> - </instructions> - </configuration> - </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> <executions> diff --git a/log4j-couchdb/pom.xml b/log4j-couchdb/pom.xml index b76b9ac63a..e5d7c95b09 100644 --- a/log4j-couchdb/pom.xml +++ b/log4j-couchdb/pom.xml @@ -75,18 +75,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Export-Package>*</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/log4j-docker/pom.xml b/log4j-docker/pom.xml index e89a2afb79..3356f2ea9e 100644 --- a/log4j-docker/pom.xml +++ b/log4j-docker/pom.xml @@ -60,13 +60,5 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - </plugins> - </build> </project> diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml index 598993638c..0a7b150799 100644 --- a/log4j-flume-ng/pom.xml +++ b/log4j-flume-ng/pom.xml @@ -107,17 +107,6 @@ </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Bundle-SymbolicName>org.apache.logging.log4j.flume</Bundle-SymbolicName> - <Export-Package>org.apache.logging.log4j.flume.appender</Export-Package> - </instructions> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> diff --git a/log4j-iostreams/pom.xml b/log4j-iostreams/pom.xml index e0297990fb..12fd34bf83 100644 --- a/log4j-iostreams/pom.xml +++ b/log4j-iostreams/pom.xml @@ -75,17 +75,5 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Export-Package>org.apache.logging.log4j.io.*</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + </project> diff --git a/log4j-jakarta-smtp/pom.xml b/log4j-jakarta-smtp/pom.xml index 4d7cce24e4..82fe96b9b0 100644 --- a/log4j-jakarta-smtp/pom.xml +++ b/log4j-jakarta-smtp/pom.xml @@ -91,18 +91,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core.appender.mom.jeromq</Fragment-Host> - <Export-Package>*</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/log4j-jakarta-web/pom.xml b/log4j-jakarta-web/pom.xml index 299c5ec620..a212374ca2 100644 --- a/log4j-jakarta-web/pom.xml +++ b/log4j-jakarta-web/pom.xml @@ -81,20 +81,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <!-- we require 5.0 minimum --> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Import-Package>jakarta.servlet;version="[5.0,4)",*</Import-Package> - <Export-Package>org.apache.logging.log4j.web</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml index 93e3d28d10..3bfcb09f90 100644 --- a/log4j-jcl/pom.xml +++ b/log4j-jcl/pom.xml @@ -67,19 +67,5 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Export-Package>org.apache.logging.log4j.jcl</Export-Package> - <Require-Capability>osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional</Require-Capability> - <Provide-Capability>osgi.serviceloader;osgi.serviceloader=org.apache.commons.logging.LogFactory</Provide-Capability> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + </project> diff --git a/log4j-jdbc-dbcp2/pom.xml b/log4j-jdbc-dbcp2/pom.xml index ac0c9aa9b4..43cb4fe9ea 100644 --- a/log4j-jdbc-dbcp2/pom.xml +++ b/log4j-jdbc-dbcp2/pom.xml @@ -70,18 +70,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Export-Package>*</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/log4j-jpa/pom.xml b/log4j-jpa/pom.xml index 2e4ed7e356..68c7f3177d 100644 --- a/log4j-jpa/pom.xml +++ b/log4j-jpa/pom.xml @@ -91,18 +91,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Export-Package>*</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/log4j-jpl/pom.xml b/log4j-jpl/pom.xml index 6b61b84b4e..bf857aac59 100644 --- a/log4j-jpl/pom.xml +++ b/log4j-jpl/pom.xml @@ -65,23 +65,6 @@ </dependency> </dependencies> - <build> - <plugins> - - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Export-Package>org.apache.logging.log4j.jpl</Export-Package> - </instructions> - </configuration> - </plugin> - - </plugins> - </build> - <profiles> <profile> <id>java8-tests</id> diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml index 1c1cc9fd9a..dfbd46fd85 100644 --- a/log4j-jul/pom.xml +++ b/log4j-jul/pom.xml @@ -72,16 +72,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Export-Package>org.apache.logging.log4j.jul</Export-Package> - </instructions> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/log4j-kubernetes/pom.xml b/log4j-kubernetes/pom.xml index 0243eb9832..1a78cb1d38 100644 --- a/log4j-kubernetes/pom.xml +++ b/log4j-kubernetes/pom.xml @@ -57,14 +57,5 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> - - </plugins> - </build> </project> diff --git a/log4j-layout-template-json-test/pom.xml b/log4j-layout-template-json-test/pom.xml index bfb779f245..11f9930d7e 100644 --- a/log4j-layout-template-json-test/pom.xml +++ b/log4j-layout-template-json-test/pom.xml @@ -104,17 +104,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Bundle-SymbolicName>org.apache.logging.log4j.layout.template.json</Bundle-SymbolicName> - <Export-Package>org.apache.logging.log4j.layout.template.json.*</Export-Package> - </instructions> - </configuration> - </plugin> <!-- Disable ITs, which are Docker-dependent, by default. --> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml index 85c3b5a069..0c221d608e 100644 --- a/log4j-layout-template-json/pom.xml +++ b/log4j-layout-template-json/pom.xml @@ -50,17 +50,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Bundle-SymbolicName>org.apache.logging.log4j.layout.template.json</Bundle-SymbolicName> - <Export-Package>org.apache.logging.log4j.layout.template.json.*</Export-Package> - </instructions> - </configuration> - </plugin> <!-- Disable ITs, which are Docker-dependent, by default. --> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/log4j-mongodb3/pom.xml b/log4j-mongodb3/pom.xml index d49cbcc7ef..033c8b37bd 100644 --- a/log4j-mongodb3/pom.xml +++ b/log4j-mongodb3/pom.xml @@ -112,16 +112,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Export-Package>*</Export-Package> - </instructions> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb4/pom.xml index 5e573b7181..ea3a8e7609 100644 --- a/log4j-mongodb4/pom.xml +++ b/log4j-mongodb4/pom.xml @@ -105,16 +105,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Export-Package>*</Export-Package> - </instructions> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml index 077defaac2..5adee36078 100644 --- a/log4j-osgi/pom.xml +++ b/log4j-osgi/pom.xml @@ -143,16 +143,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-SymbolicName>org.apache.logging.log4j.osgi</Bundle-SymbolicName> - <Import-Package>*</Import-Package> - </instructions> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml index d6683d3a26..35f75106b4 100644 --- a/log4j-perf/pom.xml +++ b/log4j-perf/pom.xml @@ -142,16 +142,6 @@ <build> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Export-Package>org.apache.logging.log4j.perf.jmh*</Export-Package> - </instructions> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-shade-plugin</artifactId> diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml index dbb3a2f133..4124fdfab2 100644 --- a/log4j-slf4j-impl/pom.xml +++ b/log4j-slf4j-impl/pom.xml @@ -104,17 +104,6 @@ </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Export-Package>org.apache.logging.slf4j, - org.slf4j.impl</Export-Package> - <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy> - </instructions> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> diff --git a/log4j-slf4j2-impl/pom.xml b/log4j-slf4j2-impl/pom.xml index 4e2a9e57cd..8aba7f0ef4 100644 --- a/log4j-slf4j2-impl/pom.xml +++ b/log4j-slf4j2-impl/pom.xml @@ -101,19 +101,6 @@ </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Export-Package>org.apache.logging.slf4j, - org.slf4j.impl</Export-Package> - <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy> - <Require-Capability>osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability> - <Provide-Capability>osgi.serviceloader;osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvider</Provide-Capability> - </instructions> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> diff --git a/log4j-spring-boot/pom.xml b/log4j-spring-boot/pom.xml index 827c29251b..1169e72002 100644 --- a/log4j-spring-boot/pom.xml +++ b/log4j-spring-boot/pom.xml @@ -114,20 +114,5 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Export-Package>org.apache.logging.log4j.spring.cloud.config.controller</Export-Package> - </instructions> - </configuration> - </plugin> - - </plugins> - </build> </project> diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml index 4b4e6a026d..3169d492ea 100644 --- a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml +++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml @@ -87,20 +87,5 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Export-Package>org.apache.logging.log4j.spring.cloud.config.controller</Export-Package> - </instructions> - </configuration> - </plugin> - - </plugins> - </build> </project> diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml index ec4522b662..1ec4c93b4b 100644 --- a/log4j-taglib/pom.xml +++ b/log4j-taglib/pom.xml @@ -80,10 +80,6 @@ </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> diff --git a/log4j-to-jul/pom.xml b/log4j-to-jul/pom.xml index 8737200d04..69afcd27a1 100644 --- a/log4j-to-jul/pom.xml +++ b/log4j-to-jul/pom.xml @@ -64,18 +64,5 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-Activator>org.apache.logging.log4j.tojul.Activator</Bundle-Activator> - <Export-Package>org.apache.logging.log4j.tojul</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + </project> diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml index d60459981d..fdb6f76de2 100644 --- a/log4j-to-slf4j/pom.xml +++ b/log4j-to-slf4j/pom.xml @@ -89,19 +89,5 @@ <scope>test</scope> </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Bundle-Activator>org.apache.logging.slf4j.Activator</Bundle-Activator> - <Export-Package>org.apache.logging.slf4j</Export-Package> - <Import-Package>org.slf4j*;version="${range;[==,${slf4j.support.bound})}",*</Import-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> + </project> diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml index b8ae505138..5ea959a0a1 100644 --- a/log4j-web/pom.xml +++ b/log4j-web/pom.xml @@ -82,22 +82,4 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <!-- we compile against 3.0, but require 2.5 minimum --> - <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host> - <Import-Package>javax.servlet;version="[2.5,5)", - javax.servlet.http;version="[2.5,5)", - *</Import-Package> - <Export-Package>org.apache.logging.log4j.web</Export-Package> - </instructions> - </configuration> - </plugin> - </plugins> - </build> </project> diff --git a/pom.xml b/pom.xml index 06b9f38615..04834608e3 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.logging</groupId> <artifactId>logging-parent</artifactId> - <version>9</version> + <version>10.1.0-SNAPSHOT</version> <relativePath /> </parent> @@ -353,7 +353,6 @@ <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version> <log4j-tools.version>0.3.0</log4j-tools.version> <maven-artifact-plugin.version>3.4.0</maven-artifact-plugin.version> - <maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version> <maven-enforcer-plugin.version>3.2.1</maven-enforcer-plugin.version> <maven-dependency-plugin.version>3.5.0</maven-dependency-plugin.version> <maven-scm-plugin.version>1.13.0</maven-scm-plugin.version> @@ -1359,22 +1358,6 @@ <version>${maven-artifact-plugin.version}</version> </plugin> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>${maven-bundle-plugin.version}</version> - <extensions>true</extensions> - <inherited>true</inherited> - <executions> - <execution> - <goals> - <goal>manifest</goal> - </goals> - <phase>process-classes</phase> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId>
