WICKET-6999 Update bundle plugin to support slf4j [1.7,3)

apache · Sep 30, 2022 · 10fa846 · 10fa846
1 parent 44e7a4a
commit 10fa846
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -190,7 +190,7 @@
 		<!-- Maven plugins -->
 		<japicmp-maven-plugin.version>0.15.5</japicmp-maven-plugin.version>
 		<maven-archetype-plugin.version>3.2.0</maven-archetype-plugin.version>
-		<maven-bundle-plugin.version>5.1.3</maven-bundle-plugin.version>
+		<maven-bundle-plugin.version>5.1.8</maven-bundle-plugin.version>
 		<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
 		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
 		<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
@@ -889,24 +889,39 @@
 					<artifactId>maven-bundle-plugin</artifactId>
 					<version>${maven-bundle-plugin.version}</version>
 					<extensions>true</extensions>
+                                        <!--
 					<executions>
 						<execution>
 							<id>bundle-manifest</id>
 							<phase>process-classes</phase>
 							<goals>
 								<goal>manifest</goal>
 							</goals>
+                                        -->
 							<configuration>
 								<instructions>
+									<Require-Capability>osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=11.0))"</Require-Capability>
 									<Export-Package>*</Export-Package>
-									<Import-Package>org.apache.wicket*,
-										org.junit.jupiter*</Import-Package>
+									<Import-Package>
+										!java*,
+										!kotlin*,
+										!org.apache.wicket.util*,
+										!sun.nio.ch,
+										org.slf4j;version="[1.7,3)",
+                                                                                org.slf4j.event;version="[1.7,3)",
+                                                                                org.slf4j.helpers;version="[1.7,3)",
+                                                                                org.slf4j.spi;version="[1.7,3)",
+										org.apache.wicket*,
+										org.junit.jupiter*,*</Import-Package>
 									<DynamicImport-Package>*</DynamicImport-Package>
 									<_nouses>true</_nouses>
+									<!-- _noee>true</_noee -->
 								</instructions>
 							</configuration>
+                                        <!--
 						</execution>
 					</executions>
+                                        -->
 				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
@@ -975,7 +990,7 @@
 							<dependencyConvergence />
 							<compound implementation="com.github.ferstl.maven.pomenforcers.CompoundPedanticEnforcer">
 								<!-- Enforcers -->
-								<enforcers>POM_SECTION_ORDER,DEPENDENCY_MANAGEMENT_ORDER,DEPENDENCY_ORDER,DEPENDENCY_CONFIGURATION,PLUGIN_MANAGEMENT_ORDER,PLUGIN_CONFIGURATION</enforcers>
+								<!-- enforcers>POM_SECTION_ORDER,DEPENDENCY_MANAGEMENT_ORDER,DEPENDENCY_ORDER,DEPENDENCY_CONFIGURATION,PLUGIN_MANAGEMENT_ORDER,PLUGIN_CONFIGURATION</enforcers -->
 								<dependencyManagementOrderBy>scope,groupId,artifactId</dependencyManagementOrderBy>
 								<dependencyManagementScopePriorities>provided,compile,runtime,test,import</dependencyManagementScopePriorities>
 								<dependenciesScopePriorities>import,provided,compile,runtime,test</dependenciesScopePriorities>