This is an automated email from the ASF dual-hosted git repository. davidb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-javax-activation.git
commit 79ff18d85b562da32ed7621df729dcc6826ca0df Author: David Bosschaert <[email protected]> AuthorDate: Tue Jul 28 11:46:10 2020 +0100 Use -exportcontents instead of Export-Package To avoid embedding the java.activation classes. Also added the list of compatible JavaActivation contracts --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d72ea8d..2023735 100755 --- a/pom.xml +++ b/pom.xml @@ -61,9 +61,9 @@ Bundle-Name: ${project.name} (Framework Fragment, No embedded dependencies) Bundle-SymbolicName: ${project.artifactId}.nodeps ExtensionBundle-Activator: org.apache.sling.javax.activation.internal.Activator -Export-Package: javax.activation;version="0.0.0",com.sun.activation.registries;version="0.0.0",com.sun.activation.viewers;version="0.0.0" +-exportcontents: javax.activation;version="0.0.0",com.sun.activation.registries;version="0.0.0",com.sun.activation.viewers;version="0.0.0" Import-Package: !javax.activation,!com.sun.activation.registries,!com.sun.activation.viewers -Provide-Capability: osgi.contract;osgi.contract=JavaActivation;version:List<Version>="1.1.1";uses:="javax.activation" +Provide-Capability: osgi.contract;osgi.contract=JavaActivation;version:List<Version>="1.1,1.1.1";uses:="javax.activation" Fragment-Host: system.bundle;extension:=framework ]]> </bnd> @@ -79,7 +79,7 @@ Fragment-Host: system.bundle;extension:=framework # version automatically determined from the MANIFEST.MF of the jakarta.activation.jar Bundle-Activator: org.apache.sling.javax.activation.internal.Activator Export-Package: javax.activation,com.sun.activation.registries,com.sun.activation.viewers -Provide-Capability: osgi.contract;osgi.contract=JavaActivation;version:List<Version>="1.2";uses:="javax.activation" +Provide-Capability: osgi.contract;osgi.contract=JavaActivation;version:List<Version>="1.1,1.1.1,1.2";uses:="javax.activation" ]]> </bnd> <manifestPath>${project.build.directory}/deps-classes/META-INF/MANIFEST.MF</manifestPath> @@ -108,7 +108,7 @@ Provide-Capability: osgi.contract;osgi.contract=JavaActivation;version:List<Vers </goals> <configuration> <classifier>nodeps</classifier> - <classesDirectory>${project.build.directory}/classes</classesDirectory> + <classesDirectory>${project.build.directory}/nodeps-classes</classesDirectory> <archive> <manifestFile>${project.build.directory}/nodeps-classes/META-INF/MANIFEST.MF</manifestFile> </archive>
