Make the OSGi dep on javax.activation optional

jackson-modules-base.spec

@@ -2,7 +2,7 @@
 
 Name:          jackson-modules-base
 Version:       2.9.8
-Release:       1%{?dist}
+Release:       2%{?dist}
 Summary:       Jackson modules: Base
 License:       ASL 2.0
 URL:           https://github.com/FasterXML/jackson-modules-base
@@ -19,6 +19,7 @@ BuildRequires:  mvn(com.google.inject:guice)
 %if %{without jp_minimal}
 BuildRequires:  mvn(com.thoughtworks.paranamer:paranamer)
 %endif
+BuildRequires:  mvn(javax.xml.bind:jaxb-api)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.mockito:mockito-all)
@@ -108,15 +109,20 @@ cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} .
 # NoClassDefFoundError: net/sf/cglib/core/CodeGenerationException
 %pom_add_dep cglib:cglib:3.2.4:test guice
 
-# This is provided by modern JREs
-%pom_remove_dep "javax.xml.bind:jaxb-api" jaxb
-
 %if %{with jp_minimal}
 # Disable modules with additional deps
 %pom_disable_module paranamer
 %pom_disable_module mrbean
 %endif
 
+# Allow javax,activation to be optional
+%pom_add_plugin "org.apache.felix:maven-bundle-plugin" jaxb "
+<configuration>
+  <instructions>
+    <Import-Package>javax.activation;resolution:=optional,*</Import-Package>
+  </instructions>
+</configuration>"
+
 # This test fails since mockito was upgraded to 2.x
 rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.java
 
@@ -164,6 +170,9 @@ rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.ja
 %license LICENSE NOTICE
 
 %changelog
+* Sun Mar 17 2019 Mat Booth <mat.booth@redhat.com> - 2.9.8-2
+- Make the OSGi dep on javax.activation optional
+
 * Wed Feb 06 2019 Mat Booth <mat.booth@redhat.com> - 2.9.8-1
 - Update to latest upstream release