rpms/jackson-modules-base
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Make the OSGi dep on javax.activation optional

Browse Source
This commit is contained in:
Mat Booth 2019-03-17 17:51:28 +00:00
parent d03dc0ffff
commit 545ee148c0
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jackson-modules-base.spec
View File

@ -2,7 +2,7 @@
Name: jackson-modules-base Name: jackson-modules-base
Version: 2.9.8 Version: 2.9.8
Release: 1%{?dist} Release: 2%{?dist}
Summary: Jackson modules: Base Summary: Jackson modules: Base
License: ASL 2.0 License: ASL 2.0
URL: https://github.com/FasterXML/jackson-modules-base URL: https://github.com/FasterXML/jackson-modules-base
@ -19,6 +19,7 @@ BuildRequires: mvn(com.google.inject:guice)
%if %{without jp_minimal} %if %{without jp_minimal}
BuildRequires: mvn(com.thoughtworks.paranamer:paranamer) BuildRequires: mvn(com.thoughtworks.paranamer:paranamer)
%endif %endif
BuildRequires: mvn(javax.xml.bind:jaxb-api)
BuildRequires: mvn(junit:junit) BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.mockito:mockito-all) 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 # NoClassDefFoundError: net/sf/cglib/core/CodeGenerationException
%pom_add_dep cglib:cglib:3.2.4:test guice %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} %if %{with jp_minimal}
# Disable modules with additional deps # Disable modules with additional deps
%pom_disable_module paranamer %pom_disable_module paranamer
%pom_disable_module mrbean %pom_disable_module mrbean
%endif %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 # This test fails since mockito was upgraded to 2.x
rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.java 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 %license LICENSE NOTICE
%changelog %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 * Wed Feb 06 2019 Mat Booth <mat.booth@redhat.com> - 2.9.8-1
- Update to latest upstream release - Update to latest upstream release