Set jaxb dependency to glassfish-jaxb

This commit is contained in:
Marco Fargetta 2025-08-05 15:57:07 +02:00
parent 3e97e6f998
commit a258cb9a38

View File

@ -18,7 +18,7 @@ BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) >= %{version}
BuildRequires: mvn(com.fasterxml.jackson:jackson-base:pom:) >= %{version}
BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer)
BuildRequires: mvn(jakarta.activation:jakarta.activation-api)
BuildRequires: mvn(jakarta.xml.bind:jakarta.xml.bind-api:4)
BuildRequires: mvn(javax.xml.bind:jaxb-api)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.mockito:mockito-all)
BuildRequires: mvn(org.ow2.asm:asm)
@ -45,11 +45,8 @@ framework to read and write XML.
%setup -q -n %{name}-%{name}-%{version}
%patch -P1 -p1
%pom_change_dep -r jakarta.xml.bind:jakarta.xml.bind-api javax.xml.bind:jaxb-api
%pom_change_dep -r jakarta.activation:jakarta.activation-api:1.2.2 jakarta.activation:jakarta.activation-api:1.2.1
%pom_remove_dep -r org.glassfish.jaxb:jaxb-runtime
# no need for Java 9 module stuff
%pom_remove_plugin -r :moditect-maven-plugin
@ -86,10 +83,6 @@ cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} .
</instructions>
</configuration>"
# Revert jaxb annotation dependency to 2.17 mode
%pom_remove_dep javax.xml.bind:jaxb-api jaxb
%pom_add_dep jakarta.xml.bind:jakarta.xml.bind-api jaxb
# This test fails since mockito was upgraded to 2.x
rm osgi/src/test/java/com/fasterxml/jackson/module/osgi/InjectOsgiServiceTest.java