From fc3f36c7b668ad9fdf8b70eaf46361b6c157c66b Mon Sep 17 00:00:00 2001 From: Chris Kelley Date: Wed, 9 Nov 2022 16:47:10 +0000 Subject: [PATCH] Fix errors in Maven build --- ...vax.security.auth-from-JDK-internals.patch | 26 +++++++++++++++++++ jackson-modules-base.spec | 7 ++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-Expose-javax.security.auth-from-JDK-internals.patch diff --git a/0001-Expose-javax.security.auth-from-JDK-internals.patch b/0001-Expose-javax.security.auth-from-JDK-internals.patch new file mode 100644 index 0000000..43fb443 --- /dev/null +++ b/0001-Expose-javax.security.auth-from-JDK-internals.patch @@ -0,0 +1,26 @@ +From 45cad535d09c0b67719a1ebe14353636515596f7 Mon Sep 17 00:00:00 2001 +From: Chris Kelley +Date: Thu, 8 Sep 2022 12:44:54 +0100 +Subject: [PATCH] Expose javax.security.auth from JDK internals + +--- + pom.xml | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/pom.xml b/pom.xml +index e72b4934..cafe56de 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -97,6 +97,9 @@ not datatype, data format, or JAX-RS provider modules. + + com/fasterxml/jackson/**/failing/*.java + ++ ++ --add-opens=java.base/javax.security.auth=ALL-UNNAMED ++ + + + +-- +2.38.1 + diff --git a/jackson-modules-base.spec b/jackson-modules-base.spec index 491b4a3..47f499a 100644 --- a/jackson-modules-base.spec +++ b/jackson-modules-base.spec @@ -8,6 +8,7 @@ License: Apache-2.0 URL: https://github.com/FasterXML/jackson-modules-base Source0: %{url}/archive/%{name}-%{version}.tar.gz +Patch1: 0001-Expose-javax.security.auth-from-JDK-internals.patch BuildRequires: maven-local BuildRequires: mvn(cglib:cglib) @@ -41,8 +42,9 @@ framework to read and write XML. %prep %setup -q -n %{name}-%{name}-%{version} +%patch1 -p1 -%pom_remove_dep org.glassfish.jaxb:jaxb-runtime jaxb +%pom_remove_dep -r org.glassfish.jaxb:jaxb-runtime %pom_remove_plugin "de.jjohannes:gradle-module-metadata-maven-plugin" # no need for Java 9 module stuff @@ -69,6 +71,9 @@ cp -p mrbean/src/main/resources/META-INF/{LICENSE,NOTICE} . %pom_disable_module mrbean %pom_disable_module osgi %pom_disable_module paranamer +%pom_disable_module jakarta-xmlbind +%pom_disable_module blackbird +%pom_disable_module no-ctor-deser # Allow javax,activation to be optional %pom_add_plugin "org.apache.felix:maven-bundle-plugin" jaxb "