From c746dbe36ed837da5de523960d6467b4cb370f68 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Fri, 12 Mar 2021 14:29:59 +0000
Subject: [PATCH] Update OSGi metadata, use import-package instead of
 require-bundle   in order to avoid some tricky OSGi breakage on Java 11

---
 xerces-j2-manifest.patch | 16 ++++++++--------
 xerces-j2.spec           |  6 +++++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/xerces-j2-manifest.patch b/xerces-j2-manifest.patch
index 413fa8b..3ad54d7 100644
--- a/xerces-j2-manifest.patch
+++ b/xerces-j2-manifest.patch
@@ -1,17 +1,17 @@
---- src/manifest.xerces.orig	2010-11-26 22:42:07.000000000 +0200
-+++ src/manifest.xerces	2012-12-17 11:11:52.200392844 +0200
+--- src/manifest.xerces.orig	2021-03-12 13:20:16.568489549 +0000
++++ src/manifest.xerces	2021-03-12 13:22:20.091482375 +0000
 @@ -1,5 +1,14 @@
  Manifest-Version: 1.0
  Created-By: @java.version@ (@java.vendor@)
-+Bundle-RequiredExecutionEnvironment: J2SE-1.5
++Automatic-Module-Name: org.apache.xerces
 +Bundle-SymbolicName: org.apache.xerces
 +Bundle-ManifestVersion: 2
-+Bundle-Name: @impl.name@
-+Bundle-Localization: plugin
-+Bundle-Version: @impl.version@
 +Bundle-Vendor: Apache Software Foundation
-+Require-Bundle: system.bundle,javax.xml;visibility:=reexport, org.apache.xml.resolver;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,org.apache.xml.serializer;bundle-version="[2.7.1,3.0.0)"
-+Export-Package: META-INF.services;version="@impl.version@",org.apache.html.dom;version="@impl.version@",org.apache.wml;version="@impl.version@",org.apache.wml.dom;version="@impl.version@",org.apache.xerces.dom;version="@impl.version@",org.apache.xerces.dom.events;version="@impl.version@",org.apache.xerces.dom3.as;version="@impl.version@",org.apache.xerces.impl;version="@impl.version@",org.apache.xerces.impl.dtd;version="@impl.version@",org.apache.xerces.impl.dtd.models;version="@impl.version@",org.apache.xerces.impl.dv;version="@impl.version@",org.apache.xerces.impl.dv.dtd;version="@impl.version@",org.apache.xerces.impl.dv.util;version="@impl.version@",org.apache.xerces.impl.dv.xs;version="@impl.version@",org.apache.xerces.impl.io;version="@impl.version@",org.apache.xerces.impl.msg;version="@impl.version@",org.apache.xerces.impl.validation;version="@impl.version@",org.apache.xerces.impl.xpath;version="@impl.version@",org.apache.xerces.impl.xpath.regex;version="@impl.version@",org.apache.xerces.impl.xs;version="@impl.version@",org.apache.xerces.impl.xs.identity;version="@impl.version@",org.apache.xerces.impl.xs.models;version="@impl.version@",org.apache.xerces.impl.xs.opti;version="@impl.version@",org.apache.xerces.impl.xs.traversers;version="@impl.version@",org.apache.xerces.impl.xs.util;version="@impl.version@",org.apache.xerces.jaxp;version="@impl.version@",org.apache.xerces.jaxp.datatype;version="@impl.version@",org.apache.xerces.jaxp.validation;version="@impl.version@",org.apache.xerces.parsers;version="@impl.version@",org.apache.xerces.stax;version="@impl.version@",org.apache.xerces.stax.events;version="@impl.version@",org.apache.xerces.util;version="@impl.version@",org.apache.xerces.xinclude;version="@impl.version@",org.apache.xerces.xni;version="@impl.version@",org.apache.xerces.xni.grammars;version="@impl.version@",org.apache.xerces.xni.parser;version="@impl.version@",org.apache.xerces.xpointer;version="@impl.version@",org.apache.xerces.xs;version="@impl.version@",org.apache.xerces.xs.datatypes;version="@impl.version@",org.apache.xml.serialize;version="@impl.version@",org.w3c.dom.html;version="@impl.version@"
++Import-Package: sun.io;resolution:=optional,javax.xml.datatype,javax.xml.namespace,javax.xml.parsers,javax.xml.stream,javax.xml.stream.events,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.validation,org.apache.wml;version="[2.12,3)",org.apache.xerces.dom;version="[2.12,3)",org.apache.xerces.dom.events;version="[2.12,3)",org.apache.xerces.dom3.as;version="[2.12,3)",org.apache.xerces.impl;version="[2.12,3)",org.apache.xerces.impl.dtd;version="[2.12,3)",org.apache.xerces.impl.dtd.models;version="[2.12,3)",org.apache.xerces.impl.dv;version="[2.12,3)",org.apache.xerces.impl.dv.util;version="[2.12,3)",org.apache.xerces.impl.dv.xs;version="[2.12,3)",org.apache.xerces.impl.io;version="[2.12,3)",org.apache.xerces.impl.msg;version="[2.12,3)",org.apache.xerces.impl.validation;version="[2.12,3)",org.apache.xerces.impl.xpath;version="[2.12,3)",org.apache.xerces.impl.xpath.regex;version="[2.12,3)",org.apache.xerces.impl.xs;version="[2.12,3)",org.apache.xerces.impl.xs.identity;version="[2.12,3)",org.apache.xerces.impl.xs.models;version="[2.12,3)",org.apache.xerces.impl.xs.opti;version="[2.12,3)",org.apache.xerces.impl.xs.traversers;version="[2.12,3)",org.apache.xerces.impl.xs.util;version="[2.12,3)",org.apache.xerces.jaxp;version="[2.12,3)",org.apache.xerces.jaxp.datatype;version="[2.12,3)",org.apache.xerces.jaxp.validation;version="[2.12,3)",org.apache.xerces.parsers;version="[2.12,3)",org.apache.xerces.stax;version="[2.12,3)",org.apache.xerces.stax.events;version="[2.12,3)",org.apache.xerces.util;version="[2.12,3)",org.apache.xerces.xinclude;version="[2.12,3)",org.apache.xerces.xni;version="[2.12,3)",org.apache.xerces.xni.grammars;version="[2.12,3)",org.apache.xerces.xni.parser;version="[2.12,3)",org.apache.xerces.xpointer;version="[2.12,3)",org.apache.xerces.xs;version="[2.12,3)",org.apache.xerces.xs.datatypes;version="[2.12,3)",org.apache.xml.resolver,org.apache.xml.resolver.readers,org.apache.xml.serialize;version="[2.12,3)",org.w3c.dom,org.w3c.dom.events,org.w3c.dom.html;version="[2.12,3)",org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.traversal,org.w3c.dom.views,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers
++Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
++Export-Package: org.apache.xerces.impl;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.impl.dtd,org.apache.xerces.impl.validation,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.grammars,org.apache.xerces.xni.parser,org.xml.sax",org.apache.xerces.impl.dtd;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.impl,org.apache.xerces.impl.dtd.models,org.apache.xerces.impl.dv,org.apache.xerces.impl.validation,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.grammars,org.apache.xerces.xni.parser",org.apache.xerces.impl.dtd.models;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.xni",org.apache.xerces.impl.dv;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.impl.xs.util,org.apache.xerces.util,org.apache.xerces.xs",org.apache.xerces.impl.dv.dtd;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.impl.dv",org.apache.xerces.impl.dv.util;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.xs,org.apache.xerces.xs.datatypes",org.apache.xerces.impl.dv.xs;x-internal:=true;version="@impl.version@";uses:="javax.xml.datatype,org.apache.xerces.impl.dv,org.apache.xerces.impl.xs,org.apache.xerces.impl.xs.util,org.apache.xerces.util,org.apache.xerces.xs,org.apache.xerces.xs.datatypes,org.w3c.dom",org.apache.xerces.impl.io;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.util",org.apache.xerces.impl.msg;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.util",org.apache.xerces.impl.validation;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.impl.dv,org.apache.xerces.util,org.apache.xerces.xni",org.apache.xerces.impl.xpath;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.util,org.apache.xerces.xni",org.apache.xerces.impl.xpath.regex;x-internal:=true;version="@impl.version@",org.apache.xerces.impl.xs;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.dom,org.apache.xerces.impl,org.apache.xerces.impl.dv,org.apache.xerces.impl.dv.xs,org.apache.xerces.impl.validation,org.apache.xerces.impl.xs.identity,org.apache.xerces.impl.xs.models,org.apache.xerces.impl.xs.util,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.grammars,org.apache.xerces.xni.parser,org.apache.xerces.xs,org.apache.xerces.xs.datatypes,org.w3c.dom,org.w3c.dom.ls",org.apache.xerces.impl.xs.identity;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.impl.xpath,org.apache.xerces.impl.xs,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xs",org.apache.xerces.impl.xs.models;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.impl.dtd.models,org.apache.xerces.impl.xs,org.apache.xerces.xni,org.apache.xerces.xni.parser",org.apache.xerces.impl.xs.opti;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.impl,org.apache.xerces.impl.dv,org.apache.xerces.impl.validation,org.apache.xerces.parsers,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.grammars,org.apache.xerces.xni.parser,org.w3c.dom",org.apache.xerces.impl.xs.traversers;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.impl.dv,org.apache.xerces.impl.xs,org.apache.xerces.impl.xs.util,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.parser,org.w3c.dom",org.apache.xerces.impl.xs.util;x-internal:=true;version="@impl.version@";uses:="org.apache.xerces.impl.xs,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.parser,org.apache.xerces.xs,org.apache.xerces.xs.datatypes,org.w3c.dom.ls",org.apache.html.dom;version="@impl.version@";uses:="org.apache.xerces.dom,org.w3c.dom,org.w3c.dom.html,org.xml.sax",org.apache.wml;version="@impl.version@";uses:="org.w3c.dom",org.apache.wml.dom;version="@impl.version@";uses:="org.apache.wml,org.apache.xerces.dom,org.w3c.dom",org.apache.xerces.dom;version="@impl.version@";uses:="org.apache.xerces.dom3.as,org.apache.xerces.impl,org.apache.xerces.impl.dv,org.apache.xerces.impl.validation,org.apache.xerces.impl.xs,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.parser,org.apache.xerces.xs,org.w3c.dom,org.w3c.dom.events,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.traversal",org.apache.xerces.dom.events;version="@impl.version@";uses:="org.w3c.dom,org.w3c.dom.events,org.w3c.dom.views",org.apache.xerces.dom3.as;version="@impl.version@";uses:="org.w3c.dom,org.w3c.dom.ls",org.apache.xerces.jaxp;version="@impl.version@";uses:="javax.xml.parsers,javax.xml.validation,org.apache.xerces.parsers,org.apache.xerces.xs,org.w3c.dom,org.xml.sax,org.xml.sax.helpers",org.apache.xerces.jaxp.datatype;version="@impl.version@";uses:="javax.xml.datatype",org.apache.xerces.jaxp.validation;version="@impl.version@";uses:="javax.xml.transform,javax.xml.validation,org.apache.xerces.xni.grammars,org.w3c.dom.ls,org.xml.sax",org.apache.xerces.parsers;version="@impl.version@";uses:="org.apache.xerces.dom,org.apache.xerces.dom3.as,org.apache.xerces.impl,org.apache.xerces.impl.dtd,org.apache.xerces.impl.dv,org.apache.xerces.impl.validation,org.apache.xerces.impl.xs,org.apache.xerces.util,org.apache.xerces.xinclude,org.apache.xerces.xni,org.apache.xerces.xni.grammars,org.apache.xerces.xni.parser,org.apache.xerces.xs,org.w3c.dom,org.w3c.dom.ls,org.xml.sax,org.xml.sax.ext",org.apache.xerces.stax;version="@impl.version@";uses:="javax.xml.namespace,javax.xml.stream,javax.xml.stream.events",org.apache.xerces.stax.events;version="@impl.version@";uses:="javax.xml.namespace,javax.xml.stream,javax.xml.stream.events",org.apache.xerces.util;version="@impl.version@";uses:="javax.xml.namespace,javax.xml.stream,org.apache.xerces.dom,org.apache.xerces.impl,org.apache.xerces.xni,org.apache.xerces.xni.grammars,org.apache.xerces.xni.parser,org.w3c.dom,org.w3c.dom.ls,org.xml.sax,org.xml.sax.ext",org.apache.xerces.xinclude;version="@impl.version@";uses:="org.apache.xerces.impl,org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.parser,org.apache.xerces.xpointer",org.apache.xerces.xni;version="@impl.version@";uses:="org.apache.xerces.xni.parser",org.apache.xerces.xni.grammars;version="@impl.version@";uses:="org.apache.xerces.xni,org.apache.xerces.xni.parser,org.apache.xerces.xs",org.apache.xerces.xni.parser;version="@impl.version@";uses:="org.apache.xerces.xni",org.apache.xerces.xpointer;version="@impl.version@";uses:="org.apache.xerces.impl,org.apache.xerces.util,org.apache.xerces.xinclude,org.apache.xerces.xni,org.apache.xerces.xni.parser",org.apache.xerces.xs;version="@impl.version@";uses:="org.apache.xerces.xs.datatypes,org.w3c.dom,org.w3c.dom.ls",org.apache.xerces.xs.datatypes;version="@impl.version@";uses:="javax.xml.datatype,javax.xml.namespace,org.apache.xerces.xni,org.apache.xerces.xs",org.apache.xml.serialize;version="@impl.version@";uses:="org.apache.xerces.dom,org.apache.xerces.util,org.w3c.dom,org.w3c.dom.ls,org.xml.sax,org.xml.sax.ext",org.w3c.dom.html;version="@impl.version@";uses:="org.w3c.dom"
++Bundle-Name: @impl.name@
++Bundle-Version: @impl.version@
  
  Name: org/apache/xerces/impl/
  Comment: @impl.name@ 
diff --git a/xerces-j2.spec b/xerces-j2.spec
index a55f1fe..7b798ea 100644
--- a/xerces-j2.spec
+++ b/xerces-j2.spec
@@ -2,7 +2,7 @@
 
 Name:          xerces-j2
 Version:       2.12.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Java XML parser
 # Most of the source is ASL 2.0
 # W3C licensed files:
@@ -198,6 +198,10 @@ ln -sf %{name}.jar %{_javadir}/jaxp_parser_impl.jar
 %{_datadir}/%{name}
 
 %changelog
+* Fri Mar 12 2021 Mat Booth <mat.booth@redhat.com> - 2.12.1-3
+- Update OSGi metadata, use import-package instead of require-bundle
+  in order to avoid some tricky OSGi breakage on Java 11
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild