diff --git a/0001-Allow-building-against-OSGi-APIs-newer-than-R4.patch b/0001-Allow-building-against-OSGi-APIs-newer-than-R4.patch index 705cfd3..d2c970d 100644 --- a/0001-Allow-building-against-OSGi-APIs-newer-than-R4.patch +++ b/0001-Allow-building-against-OSGi-APIs-newer-than-R4.patch @@ -1,39 +1,41 @@ -From 41a1c5c6b0b88f604b024f531292c7cb79e9c075 Mon Sep 17 00:00:00 2001 +From 18c3c498a8099dca74127abbc958d696b4397825 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 18 Sep 2019 16:00:51 +0100 Subject: [PATCH 1/2] Allow building against OSGi APIs newer than R4 --- - .../ctc/wstx/osgi/WstxBundleActivator.java | 23 ++++++++++++++++--- - 1 file changed, 20 insertions(+), 3 deletions(-) + .../ctc/wstx/osgi/WstxBundleActivator.java | 24 ++++++++++++++----- + 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ctc/wstx/osgi/WstxBundleActivator.java b/src/main/java/com/ctc/wstx/osgi/WstxBundleActivator.java -index 0ad8402..26b1f0f 100644 +index b233267..cedf476 100644 --- a/src/main/java/com/ctc/wstx/osgi/WstxBundleActivator.java +++ b/src/main/java/com/ctc/wstx/osgi/WstxBundleActivator.java -@@ -1,5 +1,9 @@ +@@ -1,6 +1,8 @@ package com.ctc.wstx.osgi; -+import java.util.Dictionary; + import java.util.Dictionary; +import java.util.Hashtable; +import java.util.Properties; -+ + import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; - -@@ -27,16 +31,29 @@ public class WstxBundleActivator +@@ -30,19 +32,29 @@ public class WstxBundleActivator public void start(BundleContext ctxt) { InputFactoryProviderImpl inputP = new InputFactoryProviderImpl(); -- ctxt.registerService(Stax2InputFactoryProvider.class.getName(), inputP, inputP.getProperties()); +- final Dictionary inputProps = inputP.getProperties(); +- ctxt.registerService(Stax2InputFactoryProvider.class.getName(), inputP, inputProps); + ctxt.registerService(Stax2InputFactoryProvider.class.getName(), inputP, convertPropsToDict(inputP.getProperties())); OutputFactoryProviderImpl outputP = new OutputFactoryProviderImpl(); -- ctxt.registerService(Stax2OutputFactoryProvider.class.getName(), outputP, outputP.getProperties()); +- final Dictionary outputProps = outputP.getProperties(); +- ctxt.registerService(Stax2OutputFactoryProvider.class.getName(), outputP, outputProps); + ctxt.registerService(Stax2OutputFactoryProvider.class.getName(), outputP, convertPropsToDict(outputP.getProperties())); ValidationSchemaFactoryProviderImpl[] impls = ValidationSchemaFactoryProviderImpl.createAll(); for (int i = 0, len = impls.length; i < len; ++i) { ValidationSchemaFactoryProviderImpl impl = impls[i]; -- ctxt.registerService(Stax2ValidationSchemaFactoryProvider.class.getName(), impl, impl.getProperties()); +- final Dictionary implProps = impl.getProperties(); +- ctxt.registerService(Stax2ValidationSchemaFactoryProvider.class.getName(), impl, implProps); + ctxt.registerService(Stax2ValidationSchemaFactoryProvider.class.getName(), impl, convertPropsToDict(impl.getProperties())); } } @@ -55,5 +57,5 @@ index 0ad8402..26b1f0f 100644 public void stop(BundleContext ctxt) { // Nothing to do here: OSGi automatically de-registers services upon -- -2.26.2 +2.28.0 diff --git a/0002-Patch-out-optional-support-for-msv-and-relax-schema-.patch b/0002-Patch-out-optional-support-for-msv-and-relax-schema-.patch index 2ebca6f..febe438 100644 --- a/0002-Patch-out-optional-support-for-msv-and-relax-schema-.patch +++ b/0002-Patch-out-optional-support-for-msv-and-relax-schema-.patch @@ -1,4 +1,4 @@ -From 30cc07ca6e54f0adebc78f3497b444fa5d6a7340 Mon Sep 17 00:00:00 2001 +From 44c46d0412b02942c77f502a578ca3d1c1f0559d Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 22 Apr 2020 13:48:07 +0100 Subject: [PATCH 2/2] Patch out optional support for msv and relax schema @@ -156,5 +156,5 @@ index b9d0c54..5ec3da2 100644 String failPhrase) throws XMLStreamException { -- -2.26.2 +2.28.0 diff --git a/sources b/sources index f2feb7e..c49ece2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (woodstox-core-6.2.1.tar.gz) = 9da6a452143df09443fe133d9bcba813f4de4517c2d39a4983945412f9ac4a0a00b13d551b2b5fad77ecfb39ba6f818e7bfb7cd5bfe4696f80e6aee1febfac6f +SHA512 (woodstox-core-6.2.2.tar.gz) = bdd83f319cc8f56bb9b1a81fce25809441d01b5135e4c5652ee542305ecb18f95e0fe7ca912bf06963d10a67bc6b4072038161bb8a911830ea66f8878eb9b3f1 diff --git a/woodstox-core.spec b/woodstox-core.spec index 1e5c996..6d6f336 100644 --- a/woodstox-core.spec +++ b/woodstox-core.spec @@ -2,8 +2,8 @@ Name: woodstox-core Summary: High-performance XML processor -Version: 6.2.1 -Release: 5%{?dist} +Version: 6.2.2 +Release: 1%{?dist} License: ASL 2.0 or LGPLv2+ or BSD URL: https://github.com/FasterXML/woodstox @@ -83,6 +83,9 @@ rm -rf src/test/java/wstxtest/msv src/test/java/wstxtest/vstream/TestRelaxNG.jav %license LICENSE %changelog +* Wed Oct 14 13:48:17 +03 2020 ElXreno - 6.2.2-1 +- Update to version 6.2.2 + * Wed Jul 29 2020 Fedora Release Engineering - 6.2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild