Hello community,
here is the log from the commit of package woodstox-core for openSUSE:Factory
checked in at 2020-04-01 19:19:15
Comparing /work/SRC/openSUSE:Factory/woodstox-core (Old)
and /work/SRC/openSUSE:Factory/.woodstox-core.new.3248 (New)
Package is "woodstox-core"
Wed Apr 1 19:19:15 2020 rev:3 rq:790529 version:6.1.1
Changes:
--- /work/SRC/openSUSE:Factory/woodstox-core/woodstox-core.changes
2019-06-06 18:18:06.120672329 +0200
+++ /work/SRC/openSUSE:Factory/.woodstox-core.new.3248/woodstox-core.changes
2020-04-01 19:19:31.483563143 +0200
@@ -1,0 +2,11 @@
+Tue Mar 31 06:35:08 UTC 2020 - Fridrich Strba
+
+- Upgrade to upstream version 6.1.1
+- Removed patch:
+ * 0001-stax2-api.patch
++ Not needed any more with this version
+- Added patch:
+ * 0001-Allow-building-against-OSGi-APIs-newer-than-R4.patch
++ Migrate build from felix-osgi-core to osgi-core
+
+---
Old:
0001-stax2-api.patch
woodstox-core-5.2.0.tar.gz
New:
0001-Allow-building-against-OSGi-APIs-newer-than-R4.patch
woodstox-core-6.1.1.tar.gz
Other differences:
--
++ woodstox-core.spec ++
--- /var/tmp/diff_new_pack.KCcQBP/_old 2020-04-01 19:19:32.563563629 +0200
+++ /var/tmp/diff_new_pack.KCcQBP/_new 2020-04-01 19:19:32.563563629 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package woodstox
+# spec file for package woodstox-core
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,25 +19,25 @@
%global base_name woodstox
%global core_name %{base_name}-core
Name: %{core_name}
-Version:5.2.0
+Version:6.1.1
Release:0
Summary:XML processor
License:Apache-2.0
Group: Development/Libraries/Java
URL:https://github.com/FasterXML/woodstox
Source0:
https://github.com/FasterXML/%{base_name}/archive/%{name}-%{version}.tar.gz
-Patch0: 0001-stax2-api.patch
+Patch0: 0001-Allow-building-against-OSGi-APIs-newer-than-R4.patch
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: mvn(com.fasterxml:oss-parent:pom:)
-BuildRequires: mvn(javax.xml.stream:stax-api)
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(net.java.dev.msv:msv-core)
-BuildRequires: mvn(net.java.dev.msv:msv-rngconverter)
BuildRequires: mvn(net.java.dev.msv:xsdlib)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
-BuildRequires: mvn(org.apache.felix:org.osgi.core)
+BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
BuildRequires: mvn(org.codehaus.woodstox:stax2-api)
+BuildRequires: mvn(org.osgi:osgi.core)
+BuildRequires: mvn(relaxngDatatype:relaxngDatatype)
BuildArch: noarch
%description
@@ -58,19 +58,20 @@
%patch0 -p1
-%pom_xpath_inject
'pom:plugin[pom:artifactId="maven-bundle-plugin"]/pom:configuration' '
-
-{local-packages}
-'
+%pom_remove_plugin :nexus-staging-maven-plugin
+
+# we don't care about Java 9 modules (yet)
+%pom_remove_plugin :moditect-maven-plugin
+
+# replace felix-osgi-core with osgi-core
+%pom_change_dep -r :org.osgi.core org.osgi:osgi.core
%{mvn_alias} ":{woodstox-core}" :@1-lgpl :@1-asl :wstx-asl :wstx-lgpl \
org.codehaus.woodstox:@1 org.codehaus.woodstox:@1-asl \
org.codehaus.woodstox:@1-lgpl org.codehaus.woodstox:wstx-lgpl \
org.codehaus.woodstox:wstx-asl
-%{mvn_file} : %{name}{,-asl,-lgpl}
-# Fails even when using online maven build
-rm ./src/test/java/org/codehaus/stax/test/stream/TestNamespaces.java
+%{mvn_file} : %{name}{,-asl,-lgpl}
%build
%{mvn_build} -f -- -Dsource=6
++ 0001-Allow-building-against-OSGi-APIs-newer-than-R4.patch ++
>From 46dbf7151b5d8b1a854863305297cc7b4a70af44 Mon Sep 17 00:00:00 2001
From: Mat Booth
Date: Wed, 18 Sep 2019 16:00:51 +0100
Subject: [PATCH] Allow building against OSGi APIs newer than R4
---
.../ctc/wstx/osgi/WstxBundleActivator.java| 23 ---
1 file changed, 20 insertions(+), 3 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
--- a/src/main/java/com/ctc/wstx/osgi/WstxBundleActivator.java
+++ b/src/main/java/com/ctc/wstx/osgi/WstxBundleActivator.java
@@ -1,5 +1,9 @@
package com.ctc.wstx.osgi;
+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
