Hello community, here is the log from the commit of package felix-scr for openSUSE:Factory checked in at 2020-04-01 19:18:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/felix-scr (Old) and /work/SRC/openSUSE:Factory/.felix-scr.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "felix-scr" Wed Apr 1 19:18:42 2020 rev:3 rq:790522 version:2.1.16 Changes: -------- --- /work/SRC/openSUSE:Factory/felix-scr/felix-scr.changes 2019-11-26 16:56:58.448155130 +0100 +++ /work/SRC/openSUSE:Factory/.felix-scr.new.3248/felix-scr.changes 2020-04-01 19:19:00.175549057 +0200 @@ -1,0 +2,13 @@ +Wed Apr 1 08:21:39 UTC 2020 - Fridrich Strba <[email protected]> + +- Update to version 2.1.16 +- Modified patch: + * osgi-metadata.patch -> + 0001-Use-import-package-instead-of-embedding-dependencies.patch + + Don't embed dependencies, use import-package instead +- Added patch: + * 0002-Drop-the-dependencies-on-kxml-xpp3.patch + + Drop dependencies on kxml and xpp, use the system SAX + implementation instead + +------------------------------------------------------------------- Old: ---- LICENSE NOTICE org.apache.felix.scr-2.0.14.tar.xz osgi-metadata.patch New: ---- 0001-Use-import-package-instead-of-embedding-dependencies.patch 0002-Drop-the-dependencies-on-kxml-xpp3.patch org.apache.felix.scr-2.1.16-source-release.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ felix-scr.spec ++++++ --- /var/tmp/diff_new_pack.5gijjm/_old 2020-04-01 19:19:01.127549485 +0200 +++ /var/tmp/diff_new_pack.5gijjm/_new 2020-04-01 19:19:01.131549487 +0200 @@ -1,7 +1,7 @@ # # spec file for package felix-scr # -# Copyright (c) 2019 SUSE LLC +# 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 @@ -18,32 +18,26 @@ %global bundle org.apache.felix.scr Name: felix-scr -Version: 2.0.14 +Version: 2.1.16 Release: 0 Summary: Apache Felix Service Component Runtime (SCR) License: Apache-2.0 Group: Development/Libraries/Java -URL: http://felix.apache.org/documentation/subprojects/apache-felix-service-component-runtime.html -# svn export http://svn.apache.org/repos/asf/felix/releases/%{bundle}-%{version}/ -# tar caJf %{bundle}-%{version}.tar.xz %{bundle}-%{version} -Source0: %{bundle}-%{version}.tar.xz -Source1: http://svn.apache.org/repos/asf/felix/releases/1.0.0/LICENSE -Source2: http://svn.apache.org/repos/asf/felix/releases/1.0.0/NOTICE +URL: https://felix.apache.org/documentation/subprojects/apache-felix-service-component-runtime.html +Source0: http://archive.apache.org/dist/felix/%{bundle}-%{version}-source-release.tar.gz # Don't embed deps, use import-package instead -Patch0: osgi-metadata.patch +Patch0: 0001-Use-import-package-instead-of-embedding-dependencies.patch +# Drop dep on kxml/xpp, use the system SAX implementation instead +Patch1: 0002-Drop-the-dependencies-on-kxml-xpp3.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: xz -BuildRequires: mvn(net.sf.kxml:kxml2) BuildRequires: mvn(org.apache.felix:felix-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:org.apache.felix.gogo.runtime) -BuildRequires: mvn(org.apache.felix:org.apache.felix.shell) -BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) BuildRequires: mvn(org.osgi:osgi.annotation) -BuildRequires: mvn(org.osgi:osgi.cmpn) -BuildRequires: mvn(org.osgi:osgi.core) -BuildRequires: mvn(xpp3:xpp3) +BuildRequires: mvn(org.osgi:osgi.cmpn) >= 7.0.0 +BuildRequires: mvn(org.osgi:osgi.core) >= 7.0.0 BuildArch: noarch %description @@ -58,40 +52,34 @@ %prep %setup -q -n %{bundle}-%{version} -cp %{SOURCE1} %{SOURCE2} . -%patch0 +%patch0 -p1 +%patch1 -p1 # All these OSGi deps are provided in the compendium jar -%pom_add_dep org.osgi:osgi.cmpn:6.0.0:provided +%pom_add_dep org.osgi:osgi.cmpn:7.0.0:provided %pom_remove_dep org.osgi:org.osgi.service.component %pom_remove_dep org.osgi:org.osgi.service.cm %pom_remove_dep org.osgi:org.osgi.service.log %pom_remove_dep org.osgi:org.osgi.service.metatype %pom_remove_dep org.osgi:org.osgi.namespace.extender -%pom_remove_dep org.osgi:osgi.promise +%pom_remove_dep org.osgi:org.osgi.util.promise +%pom_remove_dep org.osgi:org.osgi.util.function -# Many test deps are not in Fedora +# Remove test deps %pom_xpath_remove "pom:project/pom:dependencies/pom:dependency[pom:scope='test']" %pom_remove_dep org.ops4j.base: +%pom_remove_plugin :maven-failsafe-plugin -# Animal sniffer is unnecessary since we always know JRE level on Fedora +# Animal sniffer is unnecessary since we always know JRE level %pom_remove_dep :animal-sniffer-annotations sed -i -e '/IgnoreJRERequirement/d' src/main/java/org/apache/felix/scr/impl/manager/ThreadDump.java -# Upstream kxml bundles xpp3. Since RHBZ#1299774 kxml no longer -# bundles xpp3 packages. Add the dep to the pom. kxml requires xpp3 -# already. -%pom_add_dep xpp3:xpp3:1.1.4c:compile -# And since we are not bundling kxml, need to make it 'compile' scope -# instead of 'provided' scope so it's pulled in by RPM requires -%pom_change_dep net.sf.kxml:kxml2 net.sf.kxml:kxml2:2.2.2:compile - %{mvn_file} : felix/%{bundle} %build -%{mvn_build} -f \ +%{mvn_build} -f -- -Dfelix.java.version=7 \ %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - -- -Dmaven.compiler.release=6 + -Dmaven.compiler.release=7 %endif %install ++++++ 0001-Use-import-package-instead-of-embedding-dependencies.patch ++++++ >From 5c822613993f2193590252f1eb75c67e7cdf1c87 Mon Sep 17 00:00:00 2001 From: Mat Booth <[email protected]> Date: Wed, 6 Mar 2019 10:19:20 +0000 Subject: [PATCH 1/2] Use import-package instead of embedding dependencies --- bnd.bnd | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/bnd.bnd b/bnd.bnd index 420c0e0..ae3fadb 100644 --- a/bnd.bnd +++ b/bnd.bnd @@ -1,3 +1,4 @@ +Bundle-SymbolicName: org.apache.felix.scr Bundle-Category: osgi Bundle-DocURL: http://felix.apache.org/site/apache-felix-service-component-runtime.html Bundle-Activator: org.apache.felix.scr.impl.Activator @@ -14,10 +15,7 @@ Require-Capability: osgi.ee;\ filter:="(|(&(osgi.ee=JavaSE)(version=1.7))(&(osgi.ee=JavaSE/compact1)(version=1.8)))" Export-Package: org.apache.felix.scr.component;version=1.1.0;provide:=true, \ - org.apache.felix.scr.info;version=1.0.0;provide:=true, \ - org.osgi.service.component;version=1.4;provide:=true, \ - org.osgi.service.component.runtime;version=1.4;provide:=true, \ - org.osgi.service.component.runtime.dto;version=1.4;provide:=true + org.apache.felix.scr.info;version=1.0.0;provide:=true Private-Package: org.apache.felix.scr.impl.* @@ -28,6 +26,16 @@ Private-Package: org.apache.felix.scr.impl.* # R4.0 version 1.2 is sufficient. # optional import for Gogo annotations Import-Package: \ + org.osgi.dto;version="[1.0,2)", \ + org.osgi.framework;version="[1.8,2)", \ + org.osgi.framework.dto;version="[1.8,2)", \ + org.osgi.framework.startlevel;version="[1.0,2)", \ + org.osgi.framework.wiring;version="[1.2,2)", \ + org.osgi.service.component;version="[1.4,1.5)", \ + org.osgi.service.component.runtime;version="[1.4,1.5)", \ + org.osgi.service.component.runtime.dto;version="[1.4,1.5)", \ + org.osgi.util.promise;version="[1.0,2)", \ + org.osgi.util.tracker;version="[1.5,2)", \ org.osgi.service.cm;version="[1.6,2)";resolution:=optional, \ org.osgi.service.log;version="[1.3,2)";resolution:=optional, \ org.osgi.service.metatype;version="[1.2,2)";resolution:=optional, \ -- 2.21.1 ++++++ 0002-Drop-the-dependencies-on-kxml-xpp3.patch ++++++ ++++ 885 lines (skipped)
