April 2020 - openSUSE Commits - openSUSE Mailing Lists

commit felix-utils for openSUSE:Factory
by root 01 Apr '20

01 Apr '20

Hello community, here is the log from the commit of package felix-utils for openSUSE:Factory checked in at 2020-04-01 19:18:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/felix-utils (Old) and /work/SRC/openSUSE:Factory/.felix-utils.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "felix-utils" Wed Apr 1 19:18:51 2020 rev:3 rq:790524 version:1.11.4 Changes: -------- --- /work/SRC/openSUSE:Factory/felix-utils/felix-utils.changes 2019-04-11 12:19:11.728990139 +0200 +++ /work/SRC/openSUSE:Factory/.felix-utils.new.3248/felix-utils.changes 2020-04-01 19:19:13.111554877 +0200 @@ -1,0 +2,8 @@ +Tue Mar 31 06:19:36 UTC 2020 - Fridrich Strba <fstrba(a)suse.com> + +- Update to upstream release 1.11.4 +- Added patch: + * 0000-Port-to-osgi-cmpn.patch + + Migrate away from the old felix-osgi implementation + +------------------------------------------------------------------- Old: ---- org.apache.felix.utils-1.10.4-source-release.tar.gz New: ---- 0000-Port-to-osgi-cmpn.patch org.apache.felix.utils-1.11.4-source-release.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ felix-utils.spec ++++++ --- /var/tmp/diff_new_pack.ghUDTT/_old 2020-04-01 19:19:16.071556209 +0200 +++ /var/tmp/diff_new_pack.ghUDTT/_new 2020-04-01 19:19:16.071556209 +0200 @@ -1,7 +1,7 @@ # # spec file for package felix-utils # -# 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,19 +19,20 @@ %global bundle org.apache.felix.utils %bcond_with tests Name: felix-utils -Version: 1.10.4 +Version: 1.11.4 Release: 0 Summary: Utility classes for OSGi License: Apache-2.0 Group: Development/Libraries/Java -URL: http://felix.apache.org -Source0: http://repo1.maven.org/maven2/org/apache/felix/%{bundle}/%{version}/%{bundl… +URL: https://felix.apache.org +Source0: https://repo1.maven.org/maven2/org/apache/felix/%{bundle}/%{version}/%{bund… Source1: %{name}-build.xml +Patch0: 0000-Port-to-osgi-cmpn.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: felix-osgi-compendium -BuildRequires: felix-osgi-core BuildRequires: javapackages-local +BuildRequires: osgi-compendium +BuildRequires: osgi-core BuildArch: noarch %if %{with tests} BuildRequires: ant-junit @@ -51,9 +52,10 @@ %prep %setup -q -n %{bundle}-%{version} +%patch0 -p1 cp -p %{SOURCE1} build.xml mkdir -p lib -build-jar-repository -s lib felix +build-jar-repository -s lib osgi-core osgi-compendium %if %{with tests} build-jar-repository -s lib junit hamcrest/core mockito %endif ++++++ 0000-Port-to-osgi-cmpn.patch ++++++ >From d7a2d969b55ab34a223ad1422b2e3ef7d95a347f Mon Sep 17 00:00:00 2001 From: Marian Koncek <mkoncek(a)redhat.com> Date: Mon, 5 Nov 2018 09:59:04 +0100 Subject: [PATCH] Port to osgi-cmpn --- .../utils/repository/AggregateRepository.java | 20 +++++++++++++++++++ .../utils/repository/BaseRepository.java | 19 ++++++++++++++++++ .../utils/properties/MockBundleContext.java | 10 ++++++++++ 3 files changed, 49 insertions(+) diff --git a/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java b/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java index 50dceaf..4da3141 100644 --- a/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java +++ b/src/main/java/org/apache/felix/utils/repository/AggregateRepository.java @@ -25,7 +25,12 @@ import java.util.Map; import org.osgi.resource.Capability; import org.osgi.resource.Requirement; +import org.osgi.resource.Resource; +import org.osgi.service.repository.ExpressionCombiner; import org.osgi.service.repository.Repository; +import org.osgi.service.repository.RequirementBuilder; +import org.osgi.service.repository.RequirementExpression; +import org.osgi.util.promise.Promise; public class AggregateRepository implements Repository { @@ -52,4 +57,19 @@ public class AggregateRepository implements Repository { } return result; } + + @Override + public Promise<Collection<Resource>> findProviders(RequirementExpression expression) { + throw new UnsupportedOperationException(); + } + + @Override + public ExpressionCombiner getExpressionCombiner() { + throw new UnsupportedOperationException(); + } + + @Override + public RequirementBuilder newRequirementBuilder(String namespace) { + throw new UnsupportedOperationException(); + } } diff --git a/src/main/java/org/apache/felix/utils/repository/BaseRepository.java b/src/main/java/org/apache/felix/utils/repository/BaseRepository.java index 95adadd..0998ab0 100644 --- a/src/main/java/org/apache/felix/utils/repository/BaseRepository.java +++ b/src/main/java/org/apache/felix/utils/repository/BaseRepository.java @@ -30,7 +30,11 @@ import org.osgi.framework.Constants; import org.osgi.resource.Capability; import org.osgi.resource.Requirement; import org.osgi.resource.Resource; +import org.osgi.service.repository.ExpressionCombiner; import org.osgi.service.repository.Repository; +import org.osgi.service.repository.RequirementBuilder; +import org.osgi.service.repository.RequirementExpression; +import org.osgi.util.promise.Promise; /** */ @@ -90,4 +94,19 @@ public class BaseRepository implements Repository { } return result; } + + @Override + public Promise<Collection<Resource>> findProviders(RequirementExpression expression) { + throw new UnsupportedOperationException(); + } + + @Override + public ExpressionCombiner getExpressionCombiner() { + throw new UnsupportedOperationException(); + } + + @Override + public RequirementBuilder newRequirementBuilder(String namespace) { + throw new UnsupportedOperationException(); + } } diff --git a/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java b/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java index 3eab444..df94a6c 100644 --- a/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java +++ b/src/test/java/org/apache/felix/utils/properties/MockBundleContext.java @@ -25,7 +25,9 @@ import org.osgi.framework.BundleListener; import org.osgi.framework.Filter; import org.osgi.framework.FrameworkListener; import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceFactory; import org.osgi.framework.ServiceListener; +import org.osgi.framework.ServiceObjects; import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; @@ -105,6 +107,10 @@ public class MockBundleContext implements BundleContext { throw new UnsupportedOperationException(); } + public <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String, ?> properties) { + throw new UnsupportedOperationException(); + } + public ServiceReference[] getServiceReferences(String s, String s1) throws InvalidSyntaxException { throw new UnsupportedOperationException(); } @@ -125,6 +131,10 @@ public class MockBundleContext implements BundleContext { throw new UnsupportedOperationException(); } + public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) { + throw new UnsupportedOperationException(); + } + public File getDataFile(String s) { throw new UnsupportedOperationException(); } -- 2.17.2 ++++++ felix-utils-build.xml ++++++ --- /var/tmp/diff_new_pack.ghUDTT/_old 2020-04-01 19:19:16.099556222 +0200 +++ /var/tmp/diff_new_pack.ghUDTT/_new 2020-04-01 19:19:16.099556222 +0200 @@ -10,8 +10,8 @@ <property name="project.groupId" value="org.apache.felix"/> <property name="project.name" value="Apache Felix Utils"/> - <property name="project.version" value="1.10.4"/> - <property name="spec.version" value="1.10"/> + <property name="project.version" value="1.11.4"/> + <property name="spec.version" value="1.11"/> <property name="project.artifactId" value="org.apache.felix.utils"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/> @@ -25,7 +25,7 @@ <property name="test.reports" value="${build.dir}/test-reports"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/> - <property name="compiler.source" value="1.6"/> + <property name="compiler.source" value="1.7"/> <property name="compiler.target" value="${compiler.source}"/>  ++++++ org.apache.felix.utils-1.10.4-source-release.tar.gz -> org.apache.felix.utils-1.11.4-source-release.tar.gz ++++++ ++++ 5243 lines of diff (skipped)

1 0

commit felix-shell for openSUSE:Factory
by root 01 Apr '20

01 Apr '20

Hello community, here is the log from the commit of package felix-shell for openSUSE:Factory checked in at 2020-04-01 19:18:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/felix-shell (Old) and /work/SRC/openSUSE:Factory/.felix-shell.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "felix-shell" Wed Apr 1 19:18:44 2020 rev:3 rq:790523 version:1.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/felix-shell/felix-shell.changes 2019-12-02 11:38:21.690460936 +0100 +++ /work/SRC/openSUSE:Factory/.felix-shell.new.3248/felix-shell.changes 2020-04-01 19:19:07.023552138 +0200 @@ -1,0 +2,5 @@ +Tue Mar 31 06:10:51 UTC 2020 - Fridrich Strba <fstrba(a)suse.com> + +- Build against OSGi R7 APIs + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ felix-shell.spec ++++++ --- /var/tmp/diff_new_pack.SEICWu/_old 2020-04-01 19:19:08.803552938 +0200 +++ /var/tmp/diff_new_pack.SEICWu/_new 2020-04-01 19:19:08.803552938 +0200 @@ -1,7 +1,7 @@ # # spec file for package felix-shell # -# 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 @@ -23,14 +23,14 @@ Summary: Apache Felix Shell Service License: Apache-2.0 Group: Development/Libraries/Java -URL: http://felix.apache.org +URL: https://felix.apache.org Source0: http://archive.apache.org/dist/felix/%{bundle}-%{version}-source-release.ta… BuildRequires: fdupes BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:felix-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.osgi:org.osgi.compendium) -BuildRequires: mvn(org.osgi:org.osgi.core) +BuildRequires: mvn(org.osgi:osgi.cmpn) +BuildRequires: mvn(org.osgi:osgi.core) BuildArch: noarch %description @@ -48,6 +48,10 @@ %pom_remove_plugin org.codehaus.mojo:rat-maven-plugin +# Use latest OSGi implementation +%pom_change_dep :org.osgi.core org.osgi:osgi.core +%pom_change_dep :org.osgi.compendium org.osgi:osgi.cmpn + %pom_add_dep junit:junit::test %{mvn_file} :%{bundle} "felix/%{bundle}" @@ -63,11 +67,10 @@ %fdupes -s %{buildroot}%{_javadocdir} %files -f .mfiles -%license LICENSE -%doc NOTICE DEPENDENCIES +%license LICENSE NOTICE +%doc DEPENDENCIES %files javadoc -f .mfiles-javadoc -%license LICENSE -%doc NOTICE +%license LICENSE NOTICE %changelog

1 0

commit felix-scr for openSUSE:Factory
by root 01 Apr '20

01 Apr '20

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 <fstrba(a)suse.com> + +- 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-comp… -# 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-com… +Source0: http://archive.apache.org/dist/felix/%{bundle}-%{version}-source-release.ta… # 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 <mat.booth(a)redhat.com> 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)

1 0

commit aqute-bnd for openSUSE:Factory
by root 01 Apr '20

01 Apr '20

Hello community, here is the log from the commit of package aqute-bnd for openSUSE:Factory checked in at 2020-04-01 19:18:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aqute-bnd (Old) and /work/SRC/openSUSE:Factory/.aqute-bnd.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "aqute-bnd" Wed Apr 1 19:18:33 2020 rev:5 rq:790521 version:3.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/aqute-bnd/aqute-bnd.changes 2019-07-02 10:38:41.518608852 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.3248/aqute-bnd.changes 2020-04-01 19:18:53.119545882 +0200 @@ -1,0 +2,7 @@ +Wed Apr 1 08:09:22 UTC 2020 - Fridrich Strba <fstrba(a)suse.com> + +- Addes patch: + * 0001-Port-to-OSGI-7.0.0.patch + + Port to OSGI 7.0.0 + +------------------------------------------------------------------- New: ---- 0001-Port-to-OSGI-7.0.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aqute-bnd.spec ++++++ --- /var/tmp/diff_new_pack.KW1BrC/_old 2020-04-01 19:18:56.491547399 +0200 +++ /var/tmp/diff_new_pack.KW1BrC/_new 2020-04-01 19:18:56.495547401 +0200 @@ -1,7 +1,7 @@ # # spec file for package aqute-bnd # -# 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 @@ -23,7 +23,7 @@ # Part of jpm is under BSD, but jpm is not included in binary RPM License: Apache-2.0 Group: Development/Libraries/Java -URL: http://bnd.bndtools.org/ +URL: https://bnd.bndtools.org/ Source0: https://github.com/bndtools/bnd/archive/%{version}.REL.tar.gz Source1: bnd-%{version}.REL-build_xml.tar.xz Source3: https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.li… @@ -32,7 +32,8 @@ Source6: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/%{ver… Patch0: 0001-Disable-removed-commands.patch Patch1: 0002-Fix-ant-compatibility.patch -Patch2: aqute-bnd-3.5.0-java8compat.patch +Patch2: 0001-Port-to-OSGI-7.0.0.patch +Patch3: aqute-bnd-3.5.0-java8compat.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local @@ -91,6 +92,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # the commands pull in more dependencies than we want (felix-resolver, jetty) rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java ++++++ bnd-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.KW1BrC/_old 2020-04-01 19:18:56.527547415 +0200 +++ /var/tmp/diff_new_pack.KW1BrC/_new 2020-04-01 19:18:56.527547415 +0200 @@ -1,7 +1,7 @@ # # spec file for package bnd-maven-plugin # -# 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 @@ -23,7 +23,7 @@ # Part of jpm is under BSD, but jpm is not included in binary RPM License: Apache-2.0 Group: Development/Libraries/Java -URL: http://bnd.bndtools.org/ +URL: https://bnd.bndtools.org/ Source0: https://github.com/bndtools/bnd/archive/%{version}.REL.tar.gz BuildRequires: fdupes BuildRequires: maven-local ++++++ 0001-Port-to-OSGI-7.0.0.patch ++++++ >From e9469ae2ca9f3d64fd88e0d8aaf8ebeea7bb937d Mon Sep 17 00:00:00 2001 From: Marian Koncek <mkoncek(a)redhat.com> Date: Fri, 12 Apr 2019 14:59:30 +0200 Subject: [PATCH] Port to OSGI 7.0.0 --- .../src/aQute/bnd/main/ReporterLogger.java | 16 +++++++++ .../src/aQute/bnd/testing/TestingLog.java | 35 +++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java b/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java index ce86cd6..735db9c 100644 --- a/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java +++ b/biz.aQute.bnd/src/aQute/bnd/main/ReporterLogger.java @@ -1,5 +1,6 @@ package aQute.bnd.main; +import org.osgi.framework.Bundle; import org.osgi.framework.ServiceReference; import org.osgi.service.log.LogService; import org.slf4j.Logger; @@ -8,6 +9,7 @@ import org.slf4j.LoggerFactory; import aQute.service.reporter.Reporter; public class ReporterLogger implements LogService { + private final static RuntimeException UNSUPPORTED = new UnsupportedOperationException("This method is provided for backwards compatibility"); private final static Logger logger = LoggerFactory.getLogger(ReporterLogger.class); private Reporter reporter; @@ -108,4 +110,18 @@ public class ReporterLogger implements LogService { } } + @Override + public org.osgi.service.log.Logger getLogger(String name) {throw UNSUPPORTED;} + + @Override + public org.osgi.service.log.Logger getLogger(Class< ? > clazz) {throw UNSUPPORTED;} + + @Override + public <L extends org.osgi.service.log.Logger> L getLogger(String name, Class<L> loggerType) {throw UNSUPPORTED;} + + @Override + public <L extends org.osgi.service.log.Logger> L getLogger(Class< ? > clazz, Class<L> loggerType) {throw UNSUPPORTED;} + + @Override + public <L extends org.osgi.service.log.Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {throw UNSUPPORTED;} } diff --git a/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java b/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java index d9c3e78..ec7dd27 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java +++ b/biz.aQute.bndlib/src/aQute/bnd/testing/TestingLog.java @@ -8,7 +8,9 @@ import java.util.regex.Pattern; import org.osgi.framework.Bundle; import org.osgi.framework.ServiceReference; +import org.osgi.service.log.Logger; import org.osgi.service.log.LogEntry; +import org.osgi.service.log.LogLevel; import org.osgi.service.log.LogService; import aQute.bnd.annotation.component.Activate; @@ -26,6 +28,8 @@ import aQute.bnd.testing.TestingLog.Config; @Component(designate = Config.class) @SuppressWarnings("rawtypes") public class TestingLog implements LogService { + private final static RuntimeException UNSUPPORTED = new UnsupportedOperationException("This method is provided for backwards compatibility"); + boolean stacktrace; boolean direct; int level; @@ -125,6 +129,22 @@ public class TestingLog implements LogService { return sb.toString(); } } + + @Override + public LogLevel getLogLevel() {throw UNSUPPORTED;} + + @Override + public String getLoggerName() {throw UNSUPPORTED;} + + @Override + public long getSequence() {throw UNSUPPORTED;} + + @Override + public String getThreadInfo() {throw UNSUPPORTED;} + + @Override + public StackTraceElement getLocation() {throw UNSUPPORTED;} + }; entries.add(entry); if (direct) @@ -197,4 +217,19 @@ public class TestingLog implements LogService { return n != 0; } + @Override + public Logger getLogger(String name) {throw UNSUPPORTED;} + + @Override + public Logger getLogger(Class< ? > clazz) {throw UNSUPPORTED;} + + @Override + public <L extends Logger> L getLogger(String name, Class<L> loggerType) {throw UNSUPPORTED;} + + @Override + public <L extends Logger> L getLogger(Class< ? > clazz, Class<L> loggerType) {throw UNSUPPORTED;} + + @Override + public <L extends Logger> L getLogger(Bundle bundle, String name, Class<L> loggerType) {throw UNSUPPORTED;} + } -- 2.20.1

1 0

commit osgi-core for openSUSE:Factory
by root 01 Apr '20

01 Apr '20

Hello community, here is the log from the commit of package osgi-core for openSUSE:Factory checked in at 2020-04-01 19:18:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osgi-core (Old) and /work/SRC/openSUSE:Factory/.osgi-core.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osgi-core" Wed Apr 1 19:18:28 2020 rev:2 rq:790501 version:7.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/osgi-core/osgi-core.changes 2019-02-28 21:39:07.265626641 +0100 +++ /work/SRC/openSUSE:Factory/.osgi-core.new.3248/osgi-core.changes 2020-04-01 19:18:48.147543645 +0200 @@ -1,0 +2,5 @@ +Wed Apr 1 08:51:17 UTC 2020 - Fridrich Strba <fstrba(a)suse.com> + +- Update to upstream version 7.0.0 + +------------------------------------------------------------------- Old: ---- osgi.core-6.0.0-sources.jar osgi.core-6.0.0.pom New: ---- LICENSE-2.0 osgi.core-7.0.0-sources.jar osgi.core-7.0.0.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osgi-core.spec ++++++ --- /var/tmp/diff_new_pack.6Zta03/_old 2020-04-01 19:18:49.383544201 +0200 +++ /var/tmp/diff_new_pack.6Zta03/_new 2020-04-01 19:18:49.387544203 +0200 @@ -1,7 +1,7 @@ # # spec file for package osgi-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 @@ -17,7 +17,7 @@ Name: osgi-core -Version: 6.0.0 +Version: 7.0.0 Release: 0 Summary: OSGi Core API License: Apache-2.0 @@ -25,7 +25,8 @@ URL: https://www.osgi.org Source0: https://repo1.maven.org/maven2/org/osgi/osgi.core/%{version}/osgi.core-%{ve… Source1: https://repo1.maven.org/maven2/org/osgi/osgi.core/%{version}/osgi.core-%{ve… -Source2: %{name}-build.xml +Source2: http://www.apache.org/licenses/LICENSE-2.0 +Source3: %{name}-build.xml BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local @@ -34,7 +35,7 @@ BuildArch: noarch %description -OSGi Core Release 6, Interfaces and Classes for use in compiling bundles. +OSGi Core Release 7, Interfaces and Classes for use in compiling bundles. %package javadoc Summary: API documentation for %{name} @@ -49,7 +50,8 @@ build-jar-repository -s lib osgi-annotation cp -p %{SOURCE1} pom.xml -cp -p %{SOURCE2} build.xml +cp -p %{SOURCE2} LICENSE +cp -p %{SOURCE3} build.xml mkdir -p src/main/java mv org src/main/java/ @@ -94,7 +96,6 @@ %files -f .mfiles %license LICENSE -%doc about.html %files javadoc %license LICENSE ++++++ LICENSE-2.0 ++++++ Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and (b) You must cause any modified files to carry prominent notices stating that You changed the files; and (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ++++++ osgi-core-build.xml ++++++ --- /var/tmp/diff_new_pack.6Zta03/_old 2020-04-01 19:18:49.435544225 +0200 +++ /var/tmp/diff_new_pack.6Zta03/_new 2020-04-01 19:18:49.435544225 +0200 @@ -11,8 +11,8 @@ <property name="project.artifactId" value="osgi.core"/> <property name="project.groupId" value="org.osgi"/> - <property name="project.version" value="6.0.0"/> - <property name="project.description" value="OSGi Core Release 6, Interfaces and Classes for use in compiling bundles."/> + <property name="project.version" value="7.0.0"/> + <property name="project.description" value="OSGi Core Release 7, Interfaces and Classes for use in compiling bundles."/> <property name="project.organization.name" value="OSGi Alliance"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/> @@ -110,8 +110,8 @@ <attribute name="Bundle-SymbolicName" value="${project.artifactId}"/> <attribute name="Bundle-Vendor" value="${project.organization.name}"/> <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.osgi.util.tracker;version="1.5.1";uses:="org.osgi.framework",org.osgi.framework;version="1.8",org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",org.osgi.framework.wiring.dto;version="1.2";uses:="org.osgi.dto,org.osgi.resource.dto",org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource",org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework",org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",org.osgi.dto;version="1.0",org.osgi.resource;version="1.0",org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",org.osgi.service.condpermadmin;version="1.1.1";uses:="org.osgi.framework,org.osgi.service.permissionadmin",org.osgi.service.url;version="1.0",org.osgi.service.permissionadmin;version="1.2""/> - <attribute name="Import-Package" value="javax.security.auth.x500,org.osgi.dto;version="[1.0,2)",org.osgi.framework;version="[1.8,1.9)",org.osgi.framework.wiring;version="[1.2,2)",org.osgi.resource;version="[1.0,2)",org.osgi.resource.dto;version="[1.0,2)",org.osgi.service.permissionadmin;version="[1.2,2)""/> + <attribute name="Export-Package" value="org.osgi.util.tracker;version="1.5.2";uses:="org.osgi.framework",org.osgi.resource;version="1.0",org.osgi.resource.dto;version="1.0";uses:="org.osgi.dto",org.osgi.dto;version="1.1",org.osgi.framework;version="1.9",org.osgi.framework.namespace;version="1.1";uses:="org.osgi.resource",org.osgi.framework.hooks.resolver;version="1.0";uses:="org.osgi.framework.wiring",org.osgi.framework.hooks.weaving;version="1.1";uses:="org.osgi.framework.wiring",org.osgi.framework.hooks.service;version="1.1";uses:="org.osgi.framework",org.osgi.framework.hooks.bundle;version="1.1";uses:="org.osgi.framework",org.osgi.framework.wiring;version="1.2";uses:="org.osgi.framework,org.osgi.resource",org.osgi.framework.wiring.dto;version="1.3";uses:="org.osgi.dto,org.osgi.resource.dto",org.osgi.framework.startlevel;version="1.0";uses:="org.osgi.framework",org.osgi.framework.startlevel.dto;version="1.0";uses:="org.osgi.dto",org.osgi.framework.dto;version="1.8";uses:="org.osgi.dto",org.osgi.framework.launch;version="1.2";uses:="org.osgi.framework",org.osgi.service.resolver;version="1.1";uses:="org.osgi.resource",org.osgi.service.url;version="1.0",org.osgi.service.packageadmin;version="1.2";uses:="org.osgi.framework",org.osgi.service.startlevel;version="1.1";uses:="org.osgi.framework",org.osgi.service.permissionadmin;version="1.2",org.osgi.service.condpermadmin;version="1.1.1";uses:="org.osgi.framework,org.osgi.service.permissionadmin""/> + <attribute name="Import-Package" value="javax.security.auth.x500,org.osgi.dto;version="[1.1,2)",org.osgi.framework;version="[1.9,1.10)",org.osgi.framework.wiring;version="[1.2,2)",org.osgi.resource;version="[1.0,2)",org.osgi.resource.dto;version="[1.0,2)",org.osgi.service.permissionadmin;version="[1.2,2)""/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> ++++++ osgi.core-6.0.0.pom -> osgi.core-7.0.0.pom ++++++ --- /work/SRC/openSUSE:Factory/osgi-core/osgi.core-6.0.0.pom 2019-02-28 21:39:07.409626596 +0100 +++ /work/SRC/openSUSE:Factory/.osgi-core.new.3248/osgi.core-7.0.0.pom 2020-04-01 19:18:48.799543939 +0200 @@ -3,25 +3,27 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.osgi</groupId> <artifactId>osgi.core</artifactId> - <version>6.0.0</version> - <description>OSGi Core Release 6, Interfaces and Classes for use in compiling bundles.</description> + <version>7.0.0</version> + <description>OSGi Core Release 7, Interfaces and Classes for use in compiling bundles</description> <name>org.osgi:osgi.core</name> - <url>http://www.osgi.org/</url> + <url>https://www.osgi.org/</url> <organization> <name>OSGi Alliance</name> - <url>http://www.osgi.org/</url> + <url>https://www.osgi.org/</url> </organization> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://opensource.org/licenses/apache2.0.php</url> + <name>Apache-2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> <distribution>repo</distribution> + <comments>Apache License, Version 2.0</comments> </license> </licenses> <scm> - <url>https://www.osgi.org/members/git/build.git</url> - <connection>scm:git:https://www.osgi.org/members/git/build.git</connection> - <developerConnection>scm:git:https://www.osgi.org/members/git/build.git</developerConnection> + <url>https://osgi.org/gitweb/build.git</url> + <connection>scm:git:https://osgi.org/git/build.git</connection> + <developerConnection>scm:git:https://osgi.org/git/build.git</developerConnection> + <tag>hudson-build.core-1432</tag> </scm> <developers> <developer> @@ -29,6 +31,7 @@ <email>info(a)osgi.org</email> <name>OSGi Alliance</name> <organization>OSGi Alliance</organization> + <organizationUrl>https://www.osgi.org/</organizationUrl> </developer> </developers> </project>

1 0

commit osgi-compendium for openSUSE:Factory
by root 01 Apr '20

01 Apr '20

Hello community, here is the log from the commit of package osgi-compendium for openSUSE:Factory checked in at 2020-04-01 19:18:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osgi-compendium (Old) and /work/SRC/openSUSE:Factory/.osgi-compendium.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osgi-compendium" Wed Apr 1 19:18:22 2020 rev:3 rq:790500 version:7.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/osgi-compendium/osgi-compendium.changes 2019-04-17 10:08:25.826784275 +0200 +++ /work/SRC/openSUSE:Factory/.osgi-compendium.new.3248/osgi-compendium.changes 2020-04-01 19:18:42.499541104 +0200 @@ -1,0 +2,5 @@ +Wed Apr 1 08:52:15 UTC 2020 - Fridrich Strba <fstrba(a)suse.com> + +- Update to upstream version 7.0.0 + +------------------------------------------------------------------- Old: ---- osgi.cmpn-6.0.0.jar New: ---- osgi.cmpn-7.0.0.jar ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osgi-compendium.spec ++++++ --- /var/tmp/diff_new_pack.H6tNKH/_old 2020-04-01 19:18:43.127541387 +0200 +++ /var/tmp/diff_new_pack.H6tNKH/_new 2020-04-01 19:18:43.131541389 +0200 @@ -1,7 +1,7 @@ # # spec file for package osgi-compendium # -# 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 @@ -17,13 +17,13 @@ Name: osgi-compendium -Version: 6.0.0 +Version: 7.0.0 Release: 0 Summary: Interfaces and Classes for use in compiling OSGi bundles License: Apache-2.0 Group: Development/Libraries/Java URL: http://www.osgi.org -Source0: https://osgi.org/download/r6/osgi.cmpn-%{version}.jar +Source0: https://osgi.org/download/r7/osgi.cmpn-%{version}.jar Source1: %{name}-build.xml BuildRequires: ant BuildRequires: fdupes @@ -87,6 +87,8 @@ %pom_add_dep javax.servlet:javax.servlet-api::provided %pom_add_dep javax.persistence:persistence-api::provided +rm -r src/main/java/org/osgi/service/jaxrs + mkdir -p lib build-jar-repository -s lib geronimo-jpa-3.0-api glassfish-servlet-api osgi-annotation osgi-core ++++++ osgi-compendium-build.xml ++++++ --- /var/tmp/diff_new_pack.H6tNKH/_old 2020-04-01 19:18:43.159541401 +0200 +++ /var/tmp/diff_new_pack.H6tNKH/_new 2020-04-01 19:18:43.163541403 +0200 @@ -9,13 +9,13 @@ <property file="build.properties"/> - <property name="compiler.source" value="1.6"/> + <property name="compiler.source" value="1.8"/> <property name="compiler.target" value="${compiler.source}"/> <property name="project.artifactId" value="osgi.cmpn"/> <property name="project.groupId" value="org.osgi"/> - <property name="project.version" value="6.0.0"/> - <property name="project.description" value="OSGi Compendium Release 6, Interfaces and Classes for use in compiling bundles."/> + <property name="project.version" value="7.0.0"/> + <property name="project.description" value="OSGi Compendium Release 7, Interfaces and Classes for use in compiling bundles."/> <property name="project.organization.name" value="OSGi Alliance"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/> @@ -116,8 +116,8 @@ <attribute name="Bundle-SymbolicName" value="${project.artifactId}"/> <attribute name="Bundle-Vendor" value="${project.organization.name}"/> <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.osgi.util.xml;version="1.0.1";uses:="javax.xml.parsers,org.osgi.framework",org.osgi.util.function;version="1.0",org.osgi.util.promise;version="1.0";uses:="org.osgi.util.function",org.osgi.util.position;version="1.0.1";uses:="org.osgi.util.measurement",org.osgi.util.measurement;version="1.0.1",org.osgi.namespace.contract;version="1.0";uses:="org.osgi.resource",org.osgi.namespace.extender;version="1.0.1";uses:="org.osgi.resource",org.osgi.namespace.service;version="1.0";uses:="org.osgi.resource",org.osgi.application;version="1.0";uses:="org.osgi.framework",org.osgi.service.async;version="1.0";uses:="org.osgi.framework,org.osgi.util.promise",org.osgi.service.async.delegate;version="1.0";uses:="org.osgi.util.promise",org.osgi.service.provisioning;version="1.2",org.osgi.service.useradmin;version="1.1";uses:="org.osgi.framework",org.osgi.service.subsystem;version="1.1";uses:="org.osgi.framework,org.osgi.resource",org.osgi.service.wireadmin;version="1.0.1";uses:="org.osgi.framework",org.osgi.service.rest;version="1.0.0",org.osgi.service.rest.client;version="1.0.0";uses:="org.osgi.framework.dto,org.osgi.framework.startlevel.dto",org.osgi.service.log;version="1.3";uses:="org.osgi.framework",org.osgi.service.device;version="1.1";uses:="org.osgi.framework",org.osgi.service.dmt;version="2.0.1",org.osgi.service.dmt.spi;version="2.0";uses:="org.osgi.service.dmt",org.osgi.service.dmt.notification.spi;version="2.0";uses:="org.osgi.service.dmt.notification",org.osgi.service.dmt.notification;version="2.0";uses:="org.osgi.service.dmt",org.osgi.service.dmt.security;version="2.0",org.osgi.service.component.annotations;version="1.3",org.osgi.service.component;version="1.3";uses:="org.osgi.framework",org.osgi.service.component.runtime;version="1.3";uses:="org.osgi.framework,org.osgi.service.component.runtime.dto,org.osgi.util.promise",org.osgi.service.component.runtime.dto;version="1.3";uses:="org.osgi.dto,org.osgi.framework.dto",org.osgi.service.repository;version="1.1";uses:="org.osgi.resource,org.osgi.util.promise",org.osgi.service.coordinator;version="1.0.2";uses:="org.osgi.framework",org.osgi.service.jpa;version="1.0";uses:="javax.persistence",org.osgi.service.http.context;version="1.0";uses:="javax.servlet.http,org.osgi.framework",org.osgi.service.http.whiteboard;version="1.0",org.osgi.service.http;version="1.2.1";uses:="javax.servlet,javax.servlet.http",org.osgi.service.http.runtime;version="1.0";uses:="org.osgi.service.http.runtime.dto",org.osgi.service.http.runtime.dto;version="1.0";uses:="org.osgi.dto,org.osgi.framework.dto",org.osgi.service.monitor;version="1.0",org.osgi.service.deploymentadmin;version="1.1";uses:="org.osgi.framework",org.osgi.service.deploymentadmin.spi;version="1.0.1";uses:="org.osgi.framework,org.osgi.service.deploymentadmin",org.osgi.service.event;version="1.3.1";uses:="org.osgi.framework",org.osgi.service.prefs;version="1.1.1",org.osgi.service.jdbc;version="1.0";uses:="javax.sql",org.osgi.service.metatype.annotations;version="1.3",org.osgi.service.metatype;version="1.3";uses:="org.osgi.framework",org.osgi.service.upnp;version="1.2",org.osgi.service.jndi;version="1.0";uses:="javax.naming,javax.naming.directory",org.osgi.service.serviceloader;version="1.0";uses:="org.osgi.resource",org.osgi.service.resolver;version="1.0.1";uses:="org.osgi.resource",org.osgi.service.application;version="1.1";uses:="org.osgi.framework",org.osgi.service.remoteserviceadmin;version="1.1.0";uses:="org.osgi.framework",org.osgi.service.remoteserviceadmin.namespace;version="1.0.0";uses:="org.osgi.resource",org.osgi.service.blueprint.reflect;version="1.0.1",org.osgi.service.blueprint.container;version="1.0.2";uses:="org.osgi.framework,org.osgi.service.blueprint.reflect",org.osgi.service.cm;version="1.5";uses:="org.osgi.framework""/> - <attribute name="Import-Package" value="javax.naming,javax.naming.directory,javax.persistence;version="[3.0,4)",javax.servlet;version="[3.1,4)",javax.servlet.http;version="[3.1,4)",javax.sql,javax.xml.parsers,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.dto;version="[1.0,2)",org.osgi.resource;version="[1.0,2)",org.osgi.service.blueprint.reflect;version="[1.0,2)",org.osgi.service.component.runtime.dto;version="[1.3,2)",org.osgi.service.deploymentadmin;version="[1.1,2)",org.osgi.service.dmt;version="[2.0,3)",org.osgi.service.dmt.notification;version="[2.0,3)",org.osgi.service.http.runtime.dto;version="[1.0,2)",org.osgi.util.function;version="[1.0,2)",org.osgi.util.measurement;version="[1.0,2)",org.osgi.util.promise;version="[1.0,1.1)""/> + <attribute name="Export-Package" value="org.osgi.util.converter;version="1.0";uses:="org.osgi.util.function",org.osgi.util.function;version="1.1",org.osgi.util.position;version="1.0.1";uses:="org.osgi.util.measurement",org.osgi.util.pushstream;version="1.0";uses:="org.osgi.util.function,org.osgi.util.promise",org.osgi.util.promise;version="1.1";uses:="org.osgi.util.function",org.osgi.util.xml;version="1.0.1";uses:="javax.xml.parsers,org.osgi.framework",org.osgi.util.measurement;version="1.0.2",org.osgi.namespace.extender;version="1.0.1";uses:="org.osgi.resource",org.osgi.namespace.unresolvable;version="1.0";uses:="org.osgi.resource",org.osgi.namespace.service;version="1.0";uses:="org.osgi.resource",org.osgi.namespace.contract;version="1.0";uses:="org.osgi.resource",org.osgi.application;version="1.0";uses:="org.osgi.framework",org.osgi.service.dmt;version="2.0.2",org.osgi.service.dmt.security;version="2.0",org.osgi.service.dmt.spi;version="2.0";uses:="org.osgi.service.dmt",org.osgi.service.dmt.notification;version="2.0";uses:="org.osgi.service.dmt",org.osgi.service.dmt.notification.spi;version="2.0";uses:="org.osgi.service.dmt.notification",org.osgi.service.rest;version="1.0.0",org.osgi.service.rest.client;version="1.0.0";uses:="org.osgi.framework.dto,org.osgi.framework.startlevel.dto",org.osgi.service.jdbc;version="1.0";uses:="javax.sql",org.osgi.service.event;version="1.4.0";uses:="org.osgi.framework",org.osgi.service.event.propertytypes;version="1.4.0",org.osgi.service.event.annotations;version="1.4.0",org.osgi.service.repository;version="1.1";uses:="org.osgi.resource,org.osgi.util.promise",org.osgi.service.blueprint.container;version="1.0.2";uses:="org.osgi.framework,org.osgi.service.blueprint.reflect",org.osgi.service.blueprint.reflect;version="1.0.1",org.osgi.service.upnp;version="1.2",org.osgi.service.jndi;version="1.0";uses:="javax.naming,javax.naming.directory",org.osgi.service.prefs;version="1.1.1",org.osgi.service.cm;version="1.6.0";uses:="org.osgi.framework",org.osgi.service.cm.annotations;version="1.6.0",org.osgi.service.serviceloader;version="1.0";uses:="org.osgi.resource",org.osgi.service.device;version="1.1";uses:="org.osgi.framework",org.osgi.service.deploymentadmin;version="1.1";uses:="org.osgi.framework,org.osgi.service.deploymentadmin.spi",org.osgi.service.deploymentadmin.spi;version="1.0.1";uses:="org.osgi.framework,org.osgi.service.deploymentadmin",org.osgi.service.coordinator;version="1.0.2";uses:="org.osgi.framework",org.osgi.service.wireadmin;version="1.0.1";uses:="org.osgi.framework",org.osgi.service.useradmin;version="1.1";uses:="org.osgi.framework",org.osgi.service.application;version="1.1";uses:="org.osgi.framework",org.osgi.service.configurator.namespace;version="1.0";uses:="org.osgi.resource",org.osgi.service.configurator;version="1.0",org.osgi.service.configurator.annotations;version="1.0",org.osgi.service.http.whiteboard.propertytypes;version="1.1.0";uses:="javax.servlet",org.osgi.service.http.whiteboard;version="1.1.0";uses:="javax.servlet",org.osgi.service.http.whiteboard.annotations;version="1.1.0",org.osgi.service.http;version="1.2.1";uses:="javax.servlet,javax.servlet.http",org.osgi.service.http.runtime;version="1.1.0";uses:="org.osgi.service.http.runtime.dto",org.osgi.service.http.runtime.dto;version="1.1.0";uses:="org.osgi.dto,org.osgi.framework.dto",org.osgi.service.http.context;version="1.1.0";uses:="javax.servlet.http,org.osgi.framework",org.osgi.service.component;version="1.4.0";uses:="org.osgi.framework",org.osgi.service.component.propertytypes;version="1.4.0",org.osgi.service.component.annotations;version="1.4.0",org.osgi.service.component.runtime;version="1.4.0";uses:="org.osgi.framework,org.osgi.service.component.runtime.dto,org.osgi.util.promise",org.osgi.service.component.runtime.dto;version="1.4.0";uses:="org.osgi.dto,org.osgi.framework.dto",org.osgi.service.provisioning;version="1.2",org.osgi.service.metatype;version="1.4.0";uses:="org.osgi.framework",org.osgi.service.metatype.annotations;version="1.4.0",org.osgi.service.monitor;version="1.0",org.osgi.service.transaction.control;version="1.0.0";uses:="javax.transaction.xa",org.osgi.service.transaction.control.jdbc;version="1.0.0";uses:="javax.sql,org.osgi.service.jdbc,org.osgi.service.transaction.control",org.osgi.service.transaction.control.recovery;version="1.0.0";uses:="javax.transaction.xa",org.osgi.service.remoteserviceadmin;version="1.1.0";uses:="org.osgi.framework",org.osgi.service.remoteserviceadmin.namespace;version="1.0.0";uses:="org.osgi.resource",org.osgi.service.async;version="1.0";uses:="org.osgi.framework,org.osgi.util.promise",org.osgi.service.async.delegate;version="1.0";uses:="org.osgi.util.promise",org.osgi.service.log;version="1.4";uses:="org.osgi.framework",org.osgi.service.log.admin;version="1.0";uses:="org.osgi.service.log",org.osgi.service.log.stream;version="1.0";uses:="org.osgi.service.log,org.osgi.util.pushstream",org.osgi.service.subsystem;version="1.1";uses:="org.osgi.framework,org.osgi.resource""/> + <attribute name="Import-Package" value="javax.naming,javax.naming.directory,javax.servlet;version="[3.1,4)",javax.servlet.http;version="[3.1,4)",javax.sql,javax.transaction.xa,javax.xml.parsers,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.dto;version="[1.0,2)",org.osgi.resource;version="[1.0,2)",org.osgi.service.blueprint.reflect;version="[1.0,2)",org.osgi.service.component.runtime.dto;version="[1.4,2)",org.osgi.service.deploymentadmin;version="[1.1,2)",org.osgi.service.deploymentadmin.spi;version="[1.0,2)",org.osgi.service.dmt;version="[2.0,3)",org.osgi.service.dmt.notification;version="[2.0,3)",org.osgi.service.http.runtime.dto;version="[1.1,2)",org.osgi.service.jdbc;version="[1.0,2)",org.osgi.service.log;version="[1.4,1.5)",org.osgi.service.transaction.control;version="[1.0,1.1)",org.osgi.util.function;version="[1.1,2)",org.osgi.util.measurement;version="[1.0,2)",org.osgi.util.promise;version="[1.1,1.2)",org.osgi.util.pushstream;version="[1.0,1.1)""/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/>

1 0

commit osgi-annotation for openSUSE:Factory
by root 01 Apr '20

01 Apr '20

Hello community, here is the log from the commit of package osgi-annotation for openSUSE:Factory checked in at 2020-04-01 19:18:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osgi-annotation (Old) and /work/SRC/openSUSE:Factory/.osgi-annotation.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osgi-annotation" Wed Apr 1 19:18:19 2020 rev:2 rq:790499 version:7.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/osgi-annotation/osgi-annotation.changes 2019-02-28 21:39:10.629625583 +0100 +++ /work/SRC/openSUSE:Factory/.osgi-annotation.new.3248/osgi-annotation.changes 2020-04-01 19:18:41.307540568 +0200 @@ -1,0 +2,5 @@ +Wed Apr 1 08:49:38 UTC 2020 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to the upstream version 7.0.0 + +------------------------------------------------------------------- Old: ---- osgi.annotation-6.0.0-sources.jar osgi.annotation-6.0.0.pom New: ---- LICENSE-2.0 osgi.annotation-7.0.0-sources.jar osgi.annotation-7.0.0.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osgi-annotation.spec ++++++ --- /var/tmp/diff_new_pack.ubKvsz/_old 2020-04-01 19:18:42.143540944 +0200 +++ /var/tmp/diff_new_pack.ubKvsz/_new 2020-04-01 19:18:42.147540946 +0200 @@ -1,7 +1,7 @@ # # spec file for package osgi-annotation # -# 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 @@ -17,7 +17,7 @@ Name: osgi-annotation -Version: 6.0.0 +Version: 7.0.0 Release: 0 Summary: Annotations for use in compiling OSGi bundles License: Apache-2.0 @@ -25,9 +25,10 @@ URL: http://www.osgi.org/ # Upstream project is behind an account registration system with no anonymous # read access, so we download the source from maven central instead -Source0: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.anno… -Source1: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.anno… -Source2: %{name}-build.xml +Source0: https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.ann… +Source1: https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.ann… +Source2: http://www.apache.org/licenses/LICENSE-2.0 +Source3: %{name}-build.xml BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local @@ -48,10 +49,10 @@ %prep %setup -q -c -mkdir -p src/main/resources && mv about.html src/main/resources mkdir -p src/main/java && mv org src/main/java cp -p %{SOURCE1} pom.xml -cp -p %{SOURCE2} build.xml +cp -p %{SOURCE2} LICENSE +cp -p %{SOURCE3} build.xml # Ensure OSGi metadata is generated %pom_xpath_inject pom:project " ++++++ LICENSE-2.0 ++++++ Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION 1. Definitions. "License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document. "Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License. "Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. "You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License. "Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files. "Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types. "Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below). "Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof. "Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution." "Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work. 2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form. 3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed. 4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions: (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and (b) You must cause any modified files to carry prominent notices stating that You changed the files; and (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License. You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License. 5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions. 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file. 7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License. 8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. 9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS APPENDIX: How to apply the Apache License to your work. To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives. Copyright [yyyy] [name of copyright owner] Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. ++++++ osgi-annotation-build.xml ++++++ --- /var/tmp/diff_new_pack.ubKvsz/_old 2020-04-01 19:18:42.199540969 +0200 +++ /var/tmp/diff_new_pack.ubKvsz/_new 2020-04-01 19:18:42.199540969 +0200 @@ -13,15 +13,14 @@ <property name="project.artifactId" value="osgi.annotation"/> <property name="project.groupId" value="org.osgi"/> - <property name="project.version" value="6.0.0"/> - <property name="project.description" value="OSGi Annotation Release 6, Annotations for use in compiling bundles."/> + <property name="project.version" value="7.0.0"/> + <property name="project.description" value="OSGi Annotation Release 7, Annotations for use in compiling bundles."/> <property name="project.organization.name" value="OSGi Alliance"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/> <property name="build.dir" value="target"/> <property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.srcDir" value="src/main/java"/> - <property name="build.resourceDir" value="src/main/resources"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/> @@ -52,9 +51,6 @@ <pathelement location="${build.srcDir}"/> </src> </javac> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir}"/> - </copy> </target>  @@ -100,7 +96,7 @@ <attribute name="Bundle-SymbolicName" value="${project.artifactId}"/> <attribute name="Bundle-Vendor" value="${project.organization.name}"/> <attribute name="Bundle-Version" value="${project.version}"/> - <attribute name="Export-Package" value="org.osgi.annotation.versioning;version="1.0""/> + <attribute name="Export-Package" value="org.osgi.annotation.versioning;version="1.1",org.osgi.annotation.bundle;version="1.0""/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/> ++++++ osgi.annotation-6.0.0.pom -> osgi.annotation-7.0.0.pom ++++++ --- /work/SRC/openSUSE:Factory/osgi-annotation/osgi.annotation-6.0.0.pom 2019-02-28 21:39:10.709625558 +0100 +++ /work/SRC/openSUSE:Factory/.osgi-annotation.new.3248/osgi.annotation-7.0.0.pom 2020-04-01 19:18:41.619540708 +0200 @@ -3,25 +3,27 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.osgi</groupId> <artifactId>osgi.annotation</artifactId> - <version>6.0.0</version> - <description>OSGi Annotation Release 6, Annotations for use in compiling bundles.</description> + <version>7.0.0</version> + <description>OSGi Annotation Release 7, Annotations for use in compiling bundles</description> <name>org.osgi:osgi.annotation</name> - <url>http://www.osgi.org/</url> + <url>https://www.osgi.org/</url> <organization> <name>OSGi Alliance</name> - <url>http://www.osgi.org/</url> + <url>https://www.osgi.org/</url> </organization> <licenses> <license> - <name>Apache License, Version 2.0</name> - <url>http://opensource.org/licenses/apache2.0.php</url> + <name>Apache-2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> <distribution>repo</distribution> + <comments>Apache License, Version 2.0</comments> </license> </licenses> <scm> - <url>https://www.osgi.org/members/git/build.git</url> - <connection>scm:git:https://www.osgi.org/members/git/build.git</connection> - <developerConnection>scm:git:https://www.osgi.org/members/git/build.git</developerConnection> + <url>https://osgi.org/gitweb/build.git</url> + <connection>scm:git:https://osgi.org/git/build.git</connection> + <developerConnection>scm:git:https://osgi.org/git/build.git</developerConnection> + <tag>hudson-build.core-1432</tag> </scm> <developers> <developer> @@ -29,6 +31,7 @@ <email>info(a)osgi.org</email> <name>OSGi Alliance</name> <organization>OSGi Alliance</organization> + <organizationUrl>https://www.osgi.org/</organizationUrl> </developer> </developers> </project>

1 0

commit python-os-client-config for openSUSE:Factory
by root 01 Apr '20

01 Apr '20

Hello community, here is the log from the commit of package python-os-client-config for openSUSE:Factory checked in at 2020-04-01 19:18:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-os-client-config (Old) and /work/SRC/openSUSE:Factory/.python-os-client-config.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-os-client-config" Wed Apr 1 19:18:13 2020 rev:14 rq:790503 version:1.33.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-os-client-config/python-os-client-config.changes 2019-12-04 14:18:43.266361239 +0100 +++ /work/SRC/openSUSE:Factory/.python-os-client-config.new.3248/python-os-client-config.changes 2020-04-01 19:18:33.487537049 +0200 @@ -1,0 +2,5 @@ +Wed Apr 1 09:27:05 UTC 2020 - Dirk Mueller <dmueller(a)suse.com> + +- switch to python 3.x only builds + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-os-client-config.spec ++++++ --- /var/tmp/diff_new_pack.q2Shbg/_old 2020-04-01 19:18:34.083537317 +0200 +++ /var/tmp/diff_new_pack.q2Shbg/_new 2020-04-01 19:18:34.087537319 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-os-client-config # -# 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 @@ -25,32 +25,25 @@ Summary: OpenStack Client Configuration Library License: Apache-2.0 Group: Development/Languages/Python -URL: https://launchpad.net/%{sname} -Source0: https://files.pythonhosted.org/packages/source/o/%{sname}/%{sname}-%{versio… +URL: https://launchpad.net/%{name} +Source0: https://files.pythonhosted.org/packages/source/o/os-client-config/os-client… BuildRequires: openstack-macros -BuildRequires: python2-pbr -BuildRequires: python2-setuptools BuildRequires: python3-pbr BuildRequires: python3-setuptools -Requires: python-PyYAML -Requires: python-appdirs -Requires: python-keystoneauth1 -Requires: python-requestsexceptions BuildArch: noarch %if %{with test} -BuildRequires: python-extras -BuildRequires: python-fixtures -BuildRequires: python-glanceclient -BuildRequires: python-jsonschema -BuildRequires: python-keystoneclient -BuildRequires: python-mock -BuildRequires: python-oslotest -BuildRequires: python-python-subunit -BuildRequires: python-stestr -BuildRequires: python-testscenarios -BuildRequires: python-testtools +BuildRequires: python3-extras +BuildRequires: python3-fixtures +BuildRequires: python3-glanceclient +BuildRequires: python3-jsonschema +BuildRequires: python3-keystoneclient +BuildRequires: python3-mock +BuildRequires: python3-oslotest +BuildRequires: python3-python-subunit +BuildRequires: python3-stestr +BuildRequires: python3-testscenarios +BuildRequires: python3-testtools %endif -%python_subpackages %description os-client-config is a library for collecting client configuration for @@ -60,46 +53,63 @@ files, and it also contains some vendor specific default values so that you don't have to know extra info to use OpenStack. +%package -n python3-os-client-config +Summary: OpenStack Client Configuration Library +Group: Development/Languages/Python +Requires: python3-PyYAML +Requires: python3-appdirs +Requires: python3-keystoneauth1 +Requires: python3-requestsexceptions + +%description -n python3-os-client-config +os-client-config is a library for collecting client configuration for +using an OpenStack cloud in a consistent and comprehensive manner. +It will find cloud config for as few as 1 cloud and as many as you want +to put in a config file. It will read environment variables and config +files, and it also contains some vendor specific default values so that +you don't have to know extra info to use OpenStack. + +This package contains the Python 3.x module. + %if %{with docs} %package -n python-os-client-config-doc Summary: Documentation for OpenStack client configuration library Group: Development/Languages/Python -BuildRequires: python-Sphinx -BuildRequires: python-openstackdocstheme -BuildRequires: python-reno +BuildRequires: python3-Sphinx +BuildRequires: python3-openstackdocstheme +BuildRequires: python3-reno %description -n python-os-client-config-doc Documentation for the os-client-config library. %endif %prep -%autosetup -n %{sname}-%{version} +%autosetup -p1 -n %{sname}-%{version} %py_req_cleanup -sed -i 's/^warning-is-error.*/warning-is-error = 0/g' setup.cfg %build -%python_build +%py3_build %if %{with docs} # generate html docs -%{__python2} setup.py build_sphinx +PBR_VERSION=%{version} %sphinx_build -b html doc/source doc/build/html # remove the sphinx-build leftovers -rm -rf html/.{doctrees,buildinfo} +rm -rf doc/build/html/.{doctrees,buildinfo} %endif %install -%python_install +%py3_install %if %{with test} %check -export PYTHONPATH="%{python2_sitearch}:%{python2_sitelib}:%{buildroot}%{python2_sitelib}" -python2 -m stestr.cli run +export PYTHONPATH="%{python3_sitearch}:%{python3_sitelib}:%{buildroot}%{python3_sitelib}" +python3 -m stestr.cli run %endif -%files %{python_files} +%files -n python3-os-client-config %license LICENSE %doc README.rst -%{python_sitelib}/os_client_config -%{python_sitelib}/*.egg-info +%{python3_sitelib}/os_client_config +%{python3_sitelib}/*.egg-info %if %{with docs} %files -n python-os-client-config-doc

1 0

commit xtables-geoip for openSUSE:Factory
by root 01 Apr '20

01 Apr '20

Hello community, here is the log from the commit of package xtables-geoip for openSUSE:Factory checked in at 2020-04-01 19:18:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtables-geoip (Old) and /work/SRC/openSUSE:Factory/.xtables-geoip.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xtables-geoip" Wed Apr 1 19:18:08 2020 rev:48 rq:790467 version:20200401 Changes: -------- --- /work/SRC/openSUSE:Factory/xtables-geoip/xtables-geoip.changes 2020-03-01 21:29:01.680680064 +0100 +++ /work/SRC/openSUSE:Factory/.xtables-geoip.new.3248/xtables-geoip.changes 2020-04-01 19:18:28.811534946 +0200 @@ -1,0 +2,5 @@ +Wed Apr 1 05:27:56 UTC 2020 - Arjen de Korte <suse+build(a)de-korte.org> + +- Update database files to 20200401 + +------------------------------------------------------------------- Old: ---- dbip-country-lite-2020-03.csv.gz New: ---- dbip-country-lite-2020-04.csv.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtables-geoip.spec ++++++ --- /var/tmp/diff_new_pack.NcHWrn/_old 2020-04-01 19:18:29.551535278 +0200 +++ /var/tmp/diff_new_pack.NcHWrn/_new 2020-04-01 19:18:29.551535278 +0200 @@ -17,7 +17,7 @@ %define year 2020 -%define month 03 +%define month 04 Name: xtables-geoip Version: %year%{month}01

1 0

commit ulfius for openSUSE:Factory
by root 01 Apr '20

01 Apr '20

Hello community, here is the log from the commit of package ulfius for openSUSE:Factory checked in at 2020-04-01 19:18:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ulfius (Old) and /work/SRC/openSUSE:Factory/.ulfius.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ulfius" Wed Apr 1 19:18:03 2020 rev:12 rq:790473 version:2.6.6 Changes: -------- --- /work/SRC/openSUSE:Factory/ulfius/ulfius.changes 2020-01-19 20:58:28.824083117 +0100 +++ /work/SRC/openSUSE:Factory/.ulfius.new.3248/ulfius.changes 2020-04-01 19:18:21.783531783 +0200 @@ -1,0 +2,7 @@ +Wed Apr 1 05:46:12 UTC 2020 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 2.6.6 + * Update doc generation + * Fix jansson memoy management bug + +------------------------------------------------------------------- Old: ---- ulfius-2.6.5.tar.gz New: ---- ulfius-2.6.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ulfius.spec ++++++ --- /var/tmp/diff_new_pack.1ziJ4p/_old 2020-04-01 19:18:22.683532189 +0200 +++ /var/tmp/diff_new_pack.1ziJ4p/_new 2020-04-01 19:18:22.687532190 +0200 @@ -1,7 +1,7 @@ # # spec file for package ulfius # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2018, Martin Hauke <mardnh(a)gmx.de> # # All modifications and additions to the file contributed by third parties @@ -20,7 +20,7 @@ %define _lto_cflags %{nil} %define sover 2_6 Name: ulfius -Version: 2.6.5 +Version: 2.6.6 Release: 0 Summary: Web Framework for REST Applications in C License: MIT ++++++ ulfius-2.6.5.tar.gz -> ulfius-2.6.6.tar.gz ++++++ ++++ 22217 lines of diff (skipped)

1 0