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 <fst...@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.libg-%{version}.pom @@ -32,7 +32,8 @@ Source6: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/%{version}/biz.aQute.bnd.annotation-%{version}.pom 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 <mkon...@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
