From 9dc6e1b86c97c3a8c4fb6621b75989195da6c65d Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 12 Apr 2019 15:43:50 +0200 Subject: [PATCH] Port to OSGI 7.0.0 --- 0001-Port-to-OSGI-7.0.0.patch | 117 ++++++++++++++++++++++++++++++++++ aqute-bnd.spec | 7 +- 2 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 0001-Port-to-OSGI-7.0.0.patch diff --git a/0001-Port-to-OSGI-7.0.0.patch b/0001-Port-to-OSGI-7.0.0.patch new file mode 100644 index 0000000..b51897c --- /dev/null +++ b/0001-Port-to-OSGI-7.0.0.patch @@ -0,0 +1,117 @@ +From e9469ae2ca9f3d64fd88e0d8aaf8ebeea7bb937d Mon Sep 17 00:00:00 2001 +From: Marian Koncek +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 getLogger(String name, Class loggerType) {throw UNSUPPORTED;} ++ ++ @Override ++ public L getLogger(Class< ? > clazz, Class loggerType) {throw UNSUPPORTED;} ++ ++ @Override ++ public L getLogger(Bundle bundle, String name, Class 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 getLogger(String name, Class loggerType) {throw UNSUPPORTED;} ++ ++ @Override ++ public L getLogger(Class< ? > clazz, Class loggerType) {throw UNSUPPORTED;} ++ ++ @Override ++ public L getLogger(Bundle bundle, String name, Class loggerType) {throw UNSUPPORTED;} ++ + } +-- +2.20.1 + diff --git a/aqute-bnd.spec b/aqute-bnd.spec index f3c27f9..5d8be46 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -1,7 +1,7 @@ Name: aqute-bnd Version: 3.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: BND Tool # Part of jpm is under BSD, but jpm is not included in binary RPM License: ASL 2.0 @@ -22,6 +22,7 @@ Source6: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annot Patch0: 0001-Disable-removed-commands.patch Patch1: 0002-Fix-ant-compatibility.patch +Patch2: 0001-Port-to-OSGI-7.0.0.patch BuildRequires: maven-local BuildRequires: mvn(org.osgi:osgi.annotation) @@ -82,6 +83,7 @@ rm gradlew* %patch0 -p1 %patch1 -p1 +%patch2 -p1 # the commands pull in more dependencies than we want (felix-resolver, jetty) rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java @@ -191,6 +193,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium %license LICENSE %changelog +* Fri Apr 12 2019 Marian Koncek - 3.5.0-5 +- Port to OSGI 7.0.0 + * Mon Jul 30 2018 Severin Gehwolf - 3.5.0-4 - Add requirement on javapackages-tools for bnd script.