rpm/aqute-bnd
SHA256
1
0
Fork 0
forked from pool/aqute-bnd
Code Pull Requests Activity

Accepting request 790521 from Java:packages

Browse Source 
Fix build against OSGi 7

OBS-URL: https://build.opensuse.org/request/show/790521
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aqute-bnd?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2020-04-01 17:18:33 +00:00 committed by Git OBS Bridge
commit 6efd534cf2
4 changed files with 131 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
0001-Port-to-OSGI-7.0.0.patch Normal file
View File

@ -0,0 +1,117 @@
From e9469ae2ca9f3d64fd88e0d8aaf8ebeea7bb937d Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@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

7
aqute-bnd.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Apr 1 08:09:22 UTC 2020 - Fridrich Strba <fstrba@suse.com>
- Addes patch:
* 0001-Port-to-OSGI-7.0.0.patch
+ Port to OSGI 7.0.0
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 26 15:29:03 UTC 2019 - Fridrich Strba <fstrba@suse.com> Wed Jun 26 15:29:03 UTC 2019 - Fridrich Strba <fstrba@suse.com>

8
aqute-bnd.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package aqute-bnd # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -23,7 +23,7 @@ Summary: BND Tool
# Part of jpm is under BSD, but jpm is not included in binary RPM # Part of jpm is under BSD, but jpm is not included in binary RPM
License: Apache-2.0 License: Apache-2.0
Group: Development/Libraries/Java 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 Source0: https://github.com/bndtools/bnd/archive/%{version}.REL.tar.gz
Source1: bnd-%{version}.REL-build_xml.tar.xz Source1: bnd-%{version}.REL-build_xml.tar.xz
Source3: https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.libg-%{version}.pom Source3: https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.libg-%{version}.pom
@ -32,7 +32,8 @@ Source5: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/%{
Source6: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/%{version}/biz.aQute.bnd.annotation-%{version}.pom 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 Patch0: 0001-Disable-removed-commands.patch
Patch1: 0002-Fix-ant-compatibility.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: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: javapackages-local BuildRequires: javapackages-local
@ -91,6 +92,7 @@ build-jar-repository -s lib \
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
# the commands pull in more dependencies than we want (felix-resolver, jetty) # the commands pull in more dependencies than we want (felix-resolver, jetty)
rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java

4
bnd-maven-plugin.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package bnd-maven-plugin # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -23,7 +23,7 @@ Summary: BND Maven plugin
# Part of jpm is under BSD, but jpm is not included in binary RPM # Part of jpm is under BSD, but jpm is not included in binary RPM
License: Apache-2.0 License: Apache-2.0
Group: Development/Libraries/Java 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 Source0: https://github.com/bndtools/bnd/archive/%{version}.REL.tar.gz
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: maven-local BuildRequires: maven-local