From ee6f539794b294b636500ef37abd61adf2c37021 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 4 Sep 2019 21:18:05 +0200 Subject: [PATCH] Remove unused patch --- 0002-Port-to-Eclipse-Luna-OSGi.patch | 62 ---------------------------- xbean.spec | 2 - 2 files changed, 64 deletions(-) delete mode 100644 0002-Port-to-Eclipse-Luna-OSGi.patch diff --git a/0002-Port-to-Eclipse-Luna-OSGi.patch b/0002-Port-to-Eclipse-Luna-OSGi.patch deleted file mode 100644 index af2e743..0000000 --- a/0002-Port-to-Eclipse-Luna-OSGi.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 9e1bb9bfee86490163fb1e226556620aa8cdf7bc Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Fri, 21 Nov 2014 10:05:05 +0100 -Subject: [PATCH 2/3] Port to Eclipse Luna OSGi - ---- - xbean-bundleutils/pom.xml | 8 +------- - .../apache/xbean/osgi/bundle/util/DelegatingBundleContext.java | 10 ++++++++++ - 2 files changed, 11 insertions(+), 7 deletions(-) - -diff --git a/xbean-bundleutils/pom.xml b/xbean-bundleutils/pom.xml -index 72f4865..2b3459d 100644 ---- a/xbean-bundleutils/pom.xml -+++ b/xbean-bundleutils/pom.xml -@@ -35,15 +35,9 @@ - slf4j-api - - -- org.osgi -- org.osgi.core -- 4.3.1 -- provided -- -- - org.eclipse - osgi -- 3.6.0.v20100517 -+ 3.10.0-v20140606-1445 - provided - - -diff --git a/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java b/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java -index 58a392b..cc8d081 100644 ---- a/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java -+++ b/xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/DelegatingBundleContext.java -@@ -31,7 +31,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; - -@@ -153,5 +155,13 @@ public class DelegatingBundleContext implements BundleContext { - public Bundle getBundle(String location) { - return bundleContext.getBundle(location); - } -+ -+ public ServiceObjects getServiceObjects(ServiceReference reference) { -+ return bundleContext.getServiceObjects(reference); -+ } -+ -+ public ServiceRegistration registerService(Class clazz, ServiceFactory factory, Dictionary properties) { -+ return bundleContext.registerService(clazz, factory, properties); -+ } - - } --- -2.9.3 - diff --git a/xbean.spec b/xbean.spec index 497c572..48a8312 100644 --- a/xbean.spec +++ b/xbean.spec @@ -11,8 +11,6 @@ BuildArch: noarch Source0: http://repo2.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip -# Compatibility with Eclipse Luna (rhbz#1087461) -Patch1: 0002-Port-to-Eclipse-Luna-OSGi.patch Patch2: 0003-Port-to-QDox-2.0.patch BuildRequires: maven-local