From 0207c499ce8ec9d4c249972f747381b401b6730b382e35b0250eda74b1c4512b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 31 Mar 2020 06:21:32 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/felix-utils?expand=0&rev=7 --- 0000-Port-to-osgi-cmpn.patch | 123 ++++++++++++++++++ felix-utils-build.xml | 6 +- felix-utils.changes | 8 ++ felix-utils.spec | 16 ++- ...e.felix.utils-1.10.4-source-release.tar.gz | 3 - ...e.felix.utils-1.11.4-source-release.tar.gz | 3 + 6 files changed, 146 insertions(+), 13 deletions(-) create mode 100644 0000-Port-to-osgi-cmpn.patch delete mode 100644 org.apache.felix.utils-1.10.4-source-release.tar.gz create mode 100644 org.apache.felix.utils-1.11.4-source-release.tar.gz diff --git a/0000-Port-to-osgi-cmpn.patch b/0000-Port-to-osgi-cmpn.patch new file mode 100644 index 0000000..3ed2619 --- /dev/null +++ b/0000-Port-to-osgi-cmpn.patch @@ -0,0 +1,123 @@ +From d7a2d969b55ab34a223ad1422b2e3ef7d95a347f Mon Sep 17 00:00:00 2001 +From: Marian Koncek +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> 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> 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 ServiceRegistration registerService(Class clazz, ServiceFactory factory, Dictionary 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 ServiceObjects getServiceObjects(ServiceReference reference) { ++ throw new UnsupportedOperationException(); ++ } ++ + public File getDataFile(String s) { + throw new UnsupportedOperationException(); + } +-- +2.17.2 + diff --git a/felix-utils-build.xml b/felix-utils-build.xml index 2b648cc..97b8125 100644 --- a/felix-utils-build.xml +++ b/felix-utils-build.xml @@ -10,8 +10,8 @@ - - + + @@ -25,7 +25,7 @@ - + diff --git a/felix-utils.changes b/felix-utils.changes index 7cec713..399d40d 100644 --- a/felix-utils.changes +++ b/felix-utils.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 31 06:19:36 UTC 2020 - Fridrich Strba + +- Update to upstream release 1.11.4 +- Added patch: + * 0000-Port-to-osgi-cmpn.patch + + Migrate away from the old felix-osgi implementation + ------------------------------------------------------------------- Tue Apr 9 15:34:31 UTC 2019 - Fridrich Strba diff --git a/felix-utils.spec b/felix-utils.spec index 8ce21ff..7af2bad 100644 --- a/felix-utils.spec +++ b/felix-utils.spec @@ -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}/%{bundle}-%{version}-source-release.tar.gz +URL: https://felix.apache.org +Source0: https://repo1.maven.org/maven2/org/apache/felix/%{bundle}/%{version}/%{bundle}-%{version}-source-release.tar.gz 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 @@ This package contains the API documentation for %{name}. %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 diff --git a/org.apache.felix.utils-1.10.4-source-release.tar.gz b/org.apache.felix.utils-1.10.4-source-release.tar.gz deleted file mode 100644 index b33c6f1..0000000 --- a/org.apache.felix.utils-1.10.4-source-release.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f81b28e9b0a88821648868e0123400038fb0041814aec660acb9fda9e1758923 -size 59033 diff --git a/org.apache.felix.utils-1.11.4-source-release.tar.gz b/org.apache.felix.utils-1.11.4-source-release.tar.gz new file mode 100644 index 0000000..49fc408 --- /dev/null +++ b/org.apache.felix.utils-1.11.4-source-release.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c5a47051225961e549f3a265b94389e5c3986574fe0dbc908b04cb62a4a709a3 +size 89982