diff --git a/.gitignore b/.gitignore index 3290f07..010e899 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ +/results_* +/*.src.rpm + /org.apache.felix.utils-1.2.0-source-release.tar.gz /org.apache.felix.utils-1.4.0-source-release.tar.gz -/noarch -/.build-*.log -/*.src.rpm /org.apache.felix.utils-1.6.0-source-release.tar.gz /org.apache.felix.utils-1.8.0-source-release.tar.gz /org.apache.felix.utils-1.8.2-source-release.tar.gz @@ -11,3 +11,5 @@ /org.apache.felix.utils-1.10.0-source-release.tar.gz /org.apache.felix.utils-1.10.2-source-release.tar.gz /org.apache.felix.utils-1.10.4-source-release.tar.gz +/org.apache.felix.utils-1.11.0-source-release.tar.gz +/org.apache.felix.utils-1.11.2-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..22b0222 --- /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.spec b/felix-utils.spec index 2bfc5db..6e12a65 100644 --- a/felix-utils.spec +++ b/felix-utils.spec @@ -1,8 +1,8 @@ %global bundle org.apache.felix.utils Name: felix-utils -Version: 1.10.4 -Release: 5%{?dist} +Version: 1.11.2 +Release: 1%{?dist} Summary: Utility classes for OSGi License: ASL 2.0 URL: http://felix.apache.org @@ -10,10 +10,16 @@ BuildArch: noarch Source0: http://repo1.maven.org/maven2/org/apache/felix/%{bundle}/%{version}/%{bundle}-%{version}-source-release.tar.gz +# The module org.osgi.cmpn requires implementing methods which were not +# implemented in previous versions where org.osgi.compendium was used +Patch0: 0000-Port-to-osgi-cmpn.patch + BuildRequires: maven-local +BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:felix-parent:pom:) -BuildRequires: mvn(org.osgi:org.osgi.compendium) -BuildRequires: mvn(org.osgi:org.osgi.core) +BuildRequires: mvn(org.mockito:mockito-core) +BuildRequires: mvn(org.osgi:osgi.cmpn) +BuildRequires: mvn(org.osgi:osgi.core) %description Utility classes for OSGi @@ -26,6 +32,7 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{bundle}-%{version} +%patch0 -p1 %pom_remove_plugin :apache-rat-plugin @@ -45,6 +52,12 @@ This package contains the API documentation for %{name}. %license LICENSE NOTICE %changelog +* Sun Aug 18 2019 Fabio Valentini - 1.11.2-1 +- Update to version 1.11.2. + +* Sun Aug 18 2019 Fabio Valentini - 1.11.0-1 +- Update to version 1.11.0. + * Thu Jul 25 2019 Fedora Release Engineering - 1.10.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 007386f..6e0ee16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.apache.felix.utils-1.10.4-source-release.tar.gz) = 3379f94560b717656262ae3301c2c5df99b26c93feebe1833d6cadd60ad89709b345ad6f9181f6305c234edbb710ff3b007f0c75b44b30f5e5a5f737dad477c7 +SHA512 (org.apache.felix.utils-1.11.2-source-release.tar.gz) = f97363c7eb7ee3c2b9896b925ff16d54f5546a28ff99e74b47a8d714011b07d63df6fb72fe3db7559a64ae54b56d4244381b0792b13bc72d6098fabab811b39b