From 026a74d65e9919cb2951f4e13ca927904ef05915 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 5 Nov 2018 10:52:54 +0100 Subject: [PATCH 1/9] Update to upstream version 1.11.0 --- .gitignore | 1 + 0000-Port-to-osgi-cmpn.patch | 123 +++++++++++++++++++++++++++++++++++ felix-utils.spec | 19 ++++-- sources | 2 +- 4 files changed, 140 insertions(+), 5 deletions(-) create mode 100644 0000-Port-to-osgi-cmpn.patch diff --git a/.gitignore b/.gitignore index 3290f07..5f2738c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /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 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 348868e..95c8d50 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: 2%{?dist} +Version: 1.11.0 +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 @@ -27,6 +33,8 @@ This package contains the API documentation for %{name}. %prep %setup -q -n %{bundle}-%{version} +%patch0 -p1 + %pom_remove_plugin :apache-rat-plugin %mvn_file :%{bundle} "felix/%{bundle}" @@ -45,6 +53,9 @@ This package contains the API documentation for %{name}. %license LICENSE NOTICE %changelog +* Mon Nov 05 2018 Marian Koncek - 1.11.0-1 +- Update to upstream version 1.11.0 + * Wed Feb 07 2018 Fedora Release Engineering - 1.10.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 007386f..44d9435 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.0-source-release.tar.gz) = 8385ee383b1277f336641d53ca9f78f9bea5dde7d91d8e3a1a638abf13b7542f0c14da66bb1b76e01528719f47ba49695f6a1767ec182e20cd08345246604e25 From 12f532788629eb24dd1cc25d65392c0c7450ad2a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:30 +0200 Subject: [PATCH 2/9] Mass rebuild for javapackages-tools 201901 --- felix-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/felix-utils.spec b/felix-utils.spec index 95c8d50..5a5e441 100644 --- a/felix-utils.spec +++ b/felix-utils.spec @@ -2,7 +2,7 @@ Name: felix-utils Version: 1.11.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility classes for OSGi License: ASL 2.0 URL: http://felix.apache.org @@ -53,6 +53,9 @@ This package contains the API documentation for %{name}. %license LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.11.0-2 +- Mass rebuild for javapackages-tools 201901 + * Mon Nov 05 2018 Marian Koncek - 1.11.0-1 - Update to upstream version 1.11.0 From 795b02d0eaec5563a1916f1b50f3abf0b3f13438 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 22 Jul 2019 08:31:55 +0200 Subject: [PATCH 3/9] Update to upstream version 1.11.2 --- .gitignore | 1 + felix-utils.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5f2738c..0442e80 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /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/felix-utils.spec b/felix-utils.spec index 5a5e441..710d72b 100644 --- a/felix-utils.spec +++ b/felix-utils.spec @@ -1,8 +1,8 @@ %global bundle org.apache.felix.utils Name: felix-utils -Version: 1.11.0 -Release: 2%{?dist} +Version: 1.11.2 +Release: 1%{?dist} Summary: Utility classes for OSGi License: ASL 2.0 URL: http://felix.apache.org @@ -53,6 +53,9 @@ This package contains the API documentation for %{name}. %license LICENSE NOTICE %changelog +* Mon Jul 22 2019 Marian Koncek - 1.11.2-1 +- Update to upstream version 1.11.2 + * Fri May 24 2019 Mikolaj Izdebski - 1.11.0-2 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 44d9435..6e0ee16 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.apache.felix.utils-1.11.0-source-release.tar.gz) = 8385ee383b1277f336641d53ca9f78f9bea5dde7d91d8e3a1a638abf13b7542f0c14da66bb1b76e01528719f47ba49695f6a1767ec182e20cd08345246604e25 +SHA512 (org.apache.felix.utils-1.11.2-source-release.tar.gz) = f97363c7eb7ee3c2b9896b925ff16d54f5546a28ff99e74b47a8d714011b07d63df6fb72fe3db7559a64ae54b56d4244381b0792b13bc72d6098fabab811b39b From f558821f1055b3a24fa1ce89728d258c6c853a5e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 4/9] Mass rebuild for javapackages-tools 201902 --- felix-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/felix-utils.spec b/felix-utils.spec index 710d72b..d06cf11 100644 --- a/felix-utils.spec +++ b/felix-utils.spec @@ -2,7 +2,7 @@ Name: felix-utils Version: 1.11.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Utility classes for OSGi License: ASL 2.0 URL: http://felix.apache.org @@ -53,6 +53,9 @@ This package contains the API documentation for %{name}. %license LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.11.2-2 +- Mass rebuild for javapackages-tools 201902 + * Mon Jul 22 2019 Marian Koncek - 1.11.2-1 - Update to upstream version 1.11.2 From 7266eb9c83184fde2674f6201fdd21210f9d2748 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jan 2020 12:43:51 +0100 Subject: [PATCH 5/9] Update to upstream version 1.11.4 --- .gitignore | 1 + felix-utils.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0442e80..1bd3847 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /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 +/org.apache.felix.utils-1.11.4-source-release.tar.gz diff --git a/felix-utils.spec b/felix-utils.spec index d06cf11..123a5ec 100644 --- a/felix-utils.spec +++ b/felix-utils.spec @@ -1,14 +1,14 @@ %global bundle org.apache.felix.utils Name: felix-utils -Version: 1.11.2 -Release: 2%{?dist} +Version: 1.11.4 +Release: 1%{?dist} Summary: Utility classes for OSGi License: ASL 2.0 URL: http://felix.apache.org BuildArch: noarch -Source0: http://repo1.maven.org/maven2/org/apache/felix/%{bundle}/%{version}/%{bundle}-%{version}-source-release.tar.gz +Source0: https://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 @@ -53,6 +53,9 @@ This package contains the API documentation for %{name}. %license LICENSE NOTICE %changelog +* Wed Jan 29 2020 Marian Koncek - 1.11.4-1 +- Update to upstream version 1.11.4 + * Tue Nov 05 2019 Mikolaj Izdebski - 1.11.2-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 6e0ee16..b2c308e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.apache.felix.utils-1.11.2-source-release.tar.gz) = f97363c7eb7ee3c2b9896b925ff16d54f5546a28ff99e74b47a8d714011b07d63df6fb72fe3db7559a64ae54b56d4244381b0792b13bc72d6098fabab811b39b +SHA512 (org.apache.felix.utils-1.11.4-source-release.tar.gz) = c5ce739f98ad7a4e45b66496f1f237c77203fcfba3a1e871b0029bfb2e0ba921ac7fab88512398f869cc5dc090f9d33e88f91aa831e842c372af6778be3a2edc From 8b2395d8161e1e95f0b1f4458a2bc095cc9b6516 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 26 Jun 2020 08:27:05 +0200 Subject: [PATCH 6/9] Remove use of parent POM --- felix-utils.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/felix-utils.spec b/felix-utils.spec index 123a5ec..d3234ee 100644 --- a/felix-utils.spec +++ b/felix-utils.spec @@ -16,7 +16,6 @@ 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.mockito:mockito-core) BuildRequires: mvn(org.osgi:osgi.cmpn) BuildRequires: mvn(org.osgi:osgi.core) @@ -35,6 +34,8 @@ This package contains the API documentation for %{name}. %patch0 -p1 +%pom_remove_parent +%pom_xpath_inject pom:project "org.apache.felix" %pom_remove_plugin :apache-rat-plugin %mvn_file :%{bundle} "felix/%{bundle}" From 9c2bfde3ad78f875c032687a56cb6a59d455a49f Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 20 Jan 2021 16:46:19 +0100 Subject: [PATCH 7/9] Update to upstream version 1.11.6 --- .gitignore | 1 + felix-utils.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1bd3847..f4d0b1f 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /org.apache.felix.utils-1.11.0-source-release.tar.gz /org.apache.felix.utils-1.11.2-source-release.tar.gz /org.apache.felix.utils-1.11.4-source-release.tar.gz +/org.apache.felix.utils-1.11.6-source-release.tar.gz diff --git a/felix-utils.spec b/felix-utils.spec index d3234ee..7b81ea2 100644 --- a/felix-utils.spec +++ b/felix-utils.spec @@ -1,11 +1,11 @@ %global bundle org.apache.felix.utils Name: felix-utils -Version: 1.11.4 +Version: 1.11.6 Release: 1%{?dist} Summary: Utility classes for OSGi License: ASL 2.0 -URL: http://felix.apache.org +URL: https://felix.apache.org BuildArch: noarch Source0: https://repo1.maven.org/maven2/org/apache/felix/%{bundle}/%{version}/%{bundle}-%{version}-source-release.tar.gz @@ -54,6 +54,9 @@ This package contains the API documentation for %{name}. %license LICENSE NOTICE %changelog +* Wed Jan 20 2021 Marian Koncek - 1.11.6-1 +- Update to upstream version 1.11.6 + * Wed Jan 29 2020 Marian Koncek - 1.11.4-1 - Update to upstream version 1.11.4 diff --git a/sources b/sources index b2c308e..af3fa54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (org.apache.felix.utils-1.11.4-source-release.tar.gz) = c5ce739f98ad7a4e45b66496f1f237c77203fcfba3a1e871b0029bfb2e0ba921ac7fab88512398f869cc5dc090f9d33e88f91aa831e842c372af6778be3a2edc +SHA512 (org.apache.felix.utils-1.11.6-source-release.tar.gz) = 6f11b8bda9459d8064709d977859486e760666de44a784ccb2a8b173e358136cda7fec2a6ec1efabe697b38f19c74de7ee6883ba01447669f6a728626ee8a20a From 4e0c9f068c11f991b9aacc4e2ff0e7afc78d3f6d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 8/9] Conditionalize buildrequires in bootstrap mode --- felix-utils.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/felix-utils.spec b/felix-utils.spec index 7b81ea2..e74abe4 100644 --- a/felix-utils.spec +++ b/felix-utils.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + %global bundle org.apache.felix.utils Name: felix-utils @@ -15,10 +17,14 @@ Source0: https://repo1.maven.org/maven2/org/apache/felix/%{bundle}/%{vers Patch0: 0000-Port-to-osgi-cmpn.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.osgi:osgi.cmpn) BuildRequires: mvn(org.osgi:osgi.core) +%endif %description Utility classes for OSGi From b1438ae1533f4ffffb0869f663d8e099c1741a02 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 9/9] Turn off bootstrap mode by default --- felix-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/felix-utils.spec b/felix-utils.spec index e74abe4..d7237de 100644 --- a/felix-utils.spec +++ b/felix-utils.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap %global bundle org.apache.felix.utils