From d1138610cb46fcffc0ef0a1b6e971c52dcd8e39a Mon Sep 17 00:00:00 2001 From: Adam Samalik Date: Thu, 29 Jun 2023 10:53:34 +0200 Subject: [PATCH] re-import sources as agreed with the maintainer --- .gitignore | 13 +++- 0000-Port-to-osgi-cmpn.patch | 123 ----------------------------------- gating.yaml | 8 --- 3 files changed, 12 insertions(+), 132 deletions(-) delete mode 100644 0000-Port-to-osgi-cmpn.patch delete mode 100644 gating.yaml diff --git a/.gitignore b/.gitignore index fa5d4ba..3290f07 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,13 @@ -SOURCES/org.apache.felix.utils-1.10.4-source-release.tar.gz +/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 +/org.apache.felix.utils-1.8.6-source-release.tar.gz +/org.apache.felix.utils-1.9.0-source-release.tar.gz +/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 diff --git a/0000-Port-to-osgi-cmpn.patch b/0000-Port-to-osgi-cmpn.patch deleted file mode 100644 index 22b0222..0000000 --- a/0000-Port-to-osgi-cmpn.patch +++ /dev/null @@ -1,123 +0,0 @@ -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/gating.yaml b/gating.yaml deleted file mode 100644 index d6b7694..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !Policy -product_versions: - - rhel-9 -decision_contexts: - - osci_compose_gate -rules: - # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test - - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}