.felix-utils.metadata

@@ -1 +1 @@
-d84f0ea491708d7866954f01761ef888a363144d SOURCES/org.apache.felix.utils-1.11.2-source-release.tar.gz
+fb6bece40ecf77b7217317e22b92f0e3cf8b935f SOURCES/org.apache.felix.utils-1.10.4-source-release.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/org.apache.felix.utils-1.11.2-source-release.tar.gz
+SOURCES/org.apache.felix.utils-1.10.4-source-release.tar.gz

SOURCES/0000-Port-to-osgi-cmpn.patch

@@ -1,123 +0,0 @@
-From d7a2d969b55ab34a223ad1422b2e3ef7d95a347f Mon Sep 17 00:00:00 2001
-From: Marian Koncek <mkoncek@redhat.com>
-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<Collection<Resource>> 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<Collection<Resource>> 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 <S> ServiceRegistration<S> registerService(Class<S> clazz, ServiceFactory<S> factory, Dictionary<String, ?> 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 <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> reference) {
-+	    throw new UnsupportedOperationException();
-+	}
-+
-     public File getDataFile(String s) {
-         throw new UnsupportedOperationException();
-     }
--- 
-2.17.2
-

SPECS/felix-utils.spec

@@ -1,7 +1,7 @@
 %global bundle org.apache.felix.utils
 
 Name:           felix-utils
-Version:        1.11.2
+Version:        1.10.4
 Release:        2%{?dist}
 Summary:        Utility classes for OSGi
 License:        ASL 2.0
@@ -10,16 +10,10 @@ 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.mockito:mockito-core)
+BuildRequires:  mvn(org.osgi:org.osgi.compendium)
-BuildRequires:  mvn(org.osgi:osgi.cmpn)
+BuildRequires:  mvn(org.osgi:org.osgi.core)
-BuildRequires:  mvn(org.osgi:osgi.core)
 
 %description
 Utility classes for OSGi
@@ -33,8 +27,6 @@ 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}"
@@ -53,18 +45,6 @@ This package contains the API documentation for %{name}.
 %license LICENSE NOTICE
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11.2-2
-- Mass rebuild for javapackages-tools 201902
-
-* Mon Jul 22 2019 Marian Koncek <mkoncek@redhat.com> - 1.11.2-1
-- Update to upstream version 1.11.2
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11.0-2
-- Mass rebuild for javapackages-tools 201901
-
-* Mon Nov 05 2018 Marian Koncek <mkoncek@redhat.com> - 1.11.0-1
-- Update to upstream version 1.11.0
-
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild