Accepting request 790524 from Java:packages
1.11.4 OBS-URL: https://build.opensuse.org/request/show/790524 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/felix-utils?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
411b41007b
123
0000-Port-to-osgi-cmpn.patch
Normal file
123
0000-Port-to-osgi-cmpn.patch
Normal file
@ -0,0 +1,123 @@
|
||||
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
|
||||
|
||||
@ -10,8 +10,8 @@
|
||||
|
||||
<property name="project.groupId" value="org.apache.felix"/>
|
||||
<property name="project.name" value="Apache Felix Utils"/>
|
||||
<property name="project.version" value="1.10.4"/>
|
||||
<property name="spec.version" value="1.10"/>
|
||||
<property name="project.version" value="1.11.4"/>
|
||||
<property name="spec.version" value="1.11"/>
|
||||
<property name="project.artifactId" value="org.apache.felix.utils"/>
|
||||
|
||||
<property name="build.finalName" value="${project.artifactId}-${project.version}"/>
|
||||
@ -25,7 +25,7 @@
|
||||
<property name="test.reports" value="${build.dir}/test-reports"/>
|
||||
<property name="reporting.outputDirectory" value="${build.dir}/site"/>
|
||||
|
||||
<property name="compiler.source" value="1.6"/>
|
||||
<property name="compiler.source" value="1.7"/>
|
||||
<property name="compiler.target" value="${compiler.source}"/>
|
||||
|
||||
<!-- ====================================================================== -->
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 31 06:19:36 UTC 2020 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- 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 <fstrba@suse.com>
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f81b28e9b0a88821648868e0123400038fb0041814aec660acb9fda9e1758923
|
||||
size 59033
|
||||
BIN
org.apache.felix.utils-1.11.4-source-release.tar.gz
(Stored with Git LFS)
Normal file
BIN
org.apache.felix.utils-1.11.4-source-release.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user