#1 Update to upstream version 1.11.0
Closed 2 years ago by decathorpe. Opened 2 years ago by mkoncek.
rpms/ mkoncek/felix-utils update-version  into  master

file modified
+1
@@ -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

@@ -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

+ 

file modified
+15 -4
@@ -1,8 +1,8 @@ 

  %global bundle org.apache.felix.utils

  

  Name:           felix-utils

- Version:        1.10.4

- Release:        3%{?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 @@ 

  

  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 @@ 

  %prep

  %setup -q -n %{bundle}-%{version}

  

+ %patch0 -p1

+ 

  %pom_remove_plugin :apache-rat-plugin

  

  %mvn_file :%{bundle} "felix/%{bundle}"
@@ -45,6 +53,9 @@ 

  %license LICENSE NOTICE

  

  %changelog

+ * Mon Nov 05 2018 Marian Koncek <mkoncek@redhat.com> - 1.11.0-1

+ - Update to upstream version 1.11.0

+ 

  * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.4-3

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +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

The update required changing the pom file as well as adding new unimplemented methods to conform to the new interface.

This should not be needed.

Patches should be applied early in %prep - just after %setup.

Please be more specific what this patch does - current patch name is too vague.

These methods should probably be implemented. But I can't say for sure - as I stated elsewhere, I don't fully understand what this patch is supposed to achieve as its name/description is too vague.

Please fix issues pointed out in commit comments.

rebased onto 48450ff

2 years ago

@mkoncek Would you like to take this package?

Minor version 1.11.2 has been released, would you be interested in bumping this PR accordingly?

Pull-Request has been closed by decathorpe

2 years ago