polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From paulmer...@apache.org
Subject [28/35] zest-java git commit: osgi: upgrade to 4.3.1 and fix compilation
Date Sat, 19 Nov 2016 22:50:29 GMT
osgi: upgrade to 4.3.1 and fix compilation


Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/5a5408c0
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/5a5408c0
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/5a5408c0

Branch: refs/heads/develop
Commit: 5a5408c00661ce3145bc84324833d6bf94bdc873
Parents: 0d573a4
Author: Paul Merlin <paulmerlin@apache.org>
Authored: Sat Nov 19 19:06:46 2016 +0100
Committer: Paul Merlin <paulmerlin@apache.org>
Committed: Sat Nov 19 19:06:46 2016 +0100

----------------------------------------------------------------------
 dependencies.gradle                                          | 2 +-
 .../org/apache/zest/library/osgi/OSGiServiceExporter.java    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-java/blob/5a5408c0/dependencies.gradle
----------------------------------------------------------------------
diff --git a/dependencies.gradle b/dependencies.gradle
index aed45ba..c57b3b1 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -30,7 +30,7 @@ dependencies.repositoriesUrls << [
 // Core dependencies
 def asmVersion = '5.1'
 def orgJsonVersion = '20130213'
-def osgiVersion = '4.2.0' // 4.3.0 Fails to compile! - 5.0.0 exists
+def osgiVersion = '4.3.1'
 dependencies.libraries << [
   asm        : "org.ow2.asm:asm:$asmVersion",
   asm_commons: "org.ow2.asm:asm-commons:$asmVersion",

http://git-wip-us.apache.org/repos/asf/zest-java/blob/5a5408c0/libraries/osgi/src/main/java/org/apache/zest/library/osgi/OSGiServiceExporter.java
----------------------------------------------------------------------
diff --git a/libraries/osgi/src/main/java/org/apache/zest/library/osgi/OSGiServiceExporter.java
b/libraries/osgi/src/main/java/org/apache/zest/library/osgi/OSGiServiceExporter.java
index 74cbdb5..e1a7d6d 100644
--- a/libraries/osgi/src/main/java/org/apache/zest/library/osgi/OSGiServiceExporter.java
+++ b/libraries/osgi/src/main/java/org/apache/zest/library/osgi/OSGiServiceExporter.java
@@ -20,10 +20,8 @@
 package org.apache.zest.library.osgi;
 
 import java.util.ArrayList;
+import java.util.Dictionary;
 import java.util.Properties;
-import java.util.stream.Stream;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceRegistration;
 import org.apache.zest.api.activation.ActivatorAdapter;
 import org.apache.zest.api.activation.Activators;
 import org.apache.zest.api.injection.scope.Service;
@@ -32,6 +30,8 @@ import org.apache.zest.api.service.ServiceComposite;
 import org.apache.zest.api.service.ServiceReference;
 import org.apache.zest.api.service.qualifier.HasMetaInfo;
 import org.apache.zest.api.util.Classes;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceRegistration;
 
 import static org.apache.zest.api.util.Classes.interfacesOf;
 
@@ -88,7 +88,7 @@ public interface OSGiServiceExporter
                 Class<? extends BundleContext> type = BundleContext.class;
                 BundleContext context = ref.metaInfo( type );
                 ServiceComposite service = ref.get();
-                Properties properties = ref.metaInfo( Properties.class );
+                Dictionary properties = ref.metaInfo( Dictionary.class );
                 if( properties == null )
                 {
                     properties = new Properties();


Mime
View raw message