From 5631518f4bb7e042ad56308178f4e2883c06bf04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Baptiste=20Onofr=C3=A9?= <jbonofre@apache.org>
Date: Wed, 23 May 2018 16:45:36 +0200
Subject: [PATCH] [FELIX-5860] Upgrade to OSGi R7

---
 connect/pom.xml                               | 31 +++----------------
 .../framework/ServiceRegistrationImpl.java    | 17 ++++++----
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/connect/pom.xml b/connect/pom.xml
index f5f7bbea744..e18ad72ed4c 100644
--- a/connect/pom.xml
+++ b/connect/pom.xml
@@ -58,13 +58,13 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.core</artifactId>
-            <version>6.0.0</version>
+            <version>7.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <version>5.0.0</version>
+            <artifactId>osgi.cmpn</artifactId>
+            <version>7.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -103,31 +103,10 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <target>1.6</target>
-                    <source>1.6</source>
+                    <target>1.7</target>
+                    <source>1.7</source>
                 </configuration>
             </plugin>
-            <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>animal-sniffer-maven-plugin</artifactId>
-                  <version>1.5</version>
-                  <executions>
-                    <execution>
-                      <id>check-java-version</id>
-                      <phase>verify</phase>
-                      <goals>
-                        <goal>check</goal>
-                      </goals>
-                      <configuration>
-                        <signature>
-                          <groupId>org.codehaus.mojo.signature</groupId>
-                          <artifactId>java15</artifactId>
-                          <version>1.0</version>
-                        </signature>
-                      </configuration>
-                    </execution>
-                  </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
diff --git a/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java b/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java
index 2c401b07cf7..e610ef95b9b 100644
--- a/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java
+++ b/connect/src/main/java/org/apache/felix/connect/felix/framework/ServiceRegistrationImpl.java
@@ -18,12 +18,7 @@
  */
 package org.apache.felix.connect.felix.framework;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Dictionary;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
@@ -347,6 +342,15 @@ public String[] getPropertyKeys()
             return ServiceRegistrationImpl.this.getPropertyKeys();
         }
 
+        @Override
+        public Dictionary<String, Object> getProperties() {
+            Dictionary<String, Object> dictionary = new Hashtable<String, Object>();
+            for (String key : getPropertyKeys()) {
+                dictionary.put(key, getProperty(key));
+            }
+            return dictionary;
+        }
+
         @Override
         public Bundle getBundle()
         {
@@ -506,6 +510,7 @@ else if (rank.compareTo(otherRank) > 0)
             // If ranks are equal, then sort by service id in descending order.
             return (id.compareTo(otherId) < 0) ? 1 : -1;
         }
+
     }
 
     private class ServiceReferenceMap implements Map<String, Object>