From 3bede3b7ebd8196341de9c203e64f406212ac5b8 Mon Sep 17 00:00:00 2001
From: Adrien Lassere <adrien.lassere@livingobjects.com>
Date: Fri, 1 Feb 2019 17:05:30 +0100
Subject: [PATCH] Update dependencies to R7

---
 scr/pom.xml                                        | 14 +++++++-------
 .../felix/scr/integration/ComponentTestBase.java   |  6 ++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/scr/pom.xml b/scr/pom.xml
index 65ac7251e45..78b984f2cd7 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -72,13 +72,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>osgi.annotation</artifactId>
-            <version>6.0.1</version>
+            <version>7.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -96,13 +96,13 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.log</artifactId>
-            <version>1.3.0</version>
+            <version>1.4.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.metatype</artifactId>
-            <version>1.3.0</version>
+            <version>1.4.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -114,13 +114,13 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.util.promise</artifactId>
-            <version>1.0.0</version>
+            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.gogo.runtime</artifactId>
-            <version>1.0.0</version>
+            <version>1.1.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -368,7 +368,7 @@
                 <dependency>
                     <groupId>org.apache.felix</groupId>
                     <artifactId>org.apache.felix.framework</artifactId>
-                    <version>4.6.0</version>
+                    <version>6.0.2</version>
                     <scope>test</scope>
                 </dependency>
             </dependencies>
diff --git a/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java b/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
index f67a39ed0e3..295c920de6c 100644
--- a/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
+++ b/scr/src/test/java/org/apache/felix/scr/integration/ComponentTestBase.java
@@ -82,6 +82,7 @@
 import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
 import org.osgi.service.component.runtime.dto.ComponentDescriptionDTO;
 import org.osgi.service.log.LogService;
+import org.osgi.service.log.Logger;
 import org.osgi.util.tracker.ServiceTracker;
 
 import junit.framework.Assert;
@@ -1038,6 +1039,11 @@ public void log(ServiceReference sr, int level, String msg, Throwable exception)
             }
         }
 
+        @Override
+        public <L extends Logger> L getLogger(String name, Class<L> loggerType) {
+            return null;
+        }
+
         private int getEnabledLogLevel()
         {
             if ( DS_LOGLEVEL.regionMatches( true, 0, "err", 0, "err".length() ) )