From 398bb3668ffa9f8915c940bc47188ad50403a376 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Sun, 10 Nov 2019 11:59:17 +0100
Subject: [PATCH] Upgrade to Karaf 4.2.7

For Karaf 4.2.7 release notes, see:

https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12345539

Also updates dependencies:

* Jetty 9.4.20.v20190813
* JNA 5.4.0 (used by most add-ons)

Signed-off-by: Wouter Born <github@maindrain.net>
---
 .../src/main/feature/feature.xml                           | 2 +-
 .../src/main/feature/feature.xml                           | 2 +-
 .../src/main/feature/feature.xml                           | 3 +--
 bundles/org.openhab.binding.tellstick/pom.xml              | 2 +-
 .../src/main/feature/feature.xml                           | 3 ++-
 features/pom.xml                                           | 7 +++++++
 pom.xml                                                    | 2 +-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/bundles/org.openhab.binding.amazondashbutton/src/main/feature/feature.xml b/bundles/org.openhab.binding.amazondashbutton/src/main/feature/feature.xml
index 1080dab48a117..1da2db5b472cc 100644
--- a/bundles/org.openhab.binding.amazondashbutton/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.amazondashbutton/src/main/feature/feature.xml
@@ -4,7 +4,7 @@
 
     <feature name="openhab-binding-amazondashbutton" description="Amazon Dash Button Binding" version="${project.version}">
         <feature>openhab-runtime-base</feature>
-        <bundle dependency="true">mvn:net.java.dev.jna/jna/5.4.0</bundle>
+        <feature>openhab-runtime-jna</feature>
         <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.amazondashbutton/${project.version}</bundle>
     </feature>
 </features>
diff --git a/bundles/org.openhab.binding.doorbird/src/main/feature/feature.xml b/bundles/org.openhab.binding.doorbird/src/main/feature/feature.xml
index 697d88f30fa2d..ef390be374642 100644
--- a/bundles/org.openhab.binding.doorbird/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.doorbird/src/main/feature/feature.xml
@@ -4,7 +4,7 @@
 
   <feature name="openhab-binding-doorbird" description="Doorbird Binding" version="${project.version}">
     <feature>openhab-runtime-base</feature>
-    <bundle dependency="true">mvn:net.java.dev.jna/jna/5.4.0</bundle>
+    <feature>openhab-runtime-jna</feature>
     <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.doorbird/${project.version}</bundle>
   </feature>
 </features>
diff --git a/bundles/org.openhab.binding.systeminfo/src/main/feature/feature.xml b/bundles/org.openhab.binding.systeminfo/src/main/feature/feature.xml
index 192929f636b40..4ce77299c65fd 100644
--- a/bundles/org.openhab.binding.systeminfo/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.systeminfo/src/main/feature/feature.xml
@@ -4,8 +4,7 @@
 
     <feature name="openhab-binding-systeminfo" description="System Info Binding" version="${project.version}">
         <feature>openhab-runtime-base</feature>
-        <bundle dependency="true">mvn:net.java.dev.jna/jna/5.4.0</bundle>
-        <bundle dependency="true">mvn:net.java.dev.jna/jna-platform/5.4.0</bundle>
+        <feature>openhab-runtime-jna</feature>
         <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.systeminfo/${project.version}</bundle>
     </feature>
 </features>
diff --git a/bundles/org.openhab.binding.tellstick/pom.xml b/bundles/org.openhab.binding.tellstick/pom.xml
index bfe5119f4d1f3..24de76672de94 100644
--- a/bundles/org.openhab.binding.tellstick/pom.xml
+++ b/bundles/org.openhab.binding.tellstick/pom.xml
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>net.java.dev.jna</groupId>
       <artifactId>jna</artifactId>
-      <version>4.2.1</version>
+      <version>4.5.2</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml b/bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml
index dfff86c4a325e..cbdb09c22aac6 100644
--- a/bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml
+++ b/bundles/org.openhab.binding.tellstick/src/main/feature/feature.xml
@@ -4,9 +4,10 @@
 
     <feature name="openhab-binding-tellstick" description="Tellstick Binding" version="${project.version}">
         <feature>openhab-runtime-base</feature>
-        <feature>openhab-runtime-jna</feature>
         <feature>openhab-transport-serial</feature>
         <feature dependency="true">openhab.tp-jaxb</feature>
+        <bundle dependency="true">mvn:net.java.dev.jna/jna/4.5.2</bundle>
+        <bundle dependency="true">mvn:net.java.dev.jna/jna-platform/4.5.2</bundle>
         <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.tellstick/${project.version}</bundle>
     </feature>
 </features>
diff --git a/features/pom.xml b/features/pom.xml
index bf13bd04c44ec..266cb4f10e443 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -28,6 +28,13 @@
       <version>${karaf.version}</version>
       <type>kar</type>
       <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <!-- This should have been an optional dependency and will be fixed in Karaf 4.2.8 (KARAF-6462). -->
+          <groupId>org.knopflerfish.kf6</groupId>
+          <artifactId>log-API</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <!-- Repositories -->
diff --git a/pom.xml b/pom.xml
index 79a22b9272add..34745f489b21e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
     <maven.compiler.compilerVersion>${oh.java.version}</maven.compiler.compilerVersion>
 
     <bnd.version>4.2.0</bnd.version>
-    <karaf.version>4.2.6</karaf.version>
+    <karaf.version>4.2.7</karaf.version>
     <sat.version>0.8.0</sat.version>
     <slf4j.version>1.7.21</slf4j.version>