From b3802d565db205ba6a04080c5b3286e4612dde4c Mon Sep 17 00:00:00 2001
From: Christoph Weitkamp <github@christophweitkamp.de>
Date: Thu, 29 Aug 2019 09:17:35 +0200
Subject: [PATCH] [infrastructure] bump SAT to 0.7.0 (#1007)

* Bump SAT version; Fixed high priority findings
* Defined path to feature file to avoid warnings

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
---
 .../smarthome/io/http/auth/internal/AuthenticationHandler.java  | 2 +-
 .../io/net/http/internal/ExtensibleTrustManagerImpl.java        | 2 +-
 .../smarthome/core/internal/service/ReadyServiceImpl.java       | 2 +-
 pom.xml                                                         | 2 +-
 tools/static-code-analysis/checkstyle/ruleset.properties        | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bundles/org.openhab.core.io.http.auth/src/main/java/org/eclipse/smarthome/io/http/auth/internal/AuthenticationHandler.java b/bundles/org.openhab.core.io.http.auth/src/main/java/org/eclipse/smarthome/io/http/auth/internal/AuthenticationHandler.java
index 3fdeda241..3bcdb178e 100644
--- a/bundles/org.openhab.core.io.http.auth/src/main/java/org/eclipse/smarthome/io/http/auth/internal/AuthenticationHandler.java
+++ b/bundles/org.openhab.core.io.http.auth/src/main/java/org/eclipse/smarthome/io/http/auth/internal/AuthenticationHandler.java
@@ -52,7 +52,7 @@ public class AuthenticationHandler implements Handler {
     private static final String DEFAULT_LOGIN_URI = "/login";
     static final String REDIRECT_PARAM_NAME = "redirect";
 
-    private final Logger logger = LoggerFactory.getLogger(AuthenticationManager.class);
+    private final Logger logger = LoggerFactory.getLogger(AuthenticationHandler.class);
 
     private final List<CredentialsExtractor<HttpServletRequest>> extractors = new CopyOnWriteArrayList<>();
 
diff --git a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/internal/ExtensibleTrustManagerImpl.java b/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/internal/ExtensibleTrustManagerImpl.java
index 57a38cdfa..268e156e7 100644
--- a/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/internal/ExtensibleTrustManagerImpl.java
+++ b/bundles/org.openhab.core.io.net/src/main/java/org/eclipse/smarthome/io/net/http/internal/ExtensibleTrustManagerImpl.java
@@ -167,7 +167,7 @@ public class ExtensibleTrustManagerImpl extends X509ExtendedTrustManager impleme
                     .orElse(null);
             // @formatter:on
         } catch (CommonNameNotFoundException e) {
-            logger.debug("CN not found", e.getMessage());
+            logger.debug("CN not found", e);
             return null;
         } catch (CertificateParsingException e) {
             logger.debug("Problem while parsing certificate", e);
diff --git a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/service/ReadyServiceImpl.java b/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/service/ReadyServiceImpl.java
index 449342a72..9312c87f6 100644
--- a/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/service/ReadyServiceImpl.java
+++ b/bundles/org.openhab.core/src/main/java/org/eclipse/smarthome/core/internal/service/ReadyServiceImpl.java
@@ -99,7 +99,7 @@ public class ReadyServiceImpl implements ReadyService {
                 notifyTracker(readyTracker, marker -> readyTracker.onReadyMarkerAdded(marker));
             }
         } catch (RuntimeException e) {
-            logger.error("Registering tracker '" + readyTracker + "' failed!", e);
+            logger.error("Registering tracker '{}' failed!", readyTracker, e);
         } finally {
             rwlTrackers.writeLock().unlock();
         }
diff --git a/pom.xml b/pom.xml
index 7aee79b42..cbd748bbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,7 +71,7 @@
     <bnd.version>4.2.0</bnd.version>
     <karaf.compile.version>4.2.1</karaf.compile.version>
     <karaf.tooling.version>4.2.6</karaf.tooling.version>
-    <sat.version>0.6.1</sat.version>
+    <sat.version>0.7.0</sat.version>
     <slf4j.version>1.7.21</slf4j.version>
     <xtext.version>2.17.0</xtext.version>
   </properties>
diff --git a/tools/static-code-analysis/checkstyle/ruleset.properties b/tools/static-code-analysis/checkstyle/ruleset.properties
index 04248e1dd..750e7d3d0 100644
--- a/tools/static-code-analysis/checkstyle/ruleset.properties
+++ b/tools/static-code-analysis/checkstyle/ruleset.properties
@@ -5,3 +5,4 @@ checkstyle.headerCheck.content=^/\\*\\*$\\n^ \\* Copyright \\(c\\) {0}-{1} Contr
 checkstyle.headerCheck.values=2010,2019
 checkstyle.pomXmlCheck.currentVersionRegex=^2\.5\.0
 checkstyle.requiredFilesCheck.files=pom.xml
+checkstyle.karafFeatureCheck.featureXmlPath=features/karaf/openhab-core/src/main/feature/feature.xml