Merge branch 'master' into fix-set-db-read-uncommited

Conflicts:
	hawkbit-repository/src/main/java/org/eclipse/hawkbit/repository/TenantConfigurationManagement.java


Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>

hawkbit-core/src/main/java/org/eclipse/hawkbit/DistributedResourceBundleMessageSource.java

@@ -22,11 +22,10 @@ import org.springframework.core.io.support.ResourcePatternResolver;
  * This resource bundles using specified basenames, to resource loading. This
  * MessageSource implementation supports more than 1 properties file with the
  * same name. All properties files will be merged.
- * 
- *
- *
  */
 public class DistributedResourceBundleMessageSource extends ReloadableResourceBundleMessageSource {
+    // Exception squid:S2387 - Follows our upper case convention
+    @SuppressWarnings({ "squid:S2387" })
     private static final Logger LOGGER = LoggerFactory.getLogger(DistributedResourceBundleMessageSource.class);
     private static final String PROPERTIES_SUFFIX = ".properties";
     private ResourceLoader resourceLoader;

hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/validator/TenantConfigurationPollingDurationValidator.java

@@ -39,6 +39,8 @@ public class TenantConfigurationPollingDurationValidator implements TenantConfig
     }
 
     @Override
+    // Exception squid:S1166 - Hide origin exception
+    @SuppressWarnings({ "squid:S1166" })
     public void validate(final Object tenantConfigurationObject) {
         TenantConfigurationValidator.super.validate(tenantConfigurationObject);
         final String tenantConfigurationString = (String) tenantConfigurationObject;