Merge remote-tracking branch 'origin/master' into split_command_route…

…r_modules

adapter-base/src/test/java/org/eclipse/hono/adapter/auth/device/x509/OCSPIntegrationTest.java

@@ -33,14 +33,14 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.output.Slf4jLogConsumer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testcontainers.images.builder.ImageFromDockerfile;
-import org.testcontainers.junit.jupiter.Testcontainers;
 
 import io.vertx.core.Vertx;
 import io.vertx.core.net.SelfSignedCertificate;
@@ -52,7 +52,7 @@
  * tested against running instance of OCSP responder which is set up using openssl tool running in Testcontainers.
  *
  */
-@Testcontainers
+@DisabledIfSystemProperty(named = "hono.skipDockerTests", matches = "true")
 @ExtendWith(VertxExtension.class)
 class OCSPIntegrationTest {
     private static final Logger LOG = LoggerFactory.getLogger(OCSPIntegrationTest.class);
@@ -75,7 +75,7 @@ class OCSPIntegrationTest {
     /**
      * Load certificates from file system and initialize OCSP responder container.
      */
-    @SuppressWarnings({"rawtypes", "unchecked"})
+    @SuppressWarnings({"rawtypes", "unchecked", "resource"})
     @BeforeAll
     static void setUpAll() {
         validCertificate = loadCertificate("target/certs/device-4711-cert.pem");

pom.xml

@@ -297,6 +297,7 @@
             <systemPropertyVariables>
               <!-- use Base64 encoder/decoder that is compatible with vert.x 3 -->
               <vertx.json.base64>legacy</vertx.json.base64>
+              <hono.skipDockerTests>${skipDockerTests}</hono.skipDockerTests>
             </systemPropertyVariables>
             <properties>
               <configurationParameters>