Merge pull request #414 from tls-attacker/bumpBomVersion

Set new BOM version

Author: mmaehren

TLS-Client-Scanner/pom.xml

@@ -27,6 +27,10 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>tls-scanner-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.reflections</groupId>
+            <artifactId>reflections</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

TLS-Client-Scanner/src/main/resources/log4j2.xml

@@ -2,13 +2,13 @@
 <Configuration status="WARN">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%highlight{%-5level: %c{1} - %msg%n%throwable}"/>
+            <ExtendedPatternLayout pattern="%highlight{%-5level: %c{1} - %msg%n%throwable}"/>
         </Console>
         <Console name="Info" target="SYSTEM_OUT">
-            <PatternLayout pattern="%highlight{%-5level: %c{1}} - %msg%n%highlight{%throwable}"/>
+            <ExtendedPatternLayout pattern="%highlight{%-5level: %c{1}} - %msg%n%highlight{%throwable}"/>
         </Console>
         <Console name="Direct" target="SYSTEM_OUT">
-            <PatternLayout pattern="%highlight{%msg}%n"/>
+            <ExtendedPatternLayout pattern="%highlight{%msg}%n"/>
         </Console>
     </Appenders>
     <Loggers>

TLS-Server-Scanner/src/main/resources/log4j2.xml

@@ -2,13 +2,13 @@
 <Configuration status="WARN">
     <Appenders>
         <Console name="Console" target="SYSTEM_OUT">
-            <PatternLayout pattern="%highlight{%-5level: %c{1} - %msg%n%throwable}"/>
+            <ExtendedPatternLayout pattern="%highlight{%-5level: %c{1} - %msg%n%throwable}"/>
         </Console>
         <Console name="Info" target="SYSTEM_OUT">
-            <PatternLayout pattern="%highlight{%-5level: %c{1}} - %msg%n%highlight{%throwable}"/>
+            <ExtendedPatternLayout pattern="%highlight{%-5level: %c{1}} - %msg%n%highlight{%throwable}"/>
         </Console>
         <Console name="Direct" target="SYSTEM_OUT">
-            <PatternLayout pattern="%highlight{%msg}%n"/>
+            <ExtendedPatternLayout pattern="%highlight{%msg}%n"/>
         </Console>
     </Appenders>
     <Loggers>

TLS-Server-Scanner/src/test/java/de/rub/nds/tlsscanner/serverscanner/test/AbstractDockerbasedIT.java

@@ -16,6 +16,7 @@
 import de.rub.nds.tls.subject.docker.DockerClientManager;
 import de.rub.nds.tls.subject.docker.DockerTlsManagerFactory;
 import de.rub.nds.tls.subject.docker.DockerTlsServerInstance;
+import de.rub.nds.tls.subject.docker.build.DockerBuilder;
 import java.security.Security;
 import java.util.List;
 import java.util.UUID;
@@ -71,7 +72,11 @@ public void setUp() throws InterruptedException {
     protected void prepareContainer() throws DockerException, InterruptedException {
         Image image =
                 DockerTlsManagerFactory.getMatchingImage(
-                        localImages, implementation, version, ConnectionRole.SERVER);
+                        localImages,
+                        implementation,
+                        version,
+                        DockerBuilder.NO_ADDITIONAL_BUILDFLAGS,
+                        ConnectionRole.SERVER);
         Assertions.assertNotNull(
                 image,
                 String.format(

pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.rub.nds</groupId>
         <artifactId>protocol-toolkit-bom</artifactId>
-        <version>4.0.5</version>
+        <version>4.1.2</version>
     </parent>
 
     <groupId>de.rub.nds.tls.scanner</groupId>