updated tls-scanner to comply with newest jcommander version

Author: ic0ns

TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/config/ScannerConfig.java

@@ -34,8 +34,6 @@ public class ScannerConfig extends TLSDelegateConfig {
     @Parameter(names = "-noColor", required = false, description = "If you use Windows or don't want colored text.")
     private boolean noColor = false;
 
-    @ParametersDelegate
-    private GeneralDelegate generalDelegate;
 
     @Parameter(names = "-scanDetail", required = false, description = "How detailed do you want to scan?")
     private ScannerDetail scanDetail = ScannerDetail.NORMAL;
@@ -57,24 +55,20 @@ public class ScannerConfig extends TLSDelegateConfig {
 
     public ScannerConfig(GeneralDelegate delegate) {
         super(delegate);
-        this.generalDelegate = delegate;
-        clientDelegate = new ClientDelegate();
-        starttlsDelegate = new StarttlsDelegate();
-        ccaDelegate = new CcaDelegate();
+        this.clientDelegate = new ClientDelegate();
+        this.starttlsDelegate = new StarttlsDelegate();
+        this.ccaDelegate = new CcaDelegate();
         addDelegate(clientDelegate);
-        addDelegate(generalDelegate);
         addDelegate(starttlsDelegate);
         addDelegate(ccaDelegate);
     }
 
     public ScannerConfig(GeneralDelegate delegate, ClientDelegate clientDelegate) {
         super(delegate);
-        this.generalDelegate = delegate;
         this.clientDelegate = clientDelegate;
-        starttlsDelegate = new StarttlsDelegate();
-        ccaDelegate = new CcaDelegate();
+        this.starttlsDelegate = new StarttlsDelegate();
+        this.ccaDelegate = new CcaDelegate();
         addDelegate(clientDelegate);
-        addDelegate(generalDelegate);
         addDelegate(starttlsDelegate);
         addDelegate(ccaDelegate);
     }

TLS-Server-Scanner/src/main/java/de/rub/nds/tlsscanner/serverscanner/rating/RatingIO.java

@@ -39,8 +39,8 @@ public static void writeRecommendations(Recommendations r, OutputStream os) {
         JAXB.marshal(r, tempStream);
         try {
             os.write(XMLPrettyPrinter.prettyPrintXML(new String(tempStream.toByteArray())).getBytes());
-        } catch (IOException | TransformerException | XPathExpressionException | XPathFactoryConfigurationException
-                | ParserConfigurationException | SAXException ex) {
+        } catch (IOException | TransformerException | XPathExpressionException | ParserConfigurationException
+                | SAXException ex) {
             throw new RuntimeException("Could not format XML");
         }
     }
@@ -67,8 +67,8 @@ public static void writeRatingInfluencers(RatingInfluencers ri, OutputStream os)
         JAXB.marshal(ri, tempStream);
         try {
             os.write(XMLPrettyPrinter.prettyPrintXML(new String(tempStream.toByteArray())).getBytes());
-        } catch (IOException | TransformerException | XPathExpressionException | XPathFactoryConfigurationException
-                | ParserConfigurationException | SAXException ex) {
+        } catch (IOException | TransformerException | XPathExpressionException | ParserConfigurationException
+                | SAXException ex) {
             throw new RuntimeException("Could not format XML");
         }
     }

pom.xml

@@ -155,7 +155,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.20.1</version>
+                <version>3.0.0-M5</version>
                 <configuration>
                     <!-- By default, the Failsafe plugin excludes various files. We have to override that. -->
                     <includes>
@@ -176,10 +176,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
+                <version>3.0.0-M5</version>
                 <configuration>
                     <argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.surefire</groupId>
+                        <artifactId>surefire-junit47</artifactId>
+                        <version>3.0.0-M5</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <!-- Format the Code -->
             <plugin>