Merge branch 'master' into testerra2

# Conflicts:
#	core-interop/build.gradle
#	driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/utils/UITestUtils.java
#	image-processing/build.gradle

Author: Mike Reiche

core/build.gradle

@@ -19,7 +19,7 @@ dependencies {
     // </PdfUtils>
 
     // <RESTUtils>
-    api 'com.sun.jersey:jersey-client:1.19.3'
+    implementation 'com.sun.jersey:jersey-client:1.19.3'
     // </RESTUtils
 
     api "com.google.guava:guava:${guavaVersion}"

core/src/main/java/eu/tsystems/mms/tic/testframework/utils/StringUtils.java

@@ -29,7 +29,10 @@
 
 /**
  * Sammlung von StringUtils.
+ *
+ * @deprecated This class is mainly used for Legacy Report. Please use {@link org.apache.commons.lang3.StringUtils} instead.
  */
+@Deprecated
 public final class StringUtils extends org.apache.commons.lang3.StringUtils {
 
     /**

driver-ui/src/main/java/eu/tsystems/mms/tic/testframework/utils/UITestUtils.java

@@ -29,9 +29,25 @@
 import eu.tsystems.mms.tic.testframework.internal.Viewport;
 import eu.tsystems.mms.tic.testframework.report.Report;
 import eu.tsystems.mms.tic.testframework.report.model.context.Screenshot;
+import eu.tsystems.mms.tic.testframework.report.Report;
+import eu.tsystems.mms.tic.testframework.report.TesterraListener;
+import eu.tsystems.mms.tic.testframework.report.model.context.MethodContext;
+import eu.tsystems.mms.tic.testframework.report.model.context.Screenshot;
 import eu.tsystems.mms.tic.testframework.report.model.context.SessionContext;
 import eu.tsystems.mms.tic.testframework.report.utils.ExecutionContextController;
 import eu.tsystems.mms.tic.testframework.testing.WebDriverManagerProvider;
+import eu.tsystems.mms.tic.testframework.webdrivermanager.WebDriverRequest;
+import eu.tsystems.mms.tic.testframework.webdrivermanager.WebDriverSessionsManager;
+import org.openqa.selenium.OutputType;
+import org.openqa.selenium.TakesScreenshot;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.events.EventFiringWebDriver;
+import org.sikuli.api.ScreenLocation;
+import org.sikuli.api.ScreenRegion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -56,6 +72,7 @@
 import org.sikuli.api.ScreenRegion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import java.util.stream.Stream;
 
 /**
  * Helper class containing some util methods for tt.
@@ -194,7 +211,7 @@ private static void makeSimpleScreenshot(WebDriver driver, File screenShotTarget
     /**
      * Utility to store a Screenshot at the specified location.
      *
-     * @param image      BufferedImage
+     * @param image BufferedImage
      * @param targetFile filePath with fileName
      */
     private static void saveBufferedImage(BufferedImage image, File targetFile) {
@@ -211,7 +228,7 @@ private static void saveBufferedImage(BufferedImage image, File targetFile) {
     /**
      * Save page source to file.
      *
-     * @param pageSource       page source.
+     * @param pageSource page source.
      * @param sourceTargetFile target file.
      */
     private static void savePageSource(final String pageSource, final File sourceTargetFile) {

report-model/build.gradle

@@ -11,8 +11,8 @@ apply plugin: 'com.google.protobuf'
 def protobufVersion = '3.14.0'
 
 dependencies {
-    api core
-    api "com.google.protobuf:protobuf-java:$protobufVersion"
+    implementation core
+    implementation "com.google.protobuf:protobuf-java:$protobufVersion"
     // <GenerateReportModelListener>
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
     // <GenerateReportModelListener>

report-ng/build.gradle

@@ -2,8 +2,12 @@ plugins {
     id 'java'
 }
 
+def protobufVersion = '3.14.0'
+
 dependencies {
+    implementation core
     implementation project(':report-model')
+    implementation "com.google.protobuf:protobuf-java:$protobufVersion"
 }
 
 task destClean {