Skip to content

Commit d7b70ba

Browse files
Merge pull request #85 from telekom/feature/transitive-dependency-update
Removed some transitive dependencies
2 parents 30a4e9e + 0f97d4a commit d7b70ba

File tree

7 files changed

+26
-18
lines changed

7 files changed

+26
-18
lines changed

core-interop/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ dependencies {
22

33
api('org.testng:testng:7.4.0')
44
// {
5-
// Update TestNG 7.4.0: This is not needed anymore because TestNG extremly reduced transitive dependencies.
5+
// Update TestNG 7.4.0: This is not needed anymore because TestNG extremely reduced transitive dependencies.
66
//
77
// We have to exclude this here, because testng is using 25.1-android in dependency com.google.inject:guice:4.1.0
88
// This will lead to a version clash with selenium and this will produce ImmutableMapErrors on WebDriverManager.getWebDriver
99
// exclude group: 'com.google.guava', module: 'guava'
1010
// }
1111

1212
api 'commons-io:commons-io:2.6'
13+
// StringUtils needs api dep
1314
api 'org.apache.commons:commons-lang3:3.9'
1415

1516
// <TesterraLogger>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@
2929

3030
/**
3131
* Sammlung von StringUtils.
32+
*
33+
* @deprecated This class is mainly used for Legacy Report. Please use {@link org.apache.commons.lang3.StringUtils} instead.
3234
*/
35+
@Deprecated
3336
public final class StringUtils extends org.apache.commons.lang3.StringUtils {
3437

3538
/**

core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies {
99
// </PdfUtils>
1010

1111
// <RESTUtils>
12-
api 'com.sun.jersey:jersey-client:1.19.3'
12+
implementation 'com.sun.jersey:jersey-client:1.19.3'
1313
// </RESTUtils
1414

1515
api "com.google.guava:guava:${guavaVersion}"

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,24 @@
2828
import eu.tsystems.mms.tic.testframework.internal.Constants;
2929
import eu.tsystems.mms.tic.testframework.internal.Flags;
3030
import eu.tsystems.mms.tic.testframework.internal.Viewport;
31+
import eu.tsystems.mms.tic.testframework.report.Report;
3132
import eu.tsystems.mms.tic.testframework.report.TesterraListener;
3233
import eu.tsystems.mms.tic.testframework.report.model.context.MethodContext;
3334
import eu.tsystems.mms.tic.testframework.report.model.context.Screenshot;
34-
import eu.tsystems.mms.tic.testframework.report.Report;
3535
import eu.tsystems.mms.tic.testframework.report.model.context.SessionContext;
3636
import eu.tsystems.mms.tic.testframework.report.utils.ExecutionContextController;
37-
import eu.tsystems.mms.tic.testframework.webdrivermanager.AbstractWebDriverConfiguration;
3837
import eu.tsystems.mms.tic.testframework.webdrivermanager.WebDriverRequest;
3938
import eu.tsystems.mms.tic.testframework.webdrivermanager.WebDriverSessionsManager;
39+
import org.openqa.selenium.OutputType;
40+
import org.openqa.selenium.TakesScreenshot;
41+
import org.openqa.selenium.WebDriver;
42+
import org.openqa.selenium.support.events.EventFiringWebDriver;
43+
import org.sikuli.api.ScreenLocation;
44+
import org.sikuli.api.ScreenRegion;
45+
import org.slf4j.Logger;
46+
import org.slf4j.LoggerFactory;
47+
48+
import javax.imageio.ImageIO;
4049
import java.awt.image.BufferedImage;
4150
import java.io.File;
4251
import java.io.FileNotFoundException;
@@ -53,15 +62,6 @@
5362
import java.util.Properties;
5463
import java.util.Set;
5564
import java.util.stream.Stream;
56-
import javax.imageio.ImageIO;
57-
import org.openqa.selenium.OutputType;
58-
import org.openqa.selenium.TakesScreenshot;
59-
import org.openqa.selenium.WebDriver;
60-
import org.openqa.selenium.support.events.EventFiringWebDriver;
61-
import org.sikuli.api.ScreenLocation;
62-
import org.sikuli.api.ScreenRegion;
63-
import org.slf4j.Logger;
64-
import org.slf4j.LoggerFactory;
6565

6666
/**
6767
* Helper class containing some util methods for tt.
@@ -223,7 +223,7 @@ private static void makeSimpleScreenshot(WebDriver driver, File screenShotTarget
223223
/**
224224
* Utility to store a Screenshot at the specified location.
225225
*
226-
* @param image BufferedImage
226+
* @param image BufferedImage
227227
* @param targetFile filePath with fileName
228228
*/
229229
private static void saveBufferedImage(BufferedImage image, File targetFile) {
@@ -240,7 +240,7 @@ private static void saveBufferedImage(BufferedImage image, File targetFile) {
240240
/**
241241
* Save page source to file.
242242
*
243-
* @param pageSource page source.
243+
* @param pageSource page source.
244244
* @param sourceTargetFile target file.
245245
*/
246246
private static void savePageSource(final String pageSource, final File sourceTargetFile) {

image-processing/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def opencv = [
88
]
99

1010
dependencies {
11-
api core
11+
implementation core
1212
implementation opencv
1313

1414
// <core>

report-model/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ apply plugin: 'com.google.protobuf'
1111
def protobufVersion = '3.14.0'
1212

1313
dependencies {
14-
api core
15-
api "com.google.protobuf:protobuf-java:$protobufVersion"
14+
implementation core
15+
implementation "com.google.protobuf:protobuf-java:$protobufVersion"
1616
// <GenerateReportModelListener>
1717
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
1818
// <GenerateReportModelListener>

report-ng/build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@ plugins {
22
id 'java'
33
}
44

5+
def protobufVersion = '3.14.0'
6+
57
dependencies {
8+
implementation core
69
implementation project(':report-model')
10+
implementation "com.google.protobuf:protobuf-java:$protobufVersion"
711
}
812

913
task destClean {

0 commit comments

Comments
 (0)