diff --git a/taf-base-junit4-extensions/pom.xml b/taf-base-junit4-extensions/pom.xml index d4d2a4e..ad81543 100644 --- a/taf-base-junit4-extensions/pom.xml +++ b/taf-base-junit4-extensions/pom.xml @@ -25,7 +25,7 @@ junit junit - 4.13.1 + 4.13.2 com.baloise.testing.framework @@ -35,7 +35,7 @@ org.slf4j slf4j-log4j12 - 1.7.26 + 2.0.7 test diff --git a/taf-base-junit5-extensions/pom.xml b/taf-base-junit5-extensions/pom.xml index 02201d5..7626510 100644 --- a/taf-base-junit5-extensions/pom.xml +++ b/taf-base-junit5-extensions/pom.xml @@ -23,7 +23,7 @@ org.junit.jupiter junit-jupiter - 5.7.2 + 5.9.3 compile @@ -34,7 +34,7 @@ org.slf4j slf4j-log4j12 - 1.7.26 + 2.0.7 test diff --git a/taf-base/pom.xml b/taf-base/pom.xml index 5a38def..91e5bfb 100644 --- a/taf-base/pom.xml +++ b/taf-base/pom.xml @@ -11,7 +11,7 @@ Test Automation Framework - Base - 4.1.1 + 5.2.3 @@ -33,13 +33,13 @@ junit junit - 4.13.1 + 4.13.2 test org.apache.commons commons-csv - 1.6 + 1.10.0 org.apache.poi @@ -59,18 +59,18 @@ org.slf4j slf4j-api - 1.7.26 + 2.0.7 org.slf4j slf4j-log4j12 - 1.7.26 + 1.7.33 test com.fasterxml.jackson.core jackson-databind - 2.14.0 + 2.15.2 diff --git a/taf-base/src/main/java/com/baloise/testautomation/taf/base/excel/ExcelDataImporter.java b/taf-base/src/main/java/com/baloise/testautomation/taf/base/excel/ExcelDataImporter.java index 2a533ba..76fe16d 100644 --- a/taf-base/src/main/java/com/baloise/testautomation/taf/base/excel/ExcelDataImporter.java +++ b/taf-base/src/main/java/com/baloise/testautomation/taf/base/excel/ExcelDataImporter.java @@ -76,7 +76,7 @@ private IType get(Cell cell) { if (cell == null) { return TafString.nullString(); } - if (cell.getCellTypeEnum() == CellType.FORMULA) { + if (cell.getCellType() == CellType.FORMULA) { FormulaEvaluator evaluator = workBook.getCreationHelper().createFormulaEvaluator(); try { evaluator.evaluateInCell(cell); @@ -85,23 +85,23 @@ private IType get(Cell cell) { TafAssert.fail("Problems evaluation cell: " + cell.getCellFormula() + " -> " + e.getMessage()); } } - if (cell.getCellTypeEnum() == CellType.BLANK) { + if (cell.getCellType() == CellType.BLANK) { return TafString.emptyString(); } - if (cell.getCellTypeEnum() == CellType.BOOLEAN) { + if (cell.getCellType() == CellType.BOOLEAN) { return new TafBoolean(cell.getBooleanCellValue()); } - if (cell.getCellTypeEnum() == CellType.NUMERIC) { + if (cell.getCellType() == CellType.NUMERIC) { if (DateUtil.isCellDateFormatted(cell)) { return TafDate.normalDate(cell.getDateCellValue()); } double value = cell.getNumericCellValue(); if ((value == Math.floor(value)) && !Double.isInfinite(value)) { - return new TafInteger(new Double(value).intValue()); + return new TafInteger(Double.valueOf(value).intValue()); } return new TafDouble(cell.getNumericCellValue()); } - if (cell.getCellTypeEnum() == CellType.STRING) { + if (cell.getCellType() == CellType.STRING) { String s = cell.getStringCellValue(); if (TafBoolean.TRUE.equalsIgnoreCase(s)) { return TafBoolean.trueBoolean(); diff --git a/taf-browser-junit4-extensions/pom.xml b/taf-browser-junit4-extensions/pom.xml index 5696f4f..cebfe05 100644 --- a/taf-browser-junit4-extensions/pom.xml +++ b/taf-browser-junit4-extensions/pom.xml @@ -25,7 +25,7 @@ junit junit - 4.13.1 + 4.13.2 com.baloise.testing.framework @@ -35,7 +35,7 @@ org.slf4j slf4j-log4j12 - 1.7.26 + 2.0.7 test diff --git a/taf-browser/pom.xml b/taf-browser/pom.xml index e2d0fd7..9be74fb 100644 --- a/taf-browser/pom.xml +++ b/taf-browser/pom.xml @@ -52,7 +52,7 @@ org.seleniumhq.selenium selenium-java - 4.8.3 + 4.10.0 @@ -64,30 +64,30 @@ org.awaitility awaitility - 3.1.6 + 4.2.0 junit junit - 4.13.1 + 4.13.2 compile net.sourceforge.htmlunit htmlunit - 2.67.0 + 2.70.0 test org.seleniumhq.selenium htmlunit-driver - 4.7.2 + 4.10.0 test org.apache.logging.log4j log4j-slf4j-impl - 2.17.1 + 2.20.0 test diff --git a/taf-swing-base/pom.xml b/taf-swing-base/pom.xml index 7e73df7..2a6d2f1 100644 --- a/taf-swing-base/pom.xml +++ b/taf-swing-base/pom.xml @@ -28,17 +28,20 @@ com.h2database h2 1.4.187 - + + org.slf4j slf4j-api - 1.7.21 + 2.0.7 org.slf4j slf4j-log4j12 - 1.7.21 + 2.0.7 test diff --git a/taf-swing-client/pom.xml b/taf-swing-client/pom.xml index 3ac3a07..08baff2 100644 --- a/taf-swing-client/pom.xml +++ b/taf-swing-client/pom.xml @@ -32,7 +32,7 @@ junit junit - 4.13.1 + 4.13.2 test diff --git a/taf-swing-server/pom.xml b/taf-swing-server/pom.xml index 0a8fa3b..735edbc 100644 --- a/taf-swing-server/pom.xml +++ b/taf-swing-server/pom.xml @@ -42,7 +42,7 @@ org.apache.commons commons-lang3 - 3.5 + 3.12.0 org.assertj @@ -52,7 +52,7 @@ junit junit - 4.13.1 + 4.13.2 test