diff --git a/pom.xml b/pom.xml index bdd0205..a54815e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ au.gov.qld.online seleniumHelper - 4.8.1.002-SNAPSHOT + 4.9.1.002-SNAPSHOT https://github.com/qld-gov-au/seleniumHelper @@ -43,7 +43,7 @@ 8.1.2 4.1.87.Final - 31.1-jre + 32.0.0-jre ${project.basedir}/src/qa 3.2.1 @@ -59,11 +59,6 @@ false false - ${project.build.directory}/coverage-reports/jacoco-ut.exec - ${project.build.directory}/surefire-reports - ${project.build.directory}/spotbugsXml.xml - ${project.build.directory}/pmd.xml - ${project.build.directory}/checkstyle-result.xml @@ -88,7 +83,7 @@ com.fasterxml.jackson.corejackson-databind2.14.2 com.fasterxml.jackson.corejackson-annotations2.14.2 - io.github.bonigarciawebdrivermanager5.3.2 + io.github.bonigarciawebdrivermanager5.3.3 org.seleniumhq.seleniumselenium-java org.slf4jslf4j-api @@ -111,7 +106,7 @@ org.slf4jslf4j-api2.0.6 - org.seleniumhq.seleniumselenium-java4.8.1 + org.seleniumhq.seleniumselenium-java4.9.1 org.seleniumhq.seleniumselenium-opera-driver org.slf4jslf4j @@ -119,7 +114,7 @@ com.google.code.findbugsjsr305 - org.seleniumhq.seleniumhtmlunit-driver4.8.3 + org.seleniumhq.seleniumhtmlunit-driver4.9.1 org.seleniumhq.seleniumselenium-api org.seleniumhq.seleniumselenium-support @@ -249,17 +244,7 @@ org.owaspdependency-check-maven ${owasp.dependency-check-maven.version} - - org.sonarsource.scanner.mavensonar-maven-plugin3.9.1.2184 - - - verify - - sonar - - - - + @@ -497,36 +482,6 @@ - - - sonar-disable-mvn-ops-missing - - !env.MAVEN_OPTS - - - true - - - - sonar-enable-no-proxy - - - !env.http_proxy - - - - false - - - - sonar-disable-no-url - - !sonar.host.url - - - true - - local-proxy @@ -544,6 +499,8 @@ PROXY + http://proxy:3128 + http://proxy:3128 @@ -552,6 +509,8 @@ PROXY + http://proxy:3128 + http://proxy:3128 diff --git a/src/qa/owasp-dependency-checker-suppressions.xml b/src/qa/owasp-dependency-checker-suppressions.xml index 6891acd..2ccf820 100644 --- a/src/qa/owasp-dependency-checker-suppressions.xml +++ b/src/qa/owasp-dependency-checker-suppressions.xml @@ -8,6 +8,7 @@ ]]> ^pkg:maven/com\.google\.guava/guava@.*$ CVE-2020-8908 + CVE-2023-2976 wait = new FluentWait<>(holder.getWebDriver()).withTimeout(Duration.ofSeconds(10L)).pollingEvery(Duration.ofMillis(100)); File downloadedFile = new File(downloadFilepath + filename); wait.until(x -> downloadedFile.exists()); @@ -236,12 +236,12 @@ public void shouldSetDownloadDirectoryForSafariBrowser() throws IOException, Int Path tempDownloadDirectory = Files.createTempDirectory("tempDownloads"); tempDownloadDirectory.toFile().deleteOnExit(); String downloadFilepath = tempDownloadDirectory.toFile().getAbsolutePath() + "/"; - String filename = "ict-dashboard-dcyjma-dataset.csv"; + String filename = "testfile.xlsx"; // Not sure how safari has settings set up, so try download instead try { holder = SeleniumHelper.getWebDriver(DriverTypes.SAFARI, downloadFilepath); - // Download a test CSV from dev.data.qld.gov.au: "ict-dashboard-dcyjma-dataset.csv" - holder.getWebDriver().navigate().to("https://dev.data.qld.gov.au/dataset/0aa564f0-32be-4aff-89af-565882fd4982/resource/0f623a2a-1ef3-4f7e-8a4c-45a4de31cef7/download/ict-dashboard-dcyjma-dataset.csv"); + // Download a test file from staging.data.qld.gov.au: "testfile.xlsx" + holder.getWebDriver().navigate().to("https://staging.data.qld.gov.au/dataset/534a6213-bc2e-4b79-a8da-95438adf47f9/resource/c5098e4c-994d-48d7-a12b-c69c876897cc/download/testfile.xlsx"); TimeUnit.SECONDS.sleep(3); File downloadedFile = new File(downloadFilepath + filename); Assertions.assertThat(downloadedFile).exists();