Merge branch 'develop' into dependabot-gradle-org.assertj-assertj-db-…

…3.0.0
RakambdaOrg · Dec 16, 2024 · 8c911d9 · 8c911d9
2 parents b04638b + 37025db
commit 8c911d9
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 31 deletions.
diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
@@ -100,12 +100,12 @@ jobs:
           ./gradlew \
           :miner:jacocoTestReport
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v4
+        uses: mikepenz/action-junit-report@v5.2.0
         if: always()
         with:
           report_paths: 'miner/build/test-results/test/*.xml'
       - name: Publish coverage on CodeCov
-        uses: codecov/codecov-action@v5.0.4
+        uses: codecov/codecov-action@v5.1.1
         if: always()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -164,12 +164,12 @@ jobs:
           ./gradlew \
           :viewer:jacocoTestReport
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v4
+        uses: mikepenz/action-junit-report@v5.2.0
         if: always()
         with:
           report_paths: 'viewer/build/test-results/test/*.xml'
       - name: Publish coverage on CodeCov
-        uses: codecov/codecov-action@v5.0.4
+        uses: codecov/codecov-action@v5.1.1
         if: always()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,37 +1,37 @@
 [versions]
 slf4j-version = "2.0.16"
-log4j2-version = "2.24.1"
+log4j2-version = "2.24.3"
 unirest-version = "4.4.5"
 picocli-version = "4.7.6"
-jackson-version = "2.18.1"
+jackson-version = "2.18.2"
 jsonschema-generator-version = "4.37.0"
 httpclient-version = "4.5.14"
 lang3-version = "3.17.0"
-commons-text-version = "1.12.0"
+commons-text-version = "1.13.0"
 jetbrains-annotations-version = "26.0.1"
 websocket-version = "1.5.7"
 junitVersion = "5.11.3"
 assertj-core-version = "3.26.3"
 assertj-db-version = "3.0.0"
 mockito-version = "5.14.2"
 awaitility-version = "4.2.2"
-json-unit-version = "4.0.0"
+json-unit-version = "4.1.0"
 kitteh-irc-version = "9.0.0"
 hikari-cp-version = "6.2.1"
-mariadb-version = "3.5.0"
-sqlite-version = "3.47.0.0"
+mariadb-version = "3.5.1"
+sqlite-version = "3.47.1.0"
 mysql-version = "9.1.0"
 rerunner-jupiter-version = "2.1.6"
-flyway-version = "10.21.0"
-selenide-version = "7.5.1"
+flyway-version = "11.1.0"
+selenide-version = "7.6.1"
 lombok-version = "1.18.36"
 jacocoVersion = "0.8.12"
 
 shadow-version = "8.1.1"
 names-version = "0.51.0"
 jib-version = "3.4.4"
 git-properties-version = "2.4.2"
-springboot-version = "3.3.5"
+springboot-version = "3.4.0"
 springboot-dependencies-version = "1.1.6"
 test-logger-version = "4.0.0"
 git-version-plugin-version = "3.1.0"
@@ -67,6 +67,7 @@ mysql = { group = "com.mysql", name = "mysql-connector-j", version.ref = "mysql-
 flyway-core = { group = "org.flywaydb", name = "flyway-core", version.ref = "flyway-version" }
 flyway-mysql = { group = "org.flywaydb", name = "flyway-mysql", version.ref = "flyway-version" }
 selenide = { group = "com.codeborne", name = "selenide", version.ref = "selenide-version" }
+selenide-proxy = { group = "com.codeborne", name = "selenide-proxy", version.ref = "selenide-version" }
 lombok = { group = "org.projectlombok", name = "lombok", version.ref = "lombok-version" }
 
 junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junitVersion" }
@@ -86,6 +87,7 @@ jackson = ["jackson-core", "jackson-annotations", "jackson-databind", "jackson-j
 log4j2 = ["log4j2-core", "log4j2-slf4j", "log4j2-json"]
 unirest = ["unirest-java", "unirest-modules-jackson"]
 flyway = ["flyway-core", "flyway-mysql"]
+selenide = ["selenide", "selenide-proxy"]
 jsonschemaGenerator = ["jsonschema-generator", "jsonschema-module-jackson"]
 junit = ["junit-api", "junit-params"]
 mockito = ["mockito-core", "mockito-junit"]

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/miner/build.gradle.kts b/miner/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
     implementation(libs.commonsText)
     implementation(libs.websocket)
     implementation(libs.kittehIrc)
-    implementation(libs.selenide)
+    implementation(libs.bundles.selenide)
 
     implementation(libs.hikaricp)
     implementation(libs.mariadb)

diff --git a/...rakambda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProvider.java b/...rakambda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProvider.java
@@ -16,7 +16,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.jetbrains.annotations.NotNull;
-import org.openqa.selenium.devtools.v128.page.model.FrameId;
+import org.openqa.selenium.devtools.v131.page.model.FrameId;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Comparator;

diff --git a/miner/src/main/java/fr/rakambda/channelpointsminer/miner/browser/Browser.java b/miner/src/main/java/fr/rakambda/channelpointsminer/miner/browser/Browser.java
@@ -16,10 +16,10 @@
 import org.openqa.selenium.devtools.Command;
 import org.openqa.selenium.devtools.DevTools;
 import org.openqa.selenium.devtools.HasDevTools;
-import org.openqa.selenium.devtools.v128.network.Network;
-import org.openqa.selenium.devtools.v128.network.model.RequestId;
-import org.openqa.selenium.devtools.v128.network.model.RequestWillBeSent;
-import org.openqa.selenium.devtools.v128.network.model.ResponseReceived;
+import org.openqa.selenium.devtools.v131.network.Network;
+import org.openqa.selenium.devtools.v131.network.model.RequestId;
+import org.openqa.selenium.devtools.v131.network.model.RequestWillBeSent;
+import org.openqa.selenium.devtools.v131.network.model.ResponseReceived;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.firefox.FirefoxProfile;
@@ -112,7 +112,6 @@ private SelenideConfig setupSelenideConfig(@NotNull SelenideConfig config){
 		config.savePageSource(false);
 		config.screenshots(browserConfiguration.isScreenshots());
 		config.headless(browserConfiguration.isHeadless());
-		config.holdBrowserOpen(false);
 		return config;
 	}
 

diff --git a/miner/src/main/java/fr/rakambda/channelpointsminer/miner/util/CommonUtils.java b/miner/src/main/java/fr/rakambda/channelpointsminer/miner/util/CommonUtils.java
@@ -41,11 +41,11 @@ public static String getUserInput(@NotNull String message){
 
 	@NotNull
 	public static String randomHex(int count) {
-		return RandomStringUtils.random(count, HEX_CHARS);
+		return RandomStringUtils.secure().next(count, HEX_CHARS);
 	}
 
 	@NotNull
 	public static String randomAlphanumeric(int count) {
-		return RandomStringUtils.randomAlphanumeric(count);
+		return RandomStringUtils.secure().nextAlphanumeric(count);
 	}
 }
diff --git a/...mbda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProviderTest.java b/...mbda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProviderTest.java
@@ -14,14 +14,14 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.openqa.selenium.devtools.v128.network.model.Headers;
-import org.openqa.selenium.devtools.v128.network.model.MonotonicTime;
-import org.openqa.selenium.devtools.v128.network.model.Request;
-import org.openqa.selenium.devtools.v128.network.model.RequestId;
-import org.openqa.selenium.devtools.v128.network.model.RequestWillBeSent;
-import org.openqa.selenium.devtools.v128.network.model.Response;
-import org.openqa.selenium.devtools.v128.network.model.ResponseReceived;
-import org.openqa.selenium.devtools.v128.page.model.FrameId;
+import org.openqa.selenium.devtools.v131.network.model.Headers;
+import org.openqa.selenium.devtools.v131.network.model.MonotonicTime;
+import org.openqa.selenium.devtools.v131.network.model.Request;
+import org.openqa.selenium.devtools.v131.network.model.RequestId;
+import org.openqa.selenium.devtools.v131.network.model.RequestWillBeSent;
+import org.openqa.selenium.devtools.v131.network.model.Response;
+import org.openqa.selenium.devtools.v131.network.model.ResponseReceived;
+import org.openqa.selenium.devtools.v131.page.model.FrameId;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;