2.3.6

.github/ISSUE_TEMPLATE/0_bug_report.yml

@@ -1,7 +1,7 @@
 name: Bug report
 description: Create a report to help us improve
 labels: ["type: 🐛 bug"]
-type: 'Bug'
+type: Bug
 assignees:
   - Rakambda
 body:

.github/ISSUE_TEMPLATE/1_feature_request.yml

@@ -1,14 +1,14 @@
 name: Feature request
 description: Suggest an idea for this project
 labels: ["type: 🧱 enhancement"]
-type: 'Enhancement'
+type: Enhancement
 assignees:
   - Rakambda
 body:
   - type: textarea
     id: describing
     attributes:
       label: Description
-      description: Describe the feature/enhacement you wish to have
+      description: Describe the feature/enhancement you wish to have
     validations:
       required: true

.github/dependabot.yml

@@ -5,29 +5,37 @@ updates:
     assignees:
       - Rakambda
     schedule:
-      interval: daily
-      time: '05:00'
+      interval: cron
+      cronjob: 0 7 * * *
       timezone: Europe/Paris
     pull-request-branch-name:
       separator: '-'
+    groups:
+      docker:
+        patterns:
+          - docker/*
   - package-ecosystem: gradle
     directory: /
     assignees:
       - Rakambda
     schedule:
-      interval: daily
-      time: '05:00'
+      interval: cron
+      cronjob: 0 7 * * *
       timezone: Europe/Paris
     pull-request-branch-name:
       separator: '-'
     groups:
       log4j:
         patterns:
-          - org.apache.logging.log4j:log4j-core
-          - org.apache.logging.log4j:log4j-slf4j2-impl
+          - org.apache.logging.log4j:*
       google-apis:
         patterns:
           - com.google.api-client:google-api-client
+          - com.google.apis:*
           - com.google.oauth-client:google-oauth-client-jetty
-          - com.google.apis:google-api-services-gmail
-          - com.google.apis:google-api-services-calendar
+      exposed:
+        patterns:
+          - org.jetbrains.exposed:*
+      lets-plot:
+        patterns:
+          - org.jetbrains.lets-plot:*

.github/workflows/build-test-deploy.yml

@@ -27,7 +27,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@v4.3.0
+        uses: gradle/actions/dependency-submission@v4.4.1
         continue-on-error: true
 
   build:
@@ -45,7 +45,7 @@ jobs:
           java-version: ${{ vars.JAVA_VERSION }}
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.3.0
+        uses: gradle/actions/setup-gradle@v4.4.1
       - name: Build project
         run: |
           ./gradlew \
@@ -86,7 +86,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.3.0
+        uses: gradle/actions/setup-gradle@v4.4.1
 
       - name: Run tests
         run: |
@@ -100,12 +100,12 @@ jobs:
           ./gradlew \
           :miner:jacocoTestReport
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v5.3.0
+        uses: mikepenz/action-junit-report@v5.6.1
         if: always()
         with:
           report_paths: 'miner/build/test-results/test/*.xml'
       - name: Publish coverage on CodeCov
-        uses: codecov/codecov-action@v5.3.1
+        uses: codecov/codecov-action@v5.4.3
         if: always()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -150,7 +150,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.3.0
+        uses: gradle/actions/setup-gradle@v4.4.1
 
       - name: Run tests
         run: |
@@ -164,12 +164,12 @@ jobs:
           ./gradlew \
           :viewer:jacocoTestReport
       - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v5.3.0
+        uses: mikepenz/action-junit-report@v5.6.1
         if: always()
         with:
           report_paths: 'viewer/build/test-results/test/*.xml'
       - name: Publish coverage on CodeCov
-        uses: codecov/codecov-action@v5.3.1
+        uses: codecov/codecov-action@v5.4.3
         if: always()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -214,7 +214,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.3.0
+        uses: gradle/actions/setup-gradle@v4.4.1
 
       - name: Calculate miner image name
         id: miner-image-name
@@ -244,7 +244,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.3.0
+        uses: gradle/actions/setup-gradle@v4.4.1
 
       - name: Calculate viewer image name
         id: viewer-image-name

.github/workflows/manual-docker.yml

@@ -17,7 +17,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.3.0
+        uses: gradle/actions/setup-gradle@v4.4.1
 
       - name: Calculate miner image name
         id: miner-image-name
@@ -53,7 +53,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.3.0
+        uses: gradle/actions/setup-gradle@v4.4.1
 
       - name: Calculate viewer image name
         id: viewer-image-name

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.3.0
+        uses: gradle/actions/setup-gradle@v4.4.1
 
       - name: Push latest on Docker Hub
         run: |
@@ -42,7 +42,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.3.0
+        uses: gradle/actions/setup-gradle@v4.4.1
 
       - name: Push latest on Docker Hub
         run: |
@@ -66,14 +66,14 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.3.0
+        uses: gradle/actions/setup-gradle@v4.4.1
 
       - name: Build project
         run: |
           ./gradlew \
           assemble
       - name: Release
-        uses: softprops/action-gh-release@v2.2.1
+        uses: softprops/action-gh-release@v2.3.2
         with:
           fail_on_unmatched_files: false
           generate_release_notes: true

gradle.properties

@@ -1 +1 @@
-version=2.3.5
+version=2.3.6

gradle/libs.versions.toml

@@ -1,47 +1,48 @@
 [versions]
-slf4j-version = "2.0.16"
-log4j2-version = "2.24.3"
-unirest-version = "4.4.5"
-picocli-version = "4.7.6"
-jackson-version = "2.18.2"
-jsonschema-generator-version = "4.37.0"
+slf4j-version = "2.0.17"
+log4j2-version = "2.25.0"
+unirest-version = "4.4.7"
+picocli-version = "4.7.7"
+jackson-version = "2.19.1"
+jsonschema-generator-version = "4.38.0"
 httpclient-version = "4.5.14"
 lang3-version = "3.17.0"
-commons-text-version = "1.13.0"
+commons-text-version = "1.13.1"
 jetbrains-annotations-version = "26.0.2"
 websocket-version = "1.6.0"
-junitVersion = "5.11.4"
+junitVersion = "5.13.1"
 assertj-core-version = "3.27.3"
 assertj-db-version = "3.0.0"
-mockito-version = "5.15.2"
-awaitility-version = "4.2.2"
-json-unit-version = "4.1.0"
+mockito-version = "5.18.0"
+awaitility-version = "4.3.0"
+json-unit-version = "4.1.1"
 kitteh-irc-version = "9.0.0"
-hikari-cp-version = "6.2.1"
-mariadb-version = "3.5.2"
-sqlite-version = "3.49.1.0"
-mysql-version = "9.2.0"
+hikari-cp-version = "6.3.0"
+mariadb-version = "3.5.3"
+sqlite-version = "3.50.1.0"
+mysql-version = "9.3.0"
 rerunner-jupiter-version = "2.1.6"
-flyway-version = "11.3.3"
-selenide-version = "7.7.2"
-lombok-version = "1.18.36"
+flyway-version = "11.9.2"
+selenide-version = "7.9.3"
+lombok-version = "1.18.38"
 jacocoVersion = "0.8.12"
+log4j-ecs-version = "1.7.0"
 
 shadow-version = "8.1.1"
 names-version = "0.52.0"
-jib-version = "3.4.4"
-git-properties-version = "2.4.2"
-springboot-version = "3.4.2"
+jib-version = "3.4.5"
+git-properties-version = "2.5.0"
+springboot-version = "3.5.3"
 springboot-dependencies-version = "1.1.7"
 test-logger-version = "4.0.0"
-git-version-plugin-version = "3.1.0"
+git-version-plugin-version = "3.3.0"
 
 [libraries]
 slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j-version" }
 log4j2Bom = { group = "org.apache.logging.log4j", name = "log4j-bom", version.ref = "log4j2-version"}
 log4j2-core = { group = "org.apache.logging.log4j", name = "log4j-core" }
 log4j2-slf4j = { group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl" }
-log4j2-json = { group = "org.apache.logging.log4j", name = "log4j-layout-template-json" }
+log4jEcs = { group = "co.elastic.logging", name = "log4j2-ecs-layout", version.ref = "log4j-ecs-version" }
 unirestBom = { group = "com.konghq", name = "unirest-java-bom", version.ref = "unirest-version" }
 unirest-java = { group = "com.konghq", name = "unirest-java-core" }
 unirest-modules-jackson = { group = "com.konghq", name = "unirest-modules-jackson" }
@@ -70,9 +71,11 @@ selenide = { group = "com.codeborne", name = "selenide", version.ref = "selenide
 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" }
-junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junitVersion" }
-junitEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junitVersion" }
+junitBom = { group = "org.junit", name = "junit-bom", version.ref = "junitVersion"}
+junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api" }
+junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params" }
+junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine" }
+junitPlatformLauncher = { group = "org.junit.platform", name = "junit-platform-launcher" }
 assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj-core-version" }
 assertj-db = { group = "org.assertj", name = "assertj-db", version.ref = "assertj-db-version" }
 mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito-version" }
@@ -84,12 +87,12 @@ rerunnerJupiter = { group = "io.github.artsok", name = "rerunner-jupiter", versi
 
 [bundles]
 jackson = ["jackson-core", "jackson-annotations", "jackson-databind", "jackson-jsr310"]
-log4j2 = ["log4j2-core", "log4j2-slf4j", "log4j2-json"]
+log4j2 = ["log4j2-core", "log4j2-slf4j"]
 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"]
+junit = ["junit-api", "junit-params", "junit-engine"]
 mockito = ["mockito-core", "mockito-junit"]
 jsonUnit = ["json-unit", "json-unit-assertj"]
 assertj = ["assertj-core", "assertj-db"]

miner/build.gradle.kts

@@ -16,6 +16,7 @@ dependencies {
 
     implementation(libs.slf4j)
     implementation(libs.bundles.log4j2)
+    implementation(libs.log4jEcs)
 
     implementation(libs.bundles.unirest)
     implementation(libs.picocli)
@@ -38,8 +39,9 @@ dependencies {
 
     annotationProcessor(libs.lombok)
 
+    implementation(platform(libs.junitBom))
     testImplementation(libs.bundles.junit)
-    testRuntimeOnly(libs.junitEngine)
+    testRuntimeOnly(libs.junitPlatformLauncher)
 
     testImplementation(libs.bundles.assertj)
     testImplementation(libs.bundles.mockito)

miner/src/main/java/fr/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.v131.page.model.FrameId;
+import org.openqa.selenium.devtools.v137.page.model.FrameId;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Comparator;

miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/ws/data/message/subtype/PointGain.java

@@ -20,5 +20,5 @@ public class PointGain{
 	private int totalPoints;
 	@JsonProperty("reason_code")
 	@NotNull
-	private PointReasonCode reasonCode;
+	private String reasonCode;
 }

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.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.devtools.v137.network.Network;
+import org.openqa.selenium.devtools.v137.network.model.RequestId;
+import org.openqa.selenium.devtools.v137.network.model.RequestWillBeSent;
+import org.openqa.selenium.devtools.v137.network.model.ResponseReceived;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.firefox.FirefoxProfile;

miner/src/main/java/fr/rakambda/channelpointsminer/miner/database/DatabaseEventHandler.java

@@ -78,7 +78,7 @@ else if(predictionEvent.getStatus() == EventStatus.RESOLVED){
 	public void onPointsEarnedEvent(@NotNull PointsEarnedEvent event) throws SQLException{
 		var pointsEarnedData = event.getPointsEarnedData();
 		var reasonCode = pointsEarnedData.getPointGain().getReasonCode();
-		updateBalance(event, pointsEarnedData.getBalance(), reasonCode.name());
+		updateBalance(event, pointsEarnedData.getBalance(), reasonCode);
 	}
 
 	@Override

miner/src/main/java/fr/rakambda/channelpointsminer/miner/event/impl/PointsEarnedEvent.java

@@ -40,7 +40,7 @@ public String lookup(String key){
 			return millify(pointsEarnedData.getPointGain().getTotalPoints(), true);
 		}
 		if(EventVariableKey.REASON.equals(key)){
-			return pointsEarnedData.getPointGain().getReasonCode().toString();
+			return pointsEarnedData.getPointGain().getReasonCode();
 		}
 		if(EventVariableKey.BALANCE.equals(key)){
 			return millify(pointsEarnedData.getBalance().getBalance(), false);