Skip to content

Commit 86cdc02

Browse files
Rakambdadependabot[bot]github-actions[bot]
authored
2.3.6 (#1065)
Signed-off-by: Thomas <1688389+Rakambda@users.noreply.github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent e7cd55b commit 86cdc02

21 files changed

Lines changed: 98 additions & 101 deletions

File tree

.github/ISSUE_TEMPLATE/0_bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Bug report
22
description: Create a report to help us improve
33
labels: ["type: 🐛 bug"]
4-
type: 'Bug'
4+
type: Bug
55
assignees:
66
- Rakambda
77
body:
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
name: Feature request
22
description: Suggest an idea for this project
33
labels: ["type: 🧱 enhancement"]
4-
type: 'Enhancement'
4+
type: Enhancement
55
assignees:
66
- Rakambda
77
body:
88
- type: textarea
99
id: describing
1010
attributes:
1111
label: Description
12-
description: Describe the feature/enhacement you wish to have
12+
description: Describe the feature/enhancement you wish to have
1313
validations:
1414
required: true

.github/dependabot.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,37 @@ updates:
55
assignees:
66
- Rakambda
77
schedule:
8-
interval: daily
9-
time: '05:00'
8+
interval: cron
9+
cronjob: 0 7 * * *
1010
timezone: Europe/Paris
1111
pull-request-branch-name:
1212
separator: '-'
13+
groups:
14+
docker:
15+
patterns:
16+
- docker/*
1317
- package-ecosystem: gradle
1418
directory: /
1519
assignees:
1620
- Rakambda
1721
schedule:
18-
interval: daily
19-
time: '05:00'
22+
interval: cron
23+
cronjob: 0 7 * * *
2024
timezone: Europe/Paris
2125
pull-request-branch-name:
2226
separator: '-'
2327
groups:
2428
log4j:
2529
patterns:
26-
- org.apache.logging.log4j:log4j-core
27-
- org.apache.logging.log4j:log4j-slf4j2-impl
30+
- org.apache.logging.log4j:*
2831
google-apis:
2932
patterns:
3033
- com.google.api-client:google-api-client
34+
- com.google.apis:*
3135
- com.google.oauth-client:google-oauth-client-jetty
32-
- com.google.apis:google-api-services-gmail
33-
- com.google.apis:google-api-services-calendar
36+
exposed:
37+
patterns:
38+
- org.jetbrains.exposed:*
39+
lets-plot:
40+
patterns:
41+
- org.jetbrains.lets-plot:*

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
distribution: 'temurin'
2828
java-version: ${{ vars.JAVA_VERSION }}
2929
- name: Generate and submit dependency graph
30-
uses: gradle/actions/dependency-submission@v4.3.0
30+
uses: gradle/actions/dependency-submission@v4.4.1
3131
continue-on-error: true
3232

3333
build:
@@ -45,7 +45,7 @@ jobs:
4545
java-version: ${{ vars.JAVA_VERSION }}
4646

4747
- name: Setup Gradle
48-
uses: gradle/actions/setup-gradle@v4.3.0
48+
uses: gradle/actions/setup-gradle@v4.4.1
4949
- name: Build project
5050
run: |
5151
./gradlew \
@@ -86,7 +86,7 @@ jobs:
8686
distribution: 'temurin'
8787
java-version: ${{ vars.JAVA_VERSION }}
8888
- name: Setup Gradle
89-
uses: gradle/actions/setup-gradle@v4.3.0
89+
uses: gradle/actions/setup-gradle@v4.4.1
9090

9191
- name: Run tests
9292
run: |
@@ -100,12 +100,12 @@ jobs:
100100
./gradlew \
101101
:miner:jacocoTestReport
102102
- name: Publish Test Report
103-
uses: mikepenz/action-junit-report@v5.3.0
103+
uses: mikepenz/action-junit-report@v5.6.1
104104
if: always()
105105
with:
106106
report_paths: 'miner/build/test-results/test/*.xml'
107107
- name: Publish coverage on CodeCov
108-
uses: codecov/codecov-action@v5.3.1
108+
uses: codecov/codecov-action@v5.4.3
109109
if: always()
110110
with:
111111
token: ${{ secrets.CODECOV_TOKEN }}
@@ -150,7 +150,7 @@ jobs:
150150
distribution: 'temurin'
151151
java-version: ${{ vars.JAVA_VERSION }}
152152
- name: Setup Gradle
153-
uses: gradle/actions/setup-gradle@v4.3.0
153+
uses: gradle/actions/setup-gradle@v4.4.1
154154

155155
- name: Run tests
156156
run: |
@@ -164,12 +164,12 @@ jobs:
164164
./gradlew \
165165
:viewer:jacocoTestReport
166166
- name: Publish Test Report
167-
uses: mikepenz/action-junit-report@v5.3.0
167+
uses: mikepenz/action-junit-report@v5.6.1
168168
if: always()
169169
with:
170170
report_paths: 'viewer/build/test-results/test/*.xml'
171171
- name: Publish coverage on CodeCov
172-
uses: codecov/codecov-action@v5.3.1
172+
uses: codecov/codecov-action@v5.4.3
173173
if: always()
174174
with:
175175
token: ${{ secrets.CODECOV_TOKEN }}
@@ -214,7 +214,7 @@ jobs:
214214
distribution: 'temurin'
215215
java-version: ${{ vars.JAVA_VERSION }}
216216
- name: Setup Gradle
217-
uses: gradle/actions/setup-gradle@v4.3.0
217+
uses: gradle/actions/setup-gradle@v4.4.1
218218

219219
- name: Calculate miner image name
220220
id: miner-image-name
@@ -244,7 +244,7 @@ jobs:
244244
distribution: 'temurin'
245245
java-version: ${{ vars.JAVA_VERSION }}
246246
- name: Setup Gradle
247-
uses: gradle/actions/setup-gradle@v4.3.0
247+
uses: gradle/actions/setup-gradle@v4.4.1
248248

249249
- name: Calculate viewer image name
250250
id: viewer-image-name

.github/workflows/manual-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
distribution: 'temurin'
1818
java-version: ${{ vars.JAVA_VERSION }}
1919
- name: Setup Gradle
20-
uses: gradle/actions/setup-gradle@v4.3.0
20+
uses: gradle/actions/setup-gradle@v4.4.1
2121

2222
- name: Calculate miner image name
2323
id: miner-image-name
@@ -53,7 +53,7 @@ jobs:
5353
distribution: 'temurin'
5454
java-version: ${{ vars.JAVA_VERSION }}
5555
- name: Setup Gradle
56-
uses: gradle/actions/setup-gradle@v4.3.0
56+
uses: gradle/actions/setup-gradle@v4.4.1
5757

5858
- name: Calculate viewer image name
5959
id: viewer-image-name

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
distribution: 'temurin'
2020
java-version: ${{ vars.JAVA_VERSION }}
2121
- name: Setup Gradle
22-
uses: gradle/actions/setup-gradle@v4.3.0
22+
uses: gradle/actions/setup-gradle@v4.4.1
2323

2424
- name: Push latest on Docker Hub
2525
run: |
@@ -42,7 +42,7 @@ jobs:
4242
distribution: 'temurin'
4343
java-version: ${{ vars.JAVA_VERSION }}
4444
- name: Setup Gradle
45-
uses: gradle/actions/setup-gradle@v4.3.0
45+
uses: gradle/actions/setup-gradle@v4.4.1
4646

4747
- name: Push latest on Docker Hub
4848
run: |
@@ -66,14 +66,14 @@ jobs:
6666
distribution: 'temurin'
6767
java-version: ${{ vars.JAVA_VERSION }}
6868
- name: Setup Gradle
69-
uses: gradle/actions/setup-gradle@v4.3.0
69+
uses: gradle/actions/setup-gradle@v4.4.1
7070

7171
- name: Build project
7272
run: |
7373
./gradlew \
7474
assemble
7575
- name: Release
76-
uses: softprops/action-gh-release@v2.2.1
76+
uses: softprops/action-gh-release@v2.3.2
7777
with:
7878
fail_on_unmatched_files: false
7979
generate_release_notes: true

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=2.3.5
1+
version=2.3.6

gradle/libs.versions.toml

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,48 @@
11
[versions]
2-
slf4j-version = "2.0.16"
3-
log4j2-version = "2.24.3"
4-
unirest-version = "4.4.5"
5-
picocli-version = "4.7.6"
6-
jackson-version = "2.18.2"
7-
jsonschema-generator-version = "4.37.0"
2+
slf4j-version = "2.0.17"
3+
log4j2-version = "2.25.0"
4+
unirest-version = "4.4.7"
5+
picocli-version = "4.7.7"
6+
jackson-version = "2.19.1"
7+
jsonschema-generator-version = "4.38.0"
88
httpclient-version = "4.5.14"
99
lang3-version = "3.17.0"
10-
commons-text-version = "1.13.0"
10+
commons-text-version = "1.13.1"
1111
jetbrains-annotations-version = "26.0.2"
1212
websocket-version = "1.6.0"
13-
junitVersion = "5.11.4"
13+
junitVersion = "5.13.1"
1414
assertj-core-version = "3.27.3"
1515
assertj-db-version = "3.0.0"
16-
mockito-version = "5.15.2"
17-
awaitility-version = "4.2.2"
18-
json-unit-version = "4.1.0"
16+
mockito-version = "5.18.0"
17+
awaitility-version = "4.3.0"
18+
json-unit-version = "4.1.1"
1919
kitteh-irc-version = "9.0.0"
20-
hikari-cp-version = "6.2.1"
21-
mariadb-version = "3.5.2"
22-
sqlite-version = "3.49.1.0"
23-
mysql-version = "9.2.0"
20+
hikari-cp-version = "6.3.0"
21+
mariadb-version = "3.5.3"
22+
sqlite-version = "3.50.1.0"
23+
mysql-version = "9.3.0"
2424
rerunner-jupiter-version = "2.1.6"
25-
flyway-version = "11.3.3"
26-
selenide-version = "7.7.2"
27-
lombok-version = "1.18.36"
25+
flyway-version = "11.9.2"
26+
selenide-version = "7.9.3"
27+
lombok-version = "1.18.38"
2828
jacocoVersion = "0.8.12"
29+
log4j-ecs-version = "1.7.0"
2930

3031
shadow-version = "8.1.1"
3132
names-version = "0.52.0"
32-
jib-version = "3.4.4"
33-
git-properties-version = "2.4.2"
34-
springboot-version = "3.4.2"
33+
jib-version = "3.4.5"
34+
git-properties-version = "2.5.0"
35+
springboot-version = "3.5.3"
3536
springboot-dependencies-version = "1.1.7"
3637
test-logger-version = "4.0.0"
37-
git-version-plugin-version = "3.1.0"
38+
git-version-plugin-version = "3.3.0"
3839

3940
[libraries]
4041
slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j-version" }
4142
log4j2Bom = { group = "org.apache.logging.log4j", name = "log4j-bom", version.ref = "log4j2-version"}
4243
log4j2-core = { group = "org.apache.logging.log4j", name = "log4j-core" }
4344
log4j2-slf4j = { group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl" }
44-
log4j2-json = { group = "org.apache.logging.log4j", name = "log4j-layout-template-json" }
45+
log4jEcs = { group = "co.elastic.logging", name = "log4j2-ecs-layout", version.ref = "log4j-ecs-version" }
4546
unirestBom = { group = "com.konghq", name = "unirest-java-bom", version.ref = "unirest-version" }
4647
unirest-java = { group = "com.konghq", name = "unirest-java-core" }
4748
unirest-modules-jackson = { group = "com.konghq", name = "unirest-modules-jackson" }
@@ -70,9 +71,11 @@ selenide = { group = "com.codeborne", name = "selenide", version.ref = "selenide
7071
selenide-proxy = { group = "com.codeborne", name = "selenide-proxy", version.ref = "selenide-version" }
7172
lombok = { group = "org.projectlombok", name = "lombok", version.ref = "lombok-version" }
7273

73-
junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junitVersion" }
74-
junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junitVersion" }
75-
junitEngine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junitVersion" }
74+
junitBom = { group = "org.junit", name = "junit-bom", version.ref = "junitVersion"}
75+
junit-api = { group = "org.junit.jupiter", name = "junit-jupiter-api" }
76+
junit-params = { group = "org.junit.jupiter", name = "junit-jupiter-params" }
77+
junit-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine" }
78+
junitPlatformLauncher = { group = "org.junit.platform", name = "junit-platform-launcher" }
7679
assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj-core-version" }
7780
assertj-db = { group = "org.assertj", name = "assertj-db", version.ref = "assertj-db-version" }
7881
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
8487

8588
[bundles]
8689
jackson = ["jackson-core", "jackson-annotations", "jackson-databind", "jackson-jsr310"]
87-
log4j2 = ["log4j2-core", "log4j2-slf4j", "log4j2-json"]
90+
log4j2 = ["log4j2-core", "log4j2-slf4j"]
8891
unirest = ["unirest-java", "unirest-modules-jackson"]
8992
flyway = ["flyway-core", "flyway-mysql"]
9093
selenide = ["selenide", "selenide-proxy"]
9194
jsonschemaGenerator = ["jsonschema-generator", "jsonschema-module-jackson"]
92-
junit = ["junit-api", "junit-params"]
95+
junit = ["junit-api", "junit-params", "junit-engine"]
9396
mockito = ["mockito-core", "mockito-junit"]
9497
jsonUnit = ["json-unit", "json-unit-assertj"]
9598
assertj = ["assertj-core", "assertj-db"]

miner/build.gradle.kts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies {
1616

1717
implementation(libs.slf4j)
1818
implementation(libs.bundles.log4j2)
19+
implementation(libs.log4jEcs)
1920

2021
implementation(libs.bundles.unirest)
2122
implementation(libs.picocli)
@@ -38,8 +39,9 @@ dependencies {
3839

3940
annotationProcessor(libs.lombok)
4041

42+
implementation(platform(libs.junitBom))
4143
testImplementation(libs.bundles.junit)
42-
testRuntimeOnly(libs.junitEngine)
44+
testRuntimeOnly(libs.junitPlatformLauncher)
4345

4446
testImplementation(libs.bundles.assertj)
4547
testImplementation(libs.bundles.mockito)

miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import lombok.RequiredArgsConstructor;
1717
import lombok.extern.log4j.Log4j2;
1818
import org.jetbrains.annotations.NotNull;
19-
import org.openqa.selenium.devtools.v131.page.model.FrameId;
19+
import org.openqa.selenium.devtools.v137.page.model.FrameId;
2020
import java.io.IOException;
2121
import java.time.Duration;
2222
import java.util.Comparator;

0 commit comments

Comments
 (0)