Skip to content

Commit d9d6a2a

Browse files
RakambdaRakambda
authored
Merge pull request #891 from RakambdaOrg/develop
2.3.3
2 parents edeb727 + 6be9420 commit d9d6a2a

13 files changed

Lines changed: 52 additions & 44 deletions

File tree

‎.github/ISSUE_TEMPLATE/0_bug_report.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Bug report
22
description: Create a report to help us improve
33
labels: ["type: 🐛 bug"]
4+
type: 'Bug'
45
assignees:
56
- Rakambda
67
body:

‎.github/ISSUE_TEMPLATE/1_feature_request.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Feature request
22
description: Suggest an idea for this project
33
labels: ["type: 🧱 enhancement"]
4+
type: 'Enhancement'
45
assignees:
56
- Rakambda
67
body:

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

Lines changed: 8 additions & 8 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.0.1
30+
uses: gradle/actions/dependency-submission@v4.1.0
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.0.1
48+
uses: gradle/actions/setup-gradle@v4.1.0
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.0.1
89+
uses: gradle/actions/setup-gradle@v4.1.0
9090

9191
- name: Run tests
9292
run: |
@@ -105,7 +105,7 @@ jobs:
105105
with:
106106
report_paths: 'miner/build/test-results/test/*.xml'
107107
- name: Publish coverage on CodeCov
108-
uses: codecov/codecov-action@v4.5.0
108+
uses: codecov/codecov-action@v4.6.0
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.0.1
153+
uses: gradle/actions/setup-gradle@v4.1.0
154154

155155
- name: Run tests
156156
run: |
@@ -169,7 +169,7 @@ jobs:
169169
with:
170170
report_paths: 'viewer/build/test-results/test/*.xml'
171171
- name: Publish coverage on CodeCov
172-
uses: codecov/codecov-action@v4.5.0
172+
uses: codecov/codecov-action@v4.6.0
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.0.1
217+
uses: gradle/actions/setup-gradle@v4.1.0
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.0.1
247+
uses: gradle/actions/setup-gradle@v4.1.0
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.0.1
20+
uses: gradle/actions/setup-gradle@v4.1.0
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.0.1
56+
uses: gradle/actions/setup-gradle@v4.1.0
5757

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

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 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.0.1
22+
uses: gradle/actions/setup-gradle@v4.1.0
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.0.1
45+
uses: gradle/actions/setup-gradle@v4.1.0
4646

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

7171
- name: Build project
7272
run: |

‎gradle.properties‎

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

‎gradle/libs.versions.toml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,47 @@
11
[versions]
22
slf4j-version = "2.0.16"
3-
log4j2-version = "2.23.1"
4-
log4j2-slf4j-version = "2.23.1"
3+
log4j2-version = "2.24.1"
54
unirest-version = "4.4.4"
65
picocli-version = "4.7.6"
7-
jackson-version = "2.17.2"
6+
jackson-version = "2.18.0"
87
jsonschema-generator-version = "4.36.0"
98
httpclient-version = "4.5.14"
10-
lang3-version = "3.16.0"
9+
lang3-version = "3.17.0"
1110
commons-text-version = "1.12.0"
12-
jetbrains-annotations-version = "24.1.0"
11+
jetbrains-annotations-version = "25.0.0"
1312
websocket-version = "1.5.7"
14-
junitVersion = "5.11.0"
13+
junitVersion = "5.11.1"
1514
assertj-core-version = "3.26.3"
1615
assertj-db-version = "2.0.2"
17-
mockito-version = "5.13.0"
16+
mockito-version = "5.14.1"
1817
awaitility-version = "4.2.2"
1918
json-unit-version = "3.4.1"
2019
kitteh-irc-version = "9.0.0"
21-
hikari-cp-version = "5.1.0"
20+
hikari-cp-version = "6.0.0"
2221
mariadb-version = "3.4.1"
23-
sqlite-version = "3.46.1.0"
22+
sqlite-version = "3.46.1.3"
2423
mysql-version = "9.0.0"
2524
rerunner-jupiter-version = "2.1.6"
26-
flyway-version = "10.17.2"
27-
selenide-version = "7.4.2"
25+
flyway-version = "10.18.2"
26+
selenide-version = "7.5.1"
2827
lombok-version = "1.18.34"
2928
jacocoVersion = "0.8.12"
3029

3130
shadow-version = "8.1.1"
3231
names-version = "0.51.0"
3332
jib-version = "3.4.3"
3433
git-properties-version = "2.4.2"
35-
springboot-version = "3.3.3"
34+
springboot-version = "3.3.4"
3635
springboot-dependencies-version = "1.1.6"
3736
test-logger-version = "4.0.0"
3837
git-version-plugin-version = "3.1.0"
3938

4039
[libraries]
4140
slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j-version" }
42-
log4j2-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j2-version" }
43-
log4j2-slf4j = { group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version.ref = "log4j2-slf4j-version" }
41+
log4j2Bom = { group = "org.apache.logging.log4j", name = "log4j-bom", version.ref = "log4j2-version"}
42+
log4j2-core = { group = "org.apache.logging.log4j", name = "log4j-core" }
43+
log4j2-slf4j = { group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl" }
44+
log4j2-json = { group = "org.apache.logging.log4j", name = "log4j-layout-template-json" }
4445
unirestBom = { group = "com.konghq", name = "unirest-java-bom", version.ref = "unirest-version" }
4546
unirest-java = { group = "com.konghq", name = "unirest-java-core" }
4647
unirest-modules-jackson = { group = "com.konghq", name = "unirest-modules-jackson" }
@@ -82,7 +83,7 @@ rerunnerJupiter = { group = "io.github.artsok", name = "rerunner-jupiter", versi
8283

8384
[bundles]
8485
jackson = ["jackson-core", "jackson-annotations", "jackson-databind", "jackson-jsr310"]
85-
log4j2 = ["log4j2-core", "log4j2-slf4j"]
86+
log4j2 = ["log4j2-core", "log4j2-slf4j", "log4j2-json"]
8687
unirest = ["unirest-java", "unirest-modules-jackson"]
8788
flyway = ["flyway-core", "flyway-mysql"]
8889
jsonschemaGenerator = ["jsonschema-generator", "jsonschema-module-jackson"]

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎miner/build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
2+
13
plugins {
24
application
35
jacoco
@@ -10,6 +12,7 @@ plugins {
1012
dependencies {
1113
implementation(platform(libs.jacksonBom))
1214
implementation(platform(libs.unirestBom))
15+
implementation(platform(libs.log4j2Bom))
1316

1417
implementation(libs.slf4j)
1518
implementation(libs.bundles.log4j2)
@@ -109,6 +112,8 @@ tasks {
109112

110113
exclude("META-INF/*.DSA", "META-INF/*.RSA", "META-INF/*.SF")
111114
mergeServiceFiles()
115+
116+
transform(Log4j2PluginsCacheFileTransformer::class.java)
112117
}
113118
}
114119

‎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.v125.page.model.FrameId;
19+
import org.openqa.selenium.devtools.v128.page.model.FrameId;
2020
import java.io.IOException;
2121
import java.time.Duration;
2222
import java.util.Comparator;

0 commit comments

Comments
 (0)