diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 92a09bc9..46046a8b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -14,7 +14,7 @@ updates: - "Rakambda" schedule: interval: "daily" - time: "08:00" + time: "05:00" timezone: "Europe/Paris" pull-request-branch-name: separator: "-" @@ -30,7 +30,7 @@ updates: # - "Rakambda" # schedule: # interval: "daily" -# time: "08:00" +# time: "05:00" # timezone: "Europe/Paris" # pull-request-branch-name: # separator: "-" @@ -40,7 +40,7 @@ updates: - "Rakambda" schedule: interval: "daily" - time: "08:00" + time: "05:00" timezone: "Europe/Paris" pull-request-branch-name: separator: "-" @@ -52,7 +52,7 @@ updates: - "Rakambda" schedule: interval: "daily" - time: "08:00" + time: "05:00" timezone: "Europe/Paris" pull-request-branch-name: separator: "-" @@ -62,7 +62,7 @@ updates: - "Rakambda" schedule: interval: "daily" - time: "08:00" + time: "05:00" timezone: "Europe/Paris" pull-request-branch-name: separator: "-" @@ -72,7 +72,7 @@ updates: - "Rakambda" schedule: interval: "daily" - time: "08:00" + time: "05:00" timezone: "Europe/Paris" pull-request-branch-name: separator: "-" @@ -82,7 +82,7 @@ updates: - "Rakambda" schedule: interval: "daily" - time: "08:00" + time: "05:00" timezone: "Europe/Paris" pull-request-branch-name: separator: "-" diff --git a/.github/renovate.json b/.github/renovate.json index fc07aa99..a6d8ae1d 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -11,5 +11,7 @@ "excludeCommitPaths": [".github/workflows/auto-approve-sync-files.yml"], "ignorePaths": [ ".github/workflows/auto-approve-sync-files.yml" - ] + ], + "timezone": "Europe/Paris", + "schedule": ["before 5am"] } diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml index 487c3813..f310002d 100644 --- a/.github/workflows/analyse.yml +++ b/.github/workflows/analyse.yml @@ -25,20 +25,20 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Setup Java JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: 17 - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: java - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 env: GITHUB_USER: RakSrinaNa GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index 28a29e09..1c0c8178 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -22,7 +22,7 @@ jobs: with: fetch-depth: 1 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} @@ -35,7 +35,7 @@ jobs: --scan - name: Upload miner jar file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: miner-jar path: | @@ -43,7 +43,7 @@ jobs: if-no-files-found: error retention-days: 14 - name: Upload viewer jar file - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: viewer-jar path: | @@ -63,7 +63,7 @@ jobs: with: fetch-depth: 1 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} @@ -94,7 +94,7 @@ jobs: flags: unittests-miner name: codecov-github-actions - name: Upload JUnit reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: junit-test-results-miner @@ -104,7 +104,7 @@ jobs: if-no-files-found: error retention-days: 14 - name: Upload JaCoCo reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: jacoco-test-results-miner @@ -126,7 +126,7 @@ jobs: with: fetch-depth: 1 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} @@ -157,7 +157,7 @@ jobs: flags: unittests-viewer name: codecov-github-actions - name: Upload JUnit reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: junit-test-results-viewer @@ -167,7 +167,7 @@ jobs: if-no-files-found: error retention-days: 14 - name: Upload JaCoCo reports - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: always() with: name: jacoco-test-results-viewer @@ -189,7 +189,7 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} @@ -218,7 +218,7 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} diff --git a/.github/workflows/manual-docker.yml b/.github/workflows/manual-docker.yml index 6b1cdb78..e1a88e85 100644 --- a/.github/workflows/manual-docker.yml +++ b/.github/workflows/manual-docker.yml @@ -12,7 +12,7 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} @@ -48,7 +48,7 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ env.APP_JAVA_VERSION }} diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 6d68d975..16b06fbd 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -15,9 +15,9 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Setup Pages - uses: actions/configure-pages@v3 + uses: actions/configure-pages@v4 - name: Install Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: '20' - name: Install Antora @@ -30,7 +30,7 @@ jobs: mkdir pages cp -R .github/antora-docs/. pages - name: Upload artifact - uses: actions/upload-pages-artifact@v2 + uses: actions/upload-pages-artifact@v3 with: path: pages @@ -47,4 +47,4 @@ jobs: steps: - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v2 + uses: actions/deploy-pages@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 06730346..d2709b41 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} @@ -36,7 +36,7 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} @@ -59,7 +59,7 @@ jobs: - name: Checkout source uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8eb1b942..9cd6b0e0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,39 +1,39 @@ [versions] -slf4j-version = "2.0.9" -log4j2-version = "2.21.0" -log4j2-slf4j-version = "2.21.0" -unirest-version = "4.1.0" +slf4j-version = "2.0.11" +log4j2-version = "2.22.1" +log4j2-slf4j-version = "2.22.1" +unirest-version = "4.2.7" picocli-version = "4.7.5" -jackson-version = "2.15.3" -jsonschema-generator-version = "4.31.1" +jackson-version = "2.16.1" +jsonschema-generator-version = "4.33.1" httpclient-version = "4.5.14" -lang3-version = "3.13.0" -commons-text-version = "1.10.0" -jetbrains-annotations-version = "24.0.1" -websocket-version = "1.5.4" -junitVersion = "5.10.0" -assertj-core-version = "3.24.2" +lang3-version = "3.14.0" +commons-text-version = "1.11.0" +jetbrains-annotations-version = "24.1.0" +websocket-version = "1.5.5" +junitVersion = "5.10.1" +assertj-core-version = "3.25.1" assertj-db-version = "2.0.2" mockito-version = "5.2.0" awaitility-version = "4.2.0" json-unit-version = "3.2.2" -kitteh-irc-version = "8.0.0" -hikari-cp-version = "5.0.1" -mariadb-version = "3.2.0" -sqlite-version = "3.43.2.1" -mysql-version = "8.1.0" +kitteh-irc-version = "9.0.0" +hikari-cp-version = "5.1.0" +mariadb-version = "3.3.2" +sqlite-version = "3.45.0.0" +mysql-version = "8.3.0" rerunner-jupiter-version = "2.1.6" -flyway-version = "9.22.3" -selenide-version = "6.19.1" +flyway-version = "10.6.0" +selenide-version = "7.0.4" lombok-version = "1.18.30" jacocoVersion = "0.8.10" shadow-version = "8.1.1" -names-version = "0.49.0" +names-version = "0.50.0" jib-version = "3.4.0" git-properties-version = "2.4.1" -springboot-version = "3.1.5" -springboot-dependencies-version = "1.1.3" +springboot-version = "3.2.1" +springboot-dependencies-version = "1.1.4" test-logger-version = "4.0.0" git-version-plugin-version = "3.0.0" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135c..d64cd491 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ac72c34e..1af9e093 100644 --- 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.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 0adc8e1a..1aa94a42 100755 --- a/gradlew +++ b/gradlew @@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ fi # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProvider.java b/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProvider.java index c05c2b8d..a11e90ab 100644 --- a/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProvider.java +++ b/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.v116.page.model.FrameId; +import org.openqa.selenium.devtools.v119.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 index 8c08d6f3..455763a9 100644 --- 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.v116.network.Network; -import org.openqa.selenium.devtools.v116.network.model.RequestId; -import org.openqa.selenium.devtools.v116.network.model.RequestWillBeSent; -import org.openqa.selenium.devtools.v116.network.model.ResponseReceived; +import org.openqa.selenium.devtools.v119.network.Network; +import org.openqa.selenium.devtools.v119.network.model.RequestId; +import org.openqa.selenium.devtools.v119.network.model.RequestWillBeSent; +import org.openqa.selenium.devtools.v119.network.model.ResponseReceived; import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.firefox.FirefoxOptions; import org.openqa.selenium.firefox.FirefoxProfile; diff --git a/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProviderTest.java b/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProviderTest.java index b8a76fd9..1b56b0b8 100644 --- a/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProviderTest.java +++ b/miner/src/test/java/fr/rakambda/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.v116.network.model.Headers; -import org.openqa.selenium.devtools.v116.network.model.MonotonicTime; -import org.openqa.selenium.devtools.v116.network.model.Request; -import org.openqa.selenium.devtools.v116.network.model.RequestId; -import org.openqa.selenium.devtools.v116.network.model.RequestWillBeSent; -import org.openqa.selenium.devtools.v116.network.model.Response; -import org.openqa.selenium.devtools.v116.network.model.ResponseReceived; -import org.openqa.selenium.devtools.v116.page.model.FrameId; +import org.openqa.selenium.devtools.v119.network.model.Headers; +import org.openqa.selenium.devtools.v119.network.model.MonotonicTime; +import org.openqa.selenium.devtools.v119.network.model.Request; +import org.openqa.selenium.devtools.v119.network.model.RequestId; +import org.openqa.selenium.devtools.v119.network.model.RequestWillBeSent; +import org.openqa.selenium.devtools.v119.network.model.Response; +import org.openqa.selenium.devtools.v119.network.model.ResponseReceived; +import org.openqa.selenium.devtools.v119.page.model.FrameId; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith;