From 0bdfbe576b2bc8e407f731d19aed42769c6f25c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 16:21:05 +0200 Subject: [PATCH 01/10] Build(deps): Bump actions/setup-java from 3 to 4 (#379) Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4. - [Release notes](https://github.com/actions/setup-java/releases) - [Commits](https://github.com/actions/setup-java/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-java dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/sonar-analysis.yml | 2 +- .github/workflows/tests.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ab9e636d..dc7a2538 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -42,7 +42,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 17 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b049672e..e1eb95ff 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 diff --git a/.github/workflows/sonar-analysis.yml b/.github/workflows/sonar-analysis.yml index 972982e2..2fac5e44 100644 --- a/.github/workflows/sonar-analysis.yml +++ b/.github/workflows/sonar-analysis.yml @@ -31,7 +31,7 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 17 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fda833c4..f0c82961 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -33,7 +33,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: ${{ matrix.java-version }} @@ -85,7 +85,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: distribution: 'adopt' java-version: 11 From 66f28b887f6a7c7a5f029df221ea8451bcdee4dc Mon Sep 17 00:00:00 2001 From: Jon Frydensbjerg Date: Sun, 25 Aug 2024 10:25:00 +0200 Subject: [PATCH 02/10] Fixes for recent FFmpeg versions (#394) Support both new and old KB formats --- .../kokorin/jaffree/util/ParseUtil.java | 22 +++++--- .../kokorin/jaffree/ffmpeg/FFmpegTest.java | 52 +++++++++++++++++-- .../kokorin/jaffree/util/ParseUtilTest.java | 19 +++++-- 3 files changed, 77 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/github/kokorin/jaffree/util/ParseUtil.java b/src/main/java/com/github/kokorin/jaffree/util/ParseUtil.java index 604cb23f..88cb3e37 100644 --- a/src/main/java/com/github/kokorin/jaffree/util/ParseUtil.java +++ b/src/main/java/com/github/kokorin/jaffree/util/ParseUtil.java @@ -30,8 +30,7 @@ */ @SuppressWarnings("checkstyle:MagicNumber") public final class ParseUtil { - - private static final String KBYTES_SUFFIX = "kB"; + private static final String[] KBYTES_SUFFIXES = {"kB", "KiB"}; private static final String KBITS_PER_SECOND_SUFFIX = "kbits/s"; private static final String SPEED_SUFFIX = "x"; private static final String PERCENT_SUFFIX = "%"; @@ -78,33 +77,40 @@ public static Double parseDouble(final String value) { } /** - * Parses size in kilobytes without exception. + * Parses size in kibibytes without exception. * * @param value string to parse * @return parsed long or null if value can't be parsed */ public static Long parseSizeInBytes(final String value) { - Long result = parseSizeInKiloBytes(value); + Long result = parseSizeInKibiBytes(value); if (result == null) { return null; } - return result * 1000; + return result * 1024; } /** - * Parses size in kilobytes without exception. + * Parses size in kibibytes without exception. * * @param value string to parse * @return parsed long or null if value can't be parsed */ - public static Long parseSizeInKiloBytes(final String value) { + public static Long parseSizeInKibiBytes(final String value) { if (value == null || value.isEmpty()) { return null; } - return parseLongWithSuffix(value.trim(), KBYTES_SUFFIX); + final String trimmedValue = value.trim(); + Long result = null; + + for (int i = 0; i < KBYTES_SUFFIXES.length && result == null; i++) { + result = parseLongWithSuffix(trimmedValue, KBYTES_SUFFIXES[i]); + } + + return result; } /** diff --git a/src/test/java/com/github/kokorin/jaffree/ffmpeg/FFmpegTest.java b/src/test/java/com/github/kokorin/jaffree/ffmpeg/FFmpegTest.java index fdc4e57f..d6170aad 100644 --- a/src/test/java/com/github/kokorin/jaffree/ffmpeg/FFmpegTest.java +++ b/src/test/java/com/github/kokorin/jaffree/ffmpeg/FFmpegTest.java @@ -43,6 +43,7 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -240,6 +241,43 @@ public void onProgress(FFmpegProgress progress) { .execute(); } + @Test + public void testFrameCountingWithStreamCopyAndProgressListener() throws Exception { + final AtomicBoolean ffmpegHasStreamCopyBug = new AtomicBoolean(false); + + final OutputListener outputListener = message -> { + // Don't check the frame count in at FFmpeg 6.1.x and 7.0.x due to a stream copy bug, + // which is addressed on the master branch, see: + // https://github.com/FFmpeg/FFmpeg/commit/598f541ba49cb682dcd74e86858c9a4985149e1f + if (message.contains("ffmpeg version 6.1") || message.contains("ffmpeg version 7.0")) { + ffmpegHasStreamCopyBug.set(true); + } + }; + + final AtomicReference frameRef = new AtomicReference<>(); + + final ProgressListener progressListener = new ProgressListener() { + @Override + public void onProgress(FFmpegProgress progress) { + System.out.println(progress); + frameRef.set(progress.getFrame()); + } + }; + + final FFmpegResult result = FFmpeg.atPath(Config.FFMPEG_BIN) + .addInput(UrlInput.fromPath(Artifacts.VIDEO_NUT)) + .addOutput(new NullOutput()) + .setOutputListener(outputListener) + .setProgressListener(progressListener) + .execute(); + + if (ffmpegHasStreamCopyBug.get()) { + LOGGER.warn("Detected buggy FFmpeg version, frame count not checked"); + } else { + assertNotNull(frameRef.get()); + } + } + @Test public void testForceStopWithThreadInterruption() throws Exception { Path tempDir = Files.createTempDirectory("jaffree"); @@ -519,14 +557,20 @@ public void testExceptionIsThrownIfFfmpegExitsWithError() { .addOutput(new NullOutput()) .execute(); } catch (JaffreeAbnormalExitException e) { - assertEquals("Process execution has ended with non-zero status: 1. Check logs for detailed error message.", e.getMessage()); - assertEquals(1, e.getProcessErrorLogMessages().size()); - assertEquals("[error] non_existent.mp4: No such file or directory", e.getProcessErrorLogMessages().get(0).message); + if ("Process execution has ended with non-zero status: 254. Check logs for detailed error message.".equals(e.getMessage())) { + // FFmpeg 6+ + assertEquals(3, e.getProcessErrorLogMessages().size()); + assertEquals("[error] Error opening input file non_existent.mp4.", e.getProcessErrorLogMessages().get(1).message); + } else if ("Process execution has ended with non-zero status: 1. Check logs for detailed error message.".equals(e.getMessage())) { + assertEquals(1, e.getProcessErrorLogMessages().size()); + assertEquals("[error] non_existent.mp4: No such file or directory", e.getProcessErrorLogMessages().get(0).message); + } else { + fail("Unknown FFmpeg output format (update test code!)"); + } return; } fail("JaffreeAbnormalExitException should have been thrown!"); - } @Test diff --git a/src/test/java/com/github/kokorin/jaffree/util/ParseUtilTest.java b/src/test/java/com/github/kokorin/jaffree/util/ParseUtilTest.java index e932cf7c..111a89a1 100644 --- a/src/test/java/com/github/kokorin/jaffree/util/ParseUtilTest.java +++ b/src/test/java/com/github/kokorin/jaffree/util/ParseUtilTest.java @@ -63,13 +63,25 @@ public void parseLogLevel() { } @Test - public void parsResult() throws Exception { + public void parseKibiByteFormats() { + final Long oldFormat = ParseUtil.parseSizeInKibiBytes("2904kB"); + Assert.assertEquals(2904L, oldFormat.longValue()); + + final Long newFormat = ParseUtil.parseSizeInKibiBytes("2904KiB"); + Assert.assertEquals(2904L, newFormat.longValue()); + + final Long unknownFormat = ParseUtil.parseSizeInKibiBytes("2904KB"); + Assert.assertNull(unknownFormat); + } + + @Test + public void parseResult() throws Exception { String value = "video:1417kB audio:113kB subtitle:0kB other streams:0kB global headers:0kB muxing overhead: unknown"; FFmpegResult result = ParseUtil.parseResult(value); Assert.assertNotNull(result); - Assert.assertEquals((Long) 1_417_000L, result.getVideoSize()); - Assert.assertEquals((Long) 113_000L, result.getAudioSize()); + Assert.assertEquals((Long) 1_451_008L, result.getVideoSize()); + Assert.assertEquals((Long) 115_712L, result.getAudioSize()); Assert.assertEquals((Long) 0L, result.getSubtitleSize()); Assert.assertEquals((Long) 0L, result.getOtherStreamsSize()); Assert.assertEquals((Long) 0L, result.getGlobalHeadersSize()); @@ -98,5 +110,4 @@ public void parseResultWhichDoesntContainResult() throws Exception { Assert.assertNull(result); } - } \ No newline at end of file From 76bbda3a09b68ce5b9c1526569b289c8649ae8c0 Mon Sep 17 00:00:00 2001 From: Denis Kokorin Date: Mon, 26 Aug 2024 16:23:33 +0300 Subject: [PATCH 03/10] Use JDK 21, fix testing (#395) --- .github/workflows/codeql-analysis.yml | 4 +-- .github/workflows/release.yml | 4 +-- .github/workflows/sonar-analysis.yml | 4 +-- .github/workflows/tests.yml | 33 ++++++++----------- .../kokorin/jaffree/ffmpeg/FFmpegTest.java | 6 +++- 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index dc7a2538..f06c6c43 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -44,8 +44,8 @@ jobs: - uses: actions/setup-java@v4 with: - distribution: 'adopt' - java-version: 17 + distribution: 'temurin' + java-version: 21 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e1eb95ff..54e37aed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,8 +21,8 @@ jobs: - uses: actions/setup-java@v4 with: - distribution: 'adopt' - java-version: 11 + distribution: 'temurin' + java-version: 21 - uses: actions/cache@v3 with: diff --git a/.github/workflows/sonar-analysis.yml b/.github/workflows/sonar-analysis.yml index 2fac5e44..ed0d9a6e 100644 --- a/.github/workflows/sonar-analysis.yml +++ b/.github/workflows/sonar-analysis.yml @@ -33,8 +33,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - distribution: 'adopt' - java-version: 17 + distribution: 'temurin' + java-version: 21 - name: Install ffmpeg on Ubuntu run: sudo apt-get update && sudo apt-get install -y ffmpeg && ffmpeg -version diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f0c82961..daca7665 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,8 +25,10 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ ubuntu-latest, macos-latest, windows-latest ] - java-version: [ 8, 11, 17 ] + os: + - ubuntu-latest + - macos-latest + - windows-latest fail-fast: false steps: @@ -35,8 +37,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - distribution: 'adopt' - java-version: ${{ matrix.java-version }} + distribution: 'temurin' + java-version: 21 - name: Cache Maven Packages uses: actions/cache@v3 @@ -56,28 +58,21 @@ jobs: key: ${{ runner.os }}-artifacts-${{ hashFiles('**/Artifacts.java') }} - name: Install ffmpeg on Ubuntu - run: sudo apt-get update && sudo apt-get install -y ffmpeg && ffmpeg -version + run: sudo apt-get update && sudo apt-get install -y ffmpeg if: startsWith(matrix.os, 'ubuntu') - + - name: Install ffmpeg on MacOS - run: brew install ffmpeg && ls -lhtr /usr/local/opt/ffmpeg/ && ffmpeg -version + run: brew install ffmpeg if: startsWith(matrix.os, 'macos') - name: Install ffmpeg on Windows - run: choco install ffmpeg && ffmpeg -version + run: choco install ffmpeg if: startsWith(matrix.os, 'windows') - - name: Build on Ubuntu - run: bash mvnw clean package -B - if: startsWith(matrix.os, 'ubuntu') + - run: ffmpeg -version - - name: Build on MacOS - run: bash mvnw clean package -B - if: startsWith(matrix.os, 'macos') - - - name: Build on Windows + - name: Build and test run: ./mvnw clean package -B - if: startsWith(matrix.os, 'windows') test-release: runs-on: ubuntu-latest @@ -87,8 +82,8 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - distribution: 'adopt' - java-version: 11 + distribution: 'temurin' + java-version: 21 - name: Set up RANDOM GPG key run: gpg --quick-generate-key --batch --passphrase '' test42 diff --git a/src/test/java/com/github/kokorin/jaffree/ffmpeg/FFmpegTest.java b/src/test/java/com/github/kokorin/jaffree/ffmpeg/FFmpegTest.java index d6170aad..c1c99d44 100644 --- a/src/test/java/com/github/kokorin/jaffree/ffmpeg/FFmpegTest.java +++ b/src/test/java/com/github/kokorin/jaffree/ffmpeg/FFmpegTest.java @@ -561,11 +561,15 @@ public void testExceptionIsThrownIfFfmpegExitsWithError() { // FFmpeg 6+ assertEquals(3, e.getProcessErrorLogMessages().size()); assertEquals("[error] Error opening input file non_existent.mp4.", e.getProcessErrorLogMessages().get(1).message); + } else if ("Process execution has ended with non-zero status: -2. Check logs for detailed error message.".equals(e.getMessage())) { + // FFmpeg 7 + assertEquals(3, e.getProcessErrorLogMessages().size()); + assertEquals("[error] Error opening input file non_existent.mp4.", e.getProcessErrorLogMessages().get(1).message); } else if ("Process execution has ended with non-zero status: 1. Check logs for detailed error message.".equals(e.getMessage())) { assertEquals(1, e.getProcessErrorLogMessages().size()); assertEquals("[error] non_existent.mp4: No such file or directory", e.getProcessErrorLogMessages().get(0).message); } else { - fail("Unknown FFmpeg output format (update test code!)"); + fail("Unknown FFmpeg output format (update test code!): " + e.getMessage()); } return; } From be01a68c450f79a59f49d7562aafa95f466a244b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 16:42:02 +0300 Subject: [PATCH 04/10] Build(deps-dev): Bump ch.qos.logback:logback-classic (#396) Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.2.10 to 1.5.7. - [Commits](https://github.com/qos-ch/logback/compare/v_1.2.10...v_1.5.7) --- updated-dependencies: - dependency-name: ch.qos.logback:logback-classic dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 02eb3274..4d546d6c 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ ch.qos.logback logback-classic - 1.2.10 + 1.5.7 test From 5c83ab1a72e45c1e3cd0e06819187a426da55348 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 13:49:45 +0000 Subject: [PATCH 05/10] Build(deps): Bump org.apache.maven.plugins:maven-gpg-plugin (#398) Bumps [org.apache.maven.plugins:maven-gpg-plugin](https://github.com/apache/maven-gpg-plugin) from 3.0.1 to 3.2.5. - [Release notes](https://github.com/apache/maven-gpg-plugin/releases) - [Commits](https://github.com/apache/maven-gpg-plugin/compare/maven-gpg-plugin-3.0.1...maven-gpg-plugin-3.2.5) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-gpg-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4d546d6c..4aec12f9 100644 --- a/pom.xml +++ b/pom.xml @@ -180,7 +180,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.2.5 sign-artifacts From 289a1562185971dbbc1fc7e2d949708bc8f455e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 13:56:37 +0000 Subject: [PATCH 06/10] Build(deps): Bump org.apache.maven.plugins:maven-checkstyle-plugin (#399) Bumps [org.apache.maven.plugins:maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.1.2 to 3.5.0. - [Commits](https://github.com/apache/maven-checkstyle-plugin/compare/maven-checkstyle-plugin-3.1.2...maven-checkstyle-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4aec12f9..3c6b1379 100644 --- a/pom.xml +++ b/pom.xml @@ -241,7 +241,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.2 + 3.5.0 4 checkstyle.xml From 1fda87444079011558c665c141d79068c57de95a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Aug 2024 14:05:22 +0000 Subject: [PATCH 07/10] Build(deps): Bump org.apache.maven.plugins:maven-source-plugin (#397) Bumps [org.apache.maven.plugins:maven-source-plugin](https://github.com/apache/maven-source-plugin) from 3.2.1 to 3.3.1. - [Release notes](https://github.com/apache/maven-source-plugin/releases) - [Commits](https://github.com/apache/maven-source-plugin/compare/maven-source-plugin-3.2.1...maven-source-plugin-3.3.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-source-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c6b1379..a67268fe 100644 --- a/pom.xml +++ b/pom.xml @@ -150,7 +150,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.1 attach-sources From 6e930efe63cf1ea1f6710d09c051ac72cc1a1133 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 06:43:51 +0000 Subject: [PATCH 08/10] Build(deps): Bump actions/cache from 3 to 4 (#384) Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](https://github.com/actions/cache/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/sonar-analysis.yml | 4 ++-- .github/workflows/tests.yml | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f06c6c43..fde699e0 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -57,7 +57,7 @@ jobs: # Prefix the list here with "+" to use these queries and those in the config file. # queries: ./path/to/local/query, your-org/your-repo/queries@main - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: # be careful not to include ~/.m2/settings.xml which contains credentials path: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 54e37aed..6f35ebba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: distribution: 'temurin' java-version: 21 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: # be careful not to include ~/.m2/settings.xml which contains credentials path: | diff --git a/.github/workflows/sonar-analysis.yml b/.github/workflows/sonar-analysis.yml index ed0d9a6e..ff4d47aa 100644 --- a/.github/workflows/sonar-analysis.yml +++ b/.github/workflows/sonar-analysis.yml @@ -40,13 +40,13 @@ jobs: run: sudo apt-get update && sudo apt-get install -y ffmpeg && ffmpeg -version - name: Cache SonarCloud packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: # be careful not to include ~/.m2/settings.xml which contains credentials path: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index daca7665..cf2618ad 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -41,7 +41,7 @@ jobs: java-version: 21 - name: Cache Maven Packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: # be careful not to include ~/.m2/settings.xml which contains credentials path: | @@ -51,7 +51,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Cache Test Artifacts - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | .artifacts @@ -88,7 +88,7 @@ jobs: - name: Set up RANDOM GPG key run: gpg --quick-generate-key --batch --passphrase '' test42 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: # be careful not to include ~/.m2/settings.xml which contains credentials path: | From d692c1faafaab398b4e90b6cb5dbbc8e7419c5b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 18:27:34 +0300 Subject: [PATCH 09/10] Build(deps): Bump com.grack:nanojson from 1.7 to 1.9 (#403) Bumps [com.grack:nanojson](https://github.com/mmastrac/nanojson) from 1.7 to 1.9. - [Commits](https://github.com/mmastrac/nanojson/commits) --- updated-dependencies: - dependency-name: com.grack:nanojson dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a67268fe..86bd55e9 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ com.grack nanojson - 1.7 + 1.9 From d6a9051e81c07c696555636f502e7810a47dbc29 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 15:34:07 +0000 Subject: [PATCH 10/10] Build(deps): Bump github/codeql-action from 2 to 3 (#382) Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/v2...v3) --- updated-dependencies: - dependency-name: github/codeql-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Denis Kokorin --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index fde699e0..2e75bf85 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -49,7 +49,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -70,4 +70,4 @@ jobs: run: bash mvnw clean install -B -DskipTests - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3