From c7bea1e767bcbb6efc32290f745b950b51c4cdc5 Mon Sep 17 00:00:00 2001 From: Ivan Novik Date: Fri, 7 Mar 2025 15:46:11 +0300 Subject: [PATCH 1/2] fix jar scanner for java 17 --- .../src/main/java/com/epam/deltix/util/lang/JarScanner.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/util/src/main/java/com/epam/deltix/util/lang/JarScanner.java b/util/src/main/java/com/epam/deltix/util/lang/JarScanner.java index 64ba3fb53..724fea368 100644 --- a/util/src/main/java/com/epam/deltix/util/lang/JarScanner.java +++ b/util/src/main/java/com/epam/deltix/util/lang/JarScanner.java @@ -17,7 +17,6 @@ package com.epam.deltix.util.lang; import javax.tools.JavaFileObject; -import java.io.File; import java.io.IOException; import java.net.JarURLConnection; import java.net.URI; @@ -59,7 +58,7 @@ private static Collection listUnder(String packageName, URL pack } private static List processJar(String packageName, URL packageFolderURL) { - List result = new ArrayList(); + List result = new ArrayList<>(); try { String[] uris = packageFolderURL.toExternalForm().split("!"); String jarUri = uris[0]; @@ -87,6 +86,9 @@ private static List processJar(String packageName, URL packageFo } else if (secondUri.endsWith(".jar")) { JarURLConnection jarConn = (JarURLConnection) packageFolderURL.openConnection(); String rootEntryName = jarConn.getEntryName(); + if (rootEntryName == null) { + rootEntryName = ""; + } int rootEnd = rootEntryName.length() + 1; if (!secondUri.endsWith("jar")) return result; From 87900954cb83bef3d11a75dcda3c4d999e87ce40 Mon Sep 17 00:00:00 2001 From: Ivan Novik Date: Mon, 10 Mar 2025 09:51:43 +0300 Subject: [PATCH 2/2] update ci script --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea7e42d3a..2c4470569 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,14 +24,14 @@ jobs: - name: Checkout code uses: actions/checkout@v2 - name: Cache gradle dependencies - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle') }} restore-keys: | ${{ runner.os }}-gradle-caches- - name: Cache gradle wrapper - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} @@ -43,7 +43,7 @@ jobs: run: ./gradlew build - name: Upload test results if: ${{ failure() }} - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: path: build/reports/tests/test name: Test Report \ No newline at end of file