diff --git a/.github/workflows/maven-and-native.yml b/.github/workflows/maven-and-native.yml index 066d1f839..4713c98ae 100644 --- a/.github/workflows/maven-and-native.yml +++ b/.github/workflows/maven-and-native.yml @@ -275,7 +275,7 @@ jobs: git config --global user.name "Jitsi GitHub Action" cd $Env:GITHUB_WORKSPACE/src/native/ $java_home = "${{ steps.install_java.outputs.path }}".Replace("\\", "/") - cmake -B cmake-build-${{ matrix.arch.actions }} -A ${{ matrix.arch.cmake }} -DJAVA_HOME=$java_home + cmake -B cmake-build-${{ matrix.arch.actions }} -DVCPKG_TARGET_TRIPLET=${{ matrix.arch.cmake }}-windows-static -A ${{ matrix.arch.cmake }} -DJAVA_HOME=$java_home cmake --build cmake-build-${{ matrix.arch.actions }} --config Release --target install --parallel - name: Gather logs on failure diff --git a/pom.xml b/pom.xml index 087811e93..086b355bb 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ net.java.dev.jna jna - 5.11.0 + 5.13.0 org.bouncycastle @@ -94,7 +94,7 @@ ${project.groupId} jitsi-utils - 1.0-114-g43815ed + 1.0-126-g02b0c86 ${project.groupId} @@ -109,7 +109,7 @@ ${project.groupId} jitsi-lgpl-dependencies - 1.2-21-gc4508d5 + 1.2-23-g7b49874 provided true @@ -132,7 +132,7 @@ org.jetbrains annotations - 23.0.0 + 24.0.1 provided @@ -140,13 +140,13 @@ org.junit.jupiter junit-jupiter-engine - 5.8.2 + 5.9.3 test org.mockito mockito-core - 4.5.1 + 5.4.0 test @@ -159,10 +159,25 @@ + + org.codehaus.mojo + versions-maven-plugin + 2.16.0 + + + + + regex + .+-(alpha|beta|M|RC).* + + + + + org.apache.felix maven-bundle-plugin - 5.1.6 + 5.1.9 true jitsi-lgpl-dependencies @@ -198,7 +213,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.11.0 11 @@ -210,12 +225,12 @@ maven-surefire-plugin - 2.22.2 + 3.1.2 org.apache.maven.plugins maven-javadoc-plugin - 3.4.0 + 3.5.0 -missing 11 @@ -224,7 +239,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 true @@ -232,17 +247,17 @@ org.apache.maven.plugins maven-resources-plugin - 3.2.0 + 3.3.1 org.apache.maven.plugins maven-install-plugin - 3.0.0-M1 + 3.1.1 org.apache.maven.plugins maven-deploy-plugin - 3.0.0-M2 + 3.1.1 org.sonatype.plugins diff --git a/src/main/java/org/jitsi/impl/libjitsi/LibJitsiImpl.java b/src/main/java/org/jitsi/impl/libjitsi/LibJitsiImpl.java index 52246f199..a9976ecd0 100644 --- a/src/main/java/org/jitsi/impl/libjitsi/LibJitsiImpl.java +++ b/src/main/java/org/jitsi/impl/libjitsi/LibJitsiImpl.java @@ -177,14 +177,10 @@ private static T initializeService(String className, Class clazz) if (!suppressClassNotFoundException) exception = cnfe; } - catch (ExceptionInInitializerError eiie) + catch (LinkageError eiie) { exception = eiie; } - catch (LinkageError le) - { - exception = le; - } T service = null; @@ -193,21 +189,16 @@ private static T initializeService(String className, Class clazz) try { @SuppressWarnings("unchecked") - T t = (T) implClass.newInstance(); + T t = (T) implClass.getConstructor().newInstance(); service = t; } - catch (Throwable t) + catch (Exception e) { - if (t instanceof ThreadDeath) - { - throw (ThreadDeath) t; - } - else + exception = e; + if (e instanceof InterruptedException) { - exception = t; - if (t instanceof InterruptedException) - Thread.currentThread().interrupt(); + Thread.currentThread().interrupt(); } } }