From 10b9e50cde070774118b6d9361c9d3c2ff686573 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 20 Jan 2023 12:59:49 +0100 Subject: [PATCH] Resolve jar paths using xmvn --- base/CMakeLists.txt | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/base/CMakeLists.txt b/base/CMakeLists.txt index c315be0..8cabd7f 100644 --- a/base/CMakeLists.txt +++ b/base/CMakeLists.txt @@ -151,25 +151,16 @@ find_file(JACKSON2_JAXB_ANNOTATIONS_JAR /usr/share/java ) -find_file(JAXB_API_JAR - NAMES - jaxb-api.jar - PATHS - /usr/share/java +execute_process( + COMMAND xmvn-resolve jakarta.xml.bind:jakarta.xml.bind-api:2 + OUTPUT_VARIABLE JAXB_API_JAR + OUTPUT_STRIP_TRAILING_WHITESPACE ) -find_file(JAVAX_ACTIVATION_JAR - NAMES - jakarta.activation.jar - jakarta-activation.jar - javax.activation.jar - javax-activation.jar - PATHS - /usr/share/java/jakarta-activation - /usr/share/java/jakarta - /usr/share/java/javax-activation - /usr/share/java/javax - /usr/share/java +execute_process( + COMMAND xmvn-resolve jakarta.activation:jakarta.activation-api:1 + OUTPUT_VARIABLE JAVAX_ACTIVATION_JAR + OUTPUT_STRIP_TRAILING_WHITESPACE ) find_file(JAVAX_ANNOTATIONS_API_JAR -- 2.39.0