From 632749e6f36f4eed33dc1f5df4a25a544dd2bae1 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Mon, 1 Sep 2025 08:13:46 -0700 Subject: [PATCH] [build] Upgrade Maven dependencies (#8173) --- WORKSPACE | 12 ++++++------ wpimath/CMakeLists.txt | 30 +++++++++++++++--------------- wpimath/build.gradle | 10 +++++----- wpiutil/CMakeLists.txt | 20 ++++++++++---------- wpiutil/build.gradle | 8 ++++---- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index eb731acfd2..c3af356395 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -15,12 +15,12 @@ rules_jvm_external_deps() load("@rules_jvm_external//:defs.bzl", "maven_install") maven_artifacts = [ - "org.ejml:ejml-simple:0.43.1", - "com.fasterxml.jackson.core:jackson-annotations:2.15.2", - "com.fasterxml.jackson.core:jackson-core:2.15.2", - "com.fasterxml.jackson.core:jackson-databind:2.15.2", - "us.hebi.quickbuf:quickbuf-runtime:1.3.3", - "com.google.code.gson:gson:2.10.1", + "org.ejml:ejml-simple:0.44.0", + "com.fasterxml.jackson.core:jackson-annotations:2.19.2", + "com.fasterxml.jackson.core:jackson-core:2.19.2", + "com.fasterxml.jackson.core:jackson-databind:2.19.2", + "us.hebi.quickbuf:quickbuf-runtime:1.4", + "com.google.code.gson:gson:2.13.1", ] maven_install( diff --git a/wpimath/CMakeLists.txt b/wpimath/CMakeLists.txt index 348fef5e99..a36670f502 100644 --- a/wpimath/CMakeLists.txt +++ b/wpimath/CMakeLists.txt @@ -21,39 +21,39 @@ file( if(WITH_JAVA) include(UseJava) - if(NOT EXISTS "${WPILIB_BINARY_DIR}/wpimath/thirdparty/ejml/ejml-simple-0.43.1.jar") + if(NOT EXISTS "${WPILIB_BINARY_DIR}/wpimath/thirdparty/ejml/ejml-simple-0.44.0.jar") set(BASE_URL "https://search.maven.org/remotecontent?filepath=") set(JAR_ROOT "${WPILIB_BINARY_DIR}/wpimath/thirdparty/ejml") message(STATUS "Downloading EJML jarfiles...") download_and_check( - "${BASE_URL}org/ejml/ejml-cdense/0.43.1/ejml-cdense-0.43.1.jar" - "${JAR_ROOT}/ejml-cdense-0.43.1.jar" + "${BASE_URL}org/ejml/ejml-cdense/0.44.0/ejml-cdense-0.44.0.jar" + "${JAR_ROOT}/ejml-cdense-0.44.0.jar" ) download_and_check( - "${BASE_URL}org/ejml/ejml-core/0.43.1/ejml-core-0.43.1.jar" - "${JAR_ROOT}/ejml-core-0.43.1.jar" + "${BASE_URL}org/ejml/ejml-core/0.44.0/ejml-core-0.44.0.jar" + "${JAR_ROOT}/ejml-core-0.44.0.jar" ) download_and_check( - "${BASE_URL}org/ejml/ejml-ddense/0.43.1/ejml-ddense-0.43.1.jar" - "${JAR_ROOT}/ejml-ddense-0.43.1.jar" + "${BASE_URL}org/ejml/ejml-ddense/0.44.0/ejml-ddense-0.44.0.jar" + "${JAR_ROOT}/ejml-ddense-0.44.0.jar" ) download_and_check( - "${BASE_URL}org/ejml/ejml-dsparse/0.43.1/ejml-dsparse-0.43.1.jar" - "${JAR_ROOT}/ejml-dsparse-0.43.1.jar" + "${BASE_URL}org/ejml/ejml-dsparse/0.44.0/ejml-dsparse-0.44.0.jar" + "${JAR_ROOT}/ejml-dsparse-0.44.0.jar" ) download_and_check( - "${BASE_URL}org/ejml/ejml-fdense/0.43.1/ejml-fdense-0.43.1.jar" - "${JAR_ROOT}/ejml-fdense-0.43.1.jar" + "${BASE_URL}org/ejml/ejml-fdense/0.44.0/ejml-fdense-0.44.0.jar" + "${JAR_ROOT}/ejml-fdense-0.44.0.jar" ) download_and_check( - "${BASE_URL}org/ejml/ejml-simple/0.43.1/ejml-simple-0.43.1.jar" - "${JAR_ROOT}/ejml-simple-0.43.1.jar" + "${BASE_URL}org/ejml/ejml-simple/0.44.0/ejml-simple-0.44.0.jar" + "${JAR_ROOT}/ejml-simple-0.44.0.jar" ) download_and_check( - "${BASE_URL}org/ejml/ejml-zdense/0.43.1/ejml-zdense-0.43.1.jar" - "${JAR_ROOT}/ejml-zdense-0.43.1.jar" + "${BASE_URL}org/ejml/ejml-zdense/0.44.0/ejml-zdense-0.44.0.jar" + "${JAR_ROOT}/ejml-zdense-0.44.0.jar" ) message(STATUS "All files downloaded.") diff --git a/wpimath/build.gradle b/wpimath/build.gradle index 9cb07b416e..a36af333e8 100644 --- a/wpimath/build.gradle +++ b/wpimath/build.gradle @@ -83,11 +83,11 @@ nativeUtils.exportsConfigs { dependencies { api project(":wpiunits") - api "org.ejml:ejml-simple:0.43.1" - api "com.fasterxml.jackson.core:jackson-annotations:2.15.2" - api "com.fasterxml.jackson.core:jackson-core:2.15.2" - api "com.fasterxml.jackson.core:jackson-databind:2.15.2" - api "us.hebi.quickbuf:quickbuf-runtime:1.3.3" + api "org.ejml:ejml-simple:0.44.0" + api "com.fasterxml.jackson.core:jackson-annotations:2.19.2" + api "com.fasterxml.jackson.core:jackson-core:2.19.2" + api "com.fasterxml.jackson.core:jackson-databind:2.19.2" + api "us.hebi.quickbuf:quickbuf-runtime:1.4" } sourceSets.main.java.srcDir "${projectDir}/src/generated/main/java" diff --git a/wpiutil/CMakeLists.txt b/wpiutil/CMakeLists.txt index 15e0c7b85c..05359d90b6 100644 --- a/wpiutil/CMakeLists.txt +++ b/wpiutil/CMakeLists.txt @@ -16,23 +16,23 @@ file( if(WITH_JAVA) include(UseJava) - if(NOT EXISTS "${WPILIB_BINARY_DIR}/wpiutil/thirdparty/jackson/jackson-core-2.15.2.jar") + if(NOT EXISTS "${WPILIB_BINARY_DIR}/wpiutil/thirdparty/jackson/jackson-core-2.19.2.jar") set(BASE_URL "https://search.maven.org/remotecontent?filepath=") set(JAR_ROOT "${WPILIB_BINARY_DIR}/wpiutil/thirdparty/jackson") message(STATUS "Downloading Jackson jarfiles...") download_and_check( - "${BASE_URL}com/fasterxml/jackson/core/jackson-core/2.15.2/jackson-core-2.15.2.jar" - "${JAR_ROOT}/jackson-core-2.15.2.jar" + "${BASE_URL}com/fasterxml/jackson/core/jackson-core/2.19.2/jackson-core-2.19.2.jar" + "${JAR_ROOT}/jackson-core-2.19.2.jar" ) download_and_check( - "${BASE_URL}com/fasterxml/jackson/core/jackson-databind/2.15.2/jackson-databind-2.15.2.jar" - "${JAR_ROOT}/jackson-databind-2.15.2.jar" + "${BASE_URL}com/fasterxml/jackson/core/jackson-databind/2.19.2/jackson-databind-2.19.2.jar" + "${JAR_ROOT}/jackson-databind-2.19.2.jar" ) download_and_check( - "${BASE_URL}com/fasterxml/jackson/core/jackson-annotations/2.15.2/jackson-annotations-2.15.2.jar" - "${JAR_ROOT}/jackson-annotations-2.15.2.jar" + "${BASE_URL}com/fasterxml/jackson/core/jackson-annotations/2.19.2/jackson-annotations-2.19.2.jar" + "${JAR_ROOT}/jackson-annotations-2.19.2.jar" ) message(STATUS "All files downloaded.") @@ -40,14 +40,14 @@ if(WITH_JAVA) file(GLOB JACKSON_JARS ${WPILIB_BINARY_DIR}/wpiutil/thirdparty/jackson/*.jar) - if(NOT EXISTS "${WPILIB_BINARY_DIR}/wpiutil/thirdparty/quickbuf/quickbuf-runtime-1.3.3.jar") + if(NOT EXISTS "${WPILIB_BINARY_DIR}/wpiutil/thirdparty/quickbuf/quickbuf-runtime-1.4.jar") set(BASE_URL "https://search.maven.org/remotecontent?filepath=") set(JAR_ROOT "${WPILIB_BINARY_DIR}/wpiutil/thirdparty/quickbuf") message(STATUS "Downloading Quickbuf jarfile...") download_and_check( - "${BASE_URL}us/hebi/quickbuf/quickbuf-runtime/1.3.3/quickbuf-runtime-1.3.3.jar" - "${JAR_ROOT}/quickbuf-runtime-1.3.3.jar" + "${BASE_URL}us/hebi/quickbuf/quickbuf-runtime/1.4/quickbuf-runtime-1.4.jar" + "${JAR_ROOT}/quickbuf-runtime-1.4.jar" ) message(STATUS "Downloaded.") diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle index b4c0aab333..40a98907a7 100644 --- a/wpiutil/build.gradle +++ b/wpiutil/build.gradle @@ -301,10 +301,10 @@ task runPrintLog(type: JavaExec) { } dependencies { - api "com.fasterxml.jackson.core:jackson-annotations:2.15.2" - api "com.fasterxml.jackson.core:jackson-core:2.15.2" - api "com.fasterxml.jackson.core:jackson-databind:2.15.2" - api 'us.hebi.quickbuf:quickbuf-runtime:1.3.3' + api "com.fasterxml.jackson.core:jackson-annotations:2.19.2" + api "com.fasterxml.jackson.core:jackson-core:2.19.2" + api "com.fasterxml.jackson.core:jackson-databind:2.19.2" + api 'us.hebi.quickbuf:quickbuf-runtime:1.4' printlogImplementation sourceSets.main.output }