This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-4.0 in repository https://gitbox.apache.org/repos/asf/sis.git
commit cbac691f8aeab6ac5f5dfa045d3728333437ea83 Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue Jun 24 11:29:47 2025 +0200 Upgrade some dependencies. --- buildSrc/build.gradle.kts | 2 +- geoapi/snapshot | 2 +- incubator/build.gradle.kts | 6 +++--- netbeans-project/ivy.xml | 16 ++++++++-------- settings.gradle.kts | 12 ++++++------ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index eb6808a8dd..332da05dac 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -34,7 +34,7 @@ repositories { mavenCentral() } dependencies { - implementation (group = "org.apache.commons", name = "commons-compress", version = "1.23.0") + implementation (group = "org.apache.commons", name = "commons-compress", version = "1.27.1") testCompileOnly(group = "org.junit.jupiter", name = "junit-jupiter-api", version = "5.10.3") testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine", version = "5.10.3") } diff --git a/geoapi/snapshot b/geoapi/snapshot index 04262b65da..87e2b78407 160000 --- a/geoapi/snapshot +++ b/geoapi/snapshot @@ -1 +1 @@ -Subproject commit 04262b65da0f14d219e6b7f2876c456a07cdb272 +Subproject commit 87e2b7840794c465e587c29e59913c942ace37fe diff --git a/incubator/build.gradle.kts b/incubator/build.gradle.kts index 228aa7fad8..61159abe16 100644 --- a/incubator/build.gradle.kts +++ b/incubator/build.gradle.kts @@ -57,11 +57,11 @@ dependencies { * Dependencies used only by incubated modules. The dependencies are not declared * in the global `settings.gradle.kts` because incubated modules are not released. */ - implementation(group = "org.antlr", name = "antlr4-maven-plugin", version = "4.11.1") + implementation(group = "org.antlr", name = "antlr4-maven-plugin", version = "4.13.2") implementation(group = "org.xerial", name = "sqlite-jdbc", version = "3.45.1.0") - compileOnly (group = "jakarta.servlet", name = "jakarta.servlet-api", version = "6.0.0") + compileOnly (group = "jakarta.servlet", name = "jakarta.servlet-api", version = "6.1.0") compileOnly (group = "org.osgi", name = "osgi.core", version = "8.0.0") - antlr (group = "org.antlr", name = "antlr4", version = "4.11.1") + antlr (group = "org.antlr", name = "antlr4", version = "4.13.2") } /* diff --git a/netbeans-project/ivy.xml b/netbeans-project/ivy.xml index eea6c320c7..84d86ca69e 100644 --- a/netbeans-project/ivy.xml +++ b/netbeans-project/ivy.xml @@ -13,27 +13,27 @@ <dependencies defaultconf="default"> <dependency org="javax.measure" name="unit-api" rev="2.1.3"/> <dependency org="org.glassfish.jaxb" name="jaxb-runtime" rev="4.0.5"/> - <dependency org="org.eclipse" name="yasson" rev="3.0.3"/> + <dependency org="org.eclipse" name="yasson" rev="3.0.4"/> <dependency org="com.esri.geometry" name="esri-geometry-api" rev="2.2.4"/> <dependency org="org.locationtech.jts" name="jts-core" rev="1.20.0"/> - <dependency org="org.postgresql" name="postgresql" rev="42.7.3"/> + <dependency org="org.postgresql" name="postgresql" rev="42.7.7"/> <dependency org="edu.ucar" name="cdm-core" rev="5.5.3"/> <dependency org="edu.ucar" name="udunits" rev="5.5.3"/> <dependency org="org.jdom" name="jdom2" rev="2.0.6"/> <dependency org="joda-time" name="joda-time" rev="2.10.3"/> <dependency org="com.google.guava" name="guava" rev="30.1-jre"/> - <dependency org="org.libreoffice" name="libreoffice" rev="7.6.7"/> - <dependency org="software.amazon.awssdk" name="s3" rev="2.29.37"/> - <dependency org="org.antlr" name="antlr4-maven-plugin" rev="4.11.1"/> - <dependency org="jakarta.servlet" name="jakarta.servlet-api" rev="6.0.0"/> + <dependency org="org.libreoffice" name="libreoffice" rev="24.8.4"/> + <dependency org="software.amazon.awssdk" name="s3" rev="2.31.68"/> + <dependency org="org.antlr" name="antlr4-maven-plugin" rev="4.13.2"/> + <dependency org="jakarta.servlet" name="jakarta.servlet-api" rev="6.1.0"/> <dependency org="org.osgi" name="osgi.core" rev="8.0.0"/> <dependency org="org.junit.platform" name="junit-platform-launcher" rev="1.10.3"/> <dependency org="org.junit.jupiter" name="junit-jupiter-api" rev="5.10.3"/> <dependency org="org.apache.derby" name="derby" rev="10.15.2.0"/> <dependency org="org.apache.derby" name="derbytools" rev="10.15.2.0"/> <dependency org="org.apache.derby" name="derbyshared" rev="10.15.2.0"/> - <dependency org="org.hsqldb" name="hsqldb" rev="2.7.3"/> - <dependency org="com.h2database" name="h2" rev="2.3.230"/> + <dependency org="org.hsqldb" name="hsqldb" rev="2.7.4"/> + <dependency org="com.h2database" name="h2" rev="2.3.232"/> <dependency org="gov.nist.math" name="jama" rev="1.0.3"/> <dependency org="net.sf.geographiclib" name="GeographicLib-Java" rev="2.0"/> <dependency org="org.xerial" name="sqlite-jdbc" rev="3.45.1.0"/> diff --git a/settings.gradle.kts b/settings.gradle.kts index 58615326dc..4f05185bc3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -63,12 +63,12 @@ dependencyResolutionManagement { library("units", "javax.measure", "unit-api") .version {strictly("[2.1, 3.0["); prefer("2.1.3")} library("jaxb.api", "jakarta.xml.bind", "jakarta.xml.bind-api").version {strictly("[4.0, 5.0["); prefer("4.0.2")} library("jaxb.impl", "org.glassfish.jaxb", "jaxb-runtime") .version {strictly("[4.0, 5.0["); prefer("4.0.5")} - library("yasson", "org.eclipse", "yasson") .version {strictly("[3.0, 4.0["); prefer("3.0.3")} + library("yasson", "org.eclipse", "yasson") .version {strictly("[3.0, 4.0["); prefer("3.0.4")} library("jts.core", "org.locationtech.jts", "jts-core") .version {strictly("[1.15, 2.0["); prefer("1.20.0")} library("esri.geometry", "com.esri.geometry", "esri-geometry-api") .version {strictly("[2.0, 3.0["); prefer("2.2.4")} - library("libreoffice", "org.libreoffice", "libreoffice") .version {strictly("[7.0, 8.0["); prefer("7.6.7")} + library("libreoffice", "org.libreoffice", "libreoffice") .version {strictly("[7.0, 8.0["); prefer("24.8.4")} library("ucar", "edu.ucar", "cdm-core") .version {strictly("[5.0, 6.0["); prefer("5.5.3")} - library("aws.s3", "software.amazon.awssdk", "s3") .version {strictly("[2.0, 3.0["); prefer("2.29.37")} + library("aws.s3", "software.amazon.awssdk", "s3") .version {strictly("[2.0, 3.0["); prefer("2.31.68")} } create("tests") { library("geoapi", "org.opengis", "geoapi-conformance") .version {strictly(geoapiVersion)} @@ -90,9 +90,9 @@ dependencyResolutionManagement { // Fix would require an upgrade to Java 21. library("derby.core", "org.apache.derby", "derby") .versionRef("derby") library("derby.tools", "org.apache.derby", "derbytools") .versionRef("derby") - library("postgres", "org.postgresql", "postgresql") .version {prefer("42.7.3")} - library("hsql", "org.hsqldb", "hsqldb") .version {strictly("[2.0, 3.0["); prefer("2.7.3")} - library("h2", "com.h2database", "h2") .version {strictly("[2.0, 3.0["); prefer("2.3.230")} + library("postgres", "org.postgresql", "postgresql") .version {prefer("42.7.7")} + library("hsql", "org.hsqldb", "hsqldb") .version {strictly("[2.0, 3.0["); prefer("2.7.4")} + library("h2", "com.h2database", "h2") .version {strictly("[2.0, 3.0["); prefer("2.3.232")} } } }
