This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new c4eb3bfe46 Upgrade some dependencies.
c4eb3bfe46 is described below
commit c4eb3bfe4667315e974e820586d107148e648a27
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Fri Oct 9 12:27:05 2026 +0200
Upgrade some dependencies.
---
buildSrc/build.gradle.kts | 2 +-
netbeans-project/ivy.xml | 20 ++++++++---------
.../sis/referencing/factory/sql/epsg/README.md | 4 ++--
settings.gradle.kts | 26 ++++++++++------------
4 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 332da05dac..632438044f 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.27.1")
+ implementation (group = "org.apache.commons", name = "commons-compress",
version = "1.28.0")
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/netbeans-project/ivy.xml b/netbeans-project/ivy.xml
index fdfb1d2909..8d772cd9af 100644
--- a/netbeans-project/ivy.xml
+++ b/netbeans-project/ivy.xml
@@ -12,19 +12,19 @@
<info organisation="org.apache" module="sis"/>
<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.4"/>
+ <dependency org="org.glassfish.jaxb" name="jaxb-runtime"
rev="4.0.9"/>
+ <dependency org="org.eclipse" name="yasson"
rev="3.0.5"/>
<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="com.google.geometry" name="s2-geometry"
rev="2.0.0"/>
- <dependency org="org.postgresql" name="postgresql"
rev="42.7.7"/>
- <dependency org="edu.ucar" name="cdm-core"
rev="5.9.1"/>
- <dependency org="edu.ucar" name="udunits"
rev="5.9.1"/>
+ <dependency org="org.postgresql" name="postgresql"
rev="42.7.9"/>
+ <dependency org="edu.ucar" name="cdm-core"
rev="5.11.0"/>
+ <dependency org="edu.ucar" name="udunits"
rev="5.11.0"/>
<dependency org="org.jdom" name="jdom2"
rev="2.0.6.1"/>
<dependency org="joda-time" name="joda-time"
rev="2.12.7"/>
- <dependency org="com.google.guava" name="guava"
rev="33.4.8-jre"/>
- <dependency org="org.libreoffice" name="libreoffice"
rev="24.8.4"/>
- <dependency org="software.amazon.awssdk" name="s3"
rev="2.33.4"/>
+ <dependency org="com.google.guava" name="guava"
rev="33.7.2-jre"/>
+ <dependency org="org.libreoffice" name="libreoffice"
rev="26.2.2"/>
+ <dependency org="software.amazon.awssdk" name="s3"
rev="2.55.9"/>
<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"/>
@@ -34,9 +34,9 @@
<dependency org="org.apache.derby" name="derbytools"
rev="10.17.1.0"/>
<dependency org="org.apache.derby" name="derbyshared"
rev="10.17.1.0"/>
<dependency org="org.hsqldb" name="hsqldb"
rev="2.7.4"/>
- <dependency org="com.h2database" name="h2"
rev="2.4.240"/>
+ <dependency org="com.h2database" name="h2"
rev="2.5.252"/>
<dependency org="gov.nist.math" name="jama"
rev="1.0.3"/>
- <dependency org="net.sf.geographiclib" name="GeographicLib-Java"
rev="2.0"/>
+ <dependency org="net.sf.geographiclib" name="GeographicLib-Java"
rev="2.1"/>
<dependency org="org.xerial" name="sqlite-jdbc"
rev="3.45.1.0"/>
<dependency org="com.fasterxml.jackson.core" name="jackson-core"
rev="2.22.1"/>
<dependency org="com.fasterxml.jackson.core"
name="jackson-annotations" rev="2.22"/>
diff --git
a/optional/src/org.apache.sis.referencing.epsg/test/org/apache/sis/referencing/factory/sql/epsg/README.md
b/optional/src/org.apache.sis.referencing.epsg/test/org/apache/sis/referencing/factory/sql/epsg/README.md
index eb4dfa1afd..cebac96f65 100644
---
a/optional/src/org.apache.sis.referencing.epsg/test/org/apache/sis/referencing/factory/sql/epsg/README.md
+++
b/optional/src/org.apache.sis.referencing.epsg/test/org/apache/sis/referencing/factory/sql/epsg/README.md
@@ -67,9 +67,9 @@ export NON_FREE_DIR=$PWD
cd _<path to SIS project directory>_
gradle clean test jar
export CLASSPATH=~/.m2/repository/org/hsqldb/hsqldb/2.7.4/hsqldb-2.7.4.jar
-export
CLASSPATH=~/.m2/repository/org/postgresql/postgresql/42.7.7/postgresql-42.7.7.jar:$CLASSPATH
+export
CLASSPATH=~/.m2/repository/org/postgresql/postgresql/42.7.9/postgresql-42.7.9.jar:$CLASSPATH
export
CLASSPATH=~/.m2/repository/javax/measure/unit-api/2.1.3/unit-api-2.1.3.jar:$CLASSPATH
-export
CLASSPATH=~/.m2/repository/jakarta/xml/bind/jakarta.xml.bind-api/4.0.4/jakarta.xml.bind-api-4.0.4.jar:$CLASSPATH
+export
CLASSPATH=~/.m2/repository/jakarta/xml/bind/jakarta.xml.bind-api/4.0.5/jakarta.xml.bind-api-4.0.5.jar:$CLASSPATH
export
CLASSPATH=$PWD/geoapi/snapshot/geoapi/target/geoapi-4.0-SNAPSHOT.jar:$CLASSPATH
export
CLASSPATH=$PWD/endorsed/build/libs/org.apache.sis.referencing.jar:$CLASSPATH
export
CLASSPATH=$PWD/endorsed/build/libs/org.apache.sis.metadata.jar:$CLASSPATH
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7721af65e2..bdaf8ba40c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -61,24 +61,24 @@ dependencyResolutionManagement {
create("libs") {
library("geoapi", "org.opengis",
"geoapi-pending") .version {strictly(geoapiVersion)}
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.4")}
+ library("jaxb.api", "jakarta.xml.bind",
"jakarta.xml.bind-api").version {strictly("[4.0, 5.0["); prefer("4.0.5")}
+ library("jaxb.impl", "org.glassfish.jaxb", "jaxb-runtime")
.version {strictly("[4.0, 5.0["); prefer("4.0.9")}
+ library("yasson", "org.eclipse", "yasson")
.version {strictly("[3.0, 4.0["); prefer("3.0.5")}
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("s2.geometry", "com.google.geometry", "s2-geometry")
.version {strictly("[2.0.0, 2.0.0]"); prefer("2.0.0")}
- 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.9.1")}
- library("udunits", "edu.ucar", "udunits")
.version {strictly("[5.0, 6.0["); prefer("5.9.1")}
- library("guava", "com.google.guava", "guava")
.version { prefer("33.4.8-jre")}
- library("aws.s3", "software.amazon.awssdk", "s3")
.version {strictly("[2.0, 3.0["); prefer("2.33.4")}
+ library("s2.geometry", "com.google.geometry", "s2-geometry")
.version { prefer("2.0.0")}
+ library("libreoffice", "org.libreoffice", "libreoffice")
.version { prefer("26.2.2")}
+ library("ucar", "edu.ucar", "cdm-core")
.version {strictly("[5.0, 6.0["); prefer("5.11.0")}
+ library("udunits", "edu.ucar", "udunits")
.version {strictly("[5.0, 6.0["); prefer("5.11.0")}
+ library("guava", "com.google.guava", "guava")
.version { prefer("33.7.2-jre")}
+ library("aws.s3", "software.amazon.awssdk", "s3")
.version {strictly("[2.0, 3.0["); prefer("2.55.9")}
}
create("tests") {
library("geoapi", "org.opengis",
"geoapi-conformance") .version {strictly(geoapiVersion)}
library("junit5", "org.junit.jupiter",
"junit-jupiter-api") .version {strictly("5.10.3")}
library("jupiter", "org.junit.jupiter",
"junit-jupiter-engine") .version {strictly("5.10.3")}
library("jama", "gov.nist.math", "jama")
.version {strictly("1.0.3")}
- library("geographiclib", "net.sf.geographiclib",
"GeographicLib-Java") .version {strictly("2.0")}
+ library("geographiclib", "net.sf.geographiclib",
"GeographicLib-Java") .version {strictly("2.1")}
library("slf4j", "org.slf4j",
"slf4j-jdk14").version {
prefer("2.0.17") // Should match the version used
by UCAR.
}
@@ -88,13 +88,11 @@ dependencyResolutionManagement {
strictly("[10.0, 11.0[")
prefer("10.17.1.0")
}
- // Derby vulnerabiliy:
https://nvd.nist.gov/vuln/detail/CVE-2022-46337
- // 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.7")}
+ library("postgres", "org.postgresql", "postgresql")
.version {prefer("42.7.9")}
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.4.240")}
+ library("h2", "com.h2database", "h2")
.version {strictly("[2.0, 3.0["); prefer("2.5.252")}
}
}
}
