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
The following commit(s) were added to refs/heads/geoapi-4.0 by this push:
new 50721b3016 Upgrade UCAR dependency.
50721b3016 is described below
commit 50721b3016357b2fa224d6892308e3ebd2235d30
Author: Martin Desruisseaux <[email protected]>
AuthorDate: Wed Dec 17 18:37:47 2025 +0100
Upgrade UCAR dependency.
---
endorsed/build.gradle.kts | 4 ++++
.../main/org/apache/sis/xml/internal/shared/InputFactory.java | 2 +-
.../main/org/apache/sis/storage/xml/stream/StaxDataStore.java | 2 +-
netbeans-project/ivy.xml | 10 +++++-----
settings.gradle.kts | 6 ++++--
5 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/endorsed/build.gradle.kts b/endorsed/build.gradle.kts
index 5264751da8..8594f8bac3 100644
--- a/endorsed/build.gradle.kts
+++ b/endorsed/build.gradle.kts
@@ -65,6 +65,8 @@ dependencies {
compileOnly(libs.esri.geometry)
compileOnly(libs.libreoffice)
compileOnly(libs.ucar)
+ compileOnly(libs.udunits)
+ compileOnly(libs.guava)
compileOnly(libs.aws.s3)
compileOnly(drivers.postgres)
runtimeOnly(drivers.derby.core)
@@ -79,6 +81,8 @@ dependencies {
testImplementation(libs.esri.geometry) // Idem.
testImplementation(libs.libreoffice)
testImplementation(libs.ucar)
+ testImplementation(libs.udunits)
+ testImplementation(libs.guava)
testImplementation(libs.aws.s3)
testImplementation(drivers.derby.tools)
testImplementation(drivers.derby.core)
diff --git
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/InputFactory.java
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/InputFactory.java
index 1fd6bd6437..bc7aba5439 100644
---
a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/InputFactory.java
+++
b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/xml/internal/shared/InputFactory.java
@@ -58,7 +58,7 @@ public final class InputFactory {
FACTORY.setProperty(XMLConstants.FEATURE_SECURE_PROCESSING,
Boolean.TRUE);
}
if
("all".equals(FACTORY.getProperty(XMLConstants.ACCESS_EXTERNAL_DTD))) {
- FACTORY.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD,
"http,https");
+ FACTORY.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
}
}
diff --git
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStore.java
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStore.java
index 2c72f7f75a..eb7a851324 100644
---
a/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStore.java
+++
b/endorsed/src/org.apache.sis.storage.xml/main/org/apache/sis/storage/xml/stream/StaxDataStore.java
@@ -390,7 +390,7 @@ public abstract class StaxDataStore extends URIDataStore {
factory.setProperty(XMLConstants.FEATURE_SECURE_PROCESSING,
Boolean.TRUE);
}
if
("all".equals(factory.getProperty(XMLConstants.ACCESS_EXTERNAL_DTD))) {
- factory.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD,
"http,https");
+ factory.setProperty(XMLConstants.ACCESS_EXTERNAL_DTD, "");
}
factory.setXMLReporter(configuration);
inputFactory = factory; // Set only on success.
diff --git a/netbeans-project/ivy.xml b/netbeans-project/ivy.xml
index 489f8cf876..ff5f29fe8f 100644
--- a/netbeans-project/ivy.xml
+++ b/netbeans-project/ivy.xml
@@ -17,11 +17,11 @@
<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.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="edu.ucar" name="cdm-core"
rev="5.9.1"/>
+ <dependency org="edu.ucar" name="udunits"
rev="5.9.1"/>
+ <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="org.antlr" name="antlr4-maven-plugin"
rev="4.13.2"/>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c173374243..a1a360e416 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -67,7 +67,9 @@ dependencyResolutionManagement {
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("24.8.4")}
- library("ucar", "edu.ucar", "cdm-core")
.version {strictly("[5.0, 6.0["); prefer("5.5.3")}
+ 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")}
}
create("tests") {
@@ -77,7 +79,7 @@ dependencyResolutionManagement {
library("jama", "gov.nist.math", "jama")
.version {strictly("1.0.3")}
library("geographiclib", "net.sf.geographiclib",
"GeographicLib-Java") .version {strictly("2.0")}
library("slf4j", "org.slf4j",
"slf4j-jdk14").version {
- prefer("1.7.28") // Should match the version used
by UCAR.
+ prefer("2.0.17") // Should match the version used
by UCAR.
}
}
create("drivers") {
