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 5a43124658824900072d52c57eb86d5a2b844fed
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Thu Sep 28 11:49:07 2023 +0200
Upgrade dependencies
---
netbeans-project/ivy.xml | 8 ++++----
settings.gradle.kts | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/netbeans-project/ivy.xml b/netbeans-project/ivy.xml
index 01c97e7812..a0b405974e 100644
--- a/netbeans-project/ivy.xml
+++ b/netbeans-project/ivy.xml
@@ -12,7 +12,7 @@
<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.2"/>
+ <dependency org="org.glassfish.jaxb" name="jaxb-runtime"
rev="4.0.3"/>
<dependency org="com.esri.geometry" name="esri-geometry-api"
rev="2.2.4"/>
<dependency org="org.locationtech.jts" name="jts-core"
rev="1.19.0"/>
<dependency org="org.postgresql" name="postgresql"
rev="42.6.0"/>
@@ -21,8 +21,8 @@
<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.3.6"/>
- <dependency org="software.amazon.awssdk" name="s3"
rev="2.18.40"/>
+ <dependency org="org.libreoffice" name="libreoffice"
rev="7.6.1"/>
+ <dependency org="software.amazon.awssdk" name="s3"
rev="2.20.155"/>
<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.osgi" name="osgi.core"
rev="8.0.0"/>
@@ -34,7 +34,7 @@
<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.2"/>
- <dependency org="com.h2database" name="h2"
rev="2.2.220"/>
+ <dependency org="com.h2database" name="h2"
rev="2.2.224"/>
<dependency org="gov.nist.math" name="jama"
rev="1.0.3"/>
<dependency org="net.sf.geographiclib" name="GeographicLib-Java"
rev="2.0"/>
</dependencies>
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 152fff8b2a..6f5cf90996 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -59,13 +59,13 @@ 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.0")}
- library("jaxb.impl", "org.glassfish.jaxb", "jaxb-runtime")
.version {strictly("[4.0, 5.0["); prefer("4.0.2")}
+ library("jaxb.api", "jakarta.xml.bind",
"jakarta.xml.bind-api").version {strictly("[4.0, 5.0["); prefer("4.0.1")}
+ library("jaxb.impl", "org.glassfish.jaxb", "jaxb-runtime")
.version {strictly("[4.0, 5.0["); prefer("4.0.3")}
library("jts.core", "org.locationtech.jts", "jts-core")
.version {strictly("[1.15, 2.0["); prefer("1.19.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.3.6")}
+ library("libreoffice", "org.libreoffice", "libreoffice")
.version {strictly("[7.0, 8.0["); prefer("7.6.1")}
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.18.40")}
+ library("aws.s3", "software.amazon.awssdk", "s3")
.version {strictly("[2.0, 3.0["); prefer("2.20.155")}
}
create("tests") {
library("geoapi", "org.opengis",
"geoapi-conformance") .version {strictly(geoapiVersion)}
@@ -88,7 +88,7 @@ dependencyResolutionManagement {
library("derby.tools", "org.apache.derby", "derbytools")
.versionRef("derby")
library("postgres", "org.postgresql", "postgresql")
.version {prefer("42.6.0")}
library("hsql", "org.hsqldb", "hsqldb")
.version {strictly("[2.0, 3.0["); prefer("2.7.2")}
- library("h2", "com.h2database", "h2")
.version {strictly("[2.0, 3.0["); prefer("2.2.220")}
+ library("h2", "com.h2database", "h2")
.version {strictly("[2.0, 3.0["); prefer("2.2.224")}
}
}
}
