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
commit 905e0e23ac45c0492fa2be5272d1dc45e157b72d Author: Martin Desruisseaux <[email protected]> AuthorDate: Tue Aug 18 23:31:22 2026 +0200 Upgrade Derby and H2 dependencies to latest version. In Derby case, Java 11 compatibility is not a constraint anymore since the the embedded database switched to HSQLDB. --- .../test/org/apache/sis/metadata/sql/TestDatabase.java | 2 +- .../main/org/apache/sis/setup/Configuration.java | 2 +- netbeans-project/ivy.xml | 10 ++++------ settings.gradle.kts | 5 ++--- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/TestDatabase.java b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/TestDatabase.java index bd9d419c42..1855c003ff 100644 --- a/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/TestDatabase.java +++ b/endorsed/src/org.apache.sis.metadata/test/org/apache/sis/metadata/sql/TestDatabase.java @@ -61,7 +61,7 @@ import org.apache.sis.test.TestCase; * * <h2>References</h2> * <ul> - * <li><a href="http://db.apache.org/derby/docs/10.15/adminguide/radminembeddedserverex.html";>Embedded server example</a></li> + * <li><a href="http://db.apache.org/derby/docs/10.17/adminguide/radminembeddedserverex.html";>Embedded server example</a></li> * </ul> * * @author Martin Desruisseaux (Geomatys) diff --git a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/Configuration.java b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/Configuration.java index 9a85f62605..3c076e9370 100644 --- a/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/Configuration.java +++ b/endorsed/src/org.apache.sis.util/main/org/apache/sis/setup/Configuration.java @@ -184,7 +184,7 @@ public final class Configuration { * } * } * - * @see <a href="https://db.apache.org/derby/docs/10.15/devguide/tdevdvlp40464.html";>Shutting down Derby</a> + * @see <a href="https://db.apache.org/derby/docs/10.17/devguide/tdevdvlp40464.html";>Shutting down Derby</a> * * @since 1.5 */ diff --git a/netbeans-project/ivy.xml b/netbeans-project/ivy.xml index 4e265323ba..fdfb1d2909 100644 --- a/netbeans-project/ivy.xml +++ b/netbeans-project/ivy.xml @@ -30,16 +30,14 @@ <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.apache.derby" name="derby" rev="10.17.1.0"/> + <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.3.232"/> + <dependency org="com.h2database" name="h2" rev="2.4.240"/> <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"/> - <dependency org="org.xerial" name="sqlite-jdbc" rev="3.45.1.0"/> - <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"/> <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.22.1"/> diff --git a/settings.gradle.kts b/settings.gradle.kts index b4a19a3276..7721af65e2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -86,8 +86,7 @@ dependencyResolutionManagement { create("drivers") { version("derby") { strictly("[10.0, 11.0[") - prefer("10.15.2.0") // 10.15 is the last series compatible with JDK 11. - // If the derby version is updated, search for that version number in Javadoc. + prefer("10.17.1.0") } // Derby vulnerabiliy: https://nvd.nist.gov/vuln/detail/CVE-2022-46337 // Fix would require an upgrade to Java 21. @@ -95,7 +94,7 @@ dependencyResolutionManagement { library("derby.tools", "org.apache.derby", "derbytools") .versionRef("derby") 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")} + library("h2", "com.h2database", "h2") .version {strictly("[2.0, 3.0["); prefer("2.4.240")} } } }
