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 a5835a6c1cb0883f51c8021a96f11ef9829f6ae7
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Dec 10 15:32:47 2022 +0100
Upgrade Derby dependency to series 10.15, which is the last series
compatible with Java 11.
---
application/sis-console/pom.xml | 5 +++++
application/sis-javafx/pom.xml | 5 +++++
application/sis-openoffice/pom.xml | 5 +++++
core/sis-metadata/pom.xml | 5 +++++
core/sis-referencing-by-identifiers/pom.xml | 5 +++++
core/sis-referencing/pom.xml | 5 +++++
ide-project/NetBeans/nbproject/project.properties | 6 +++++-
pom.xml | 8 +++++++-
storage/pom.xml | 5 +++++
storage/sis-sqlstore/pom.xml | 5 +++++
10 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/application/sis-console/pom.xml b/application/sis-console/pom.xml
index 26c640bc56..1a2a8de793 100644
--- a/application/sis-console/pom.xml
+++ b/application/sis-console/pom.xml
@@ -120,6 +120,11 @@
<artifactId>derby</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- Test dependencies -->
<dependency>
diff --git a/application/sis-javafx/pom.xml b/application/sis-javafx/pom.xml
index 93549d369d..288e90bd76 100644
--- a/application/sis-javafx/pom.xml
+++ b/application/sis-javafx/pom.xml
@@ -173,6 +173,11 @@
<artifactId>derby</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<!-- Test dependencies -->
<dependency>
diff --git a/application/sis-openoffice/pom.xml
b/application/sis-openoffice/pom.xml
index b588a5d4ea..f3f7e939f9 100644
--- a/application/sis-openoffice/pom.xml
+++ b/application/sis-openoffice/pom.xml
@@ -132,6 +132,11 @@
<artifactId>derby</artifactId>
<scope>runtime</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</profile>
</profiles>
diff --git a/core/sis-metadata/pom.xml b/core/sis-metadata/pom.xml
index 2721092845..013bb1633a 100644
--- a/core/sis-metadata/pom.xml
+++ b/core/sis-metadata/pom.xml
@@ -164,6 +164,11 @@
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
diff --git a/core/sis-referencing-by-identifiers/pom.xml
b/core/sis-referencing-by-identifiers/pom.xml
index 7efb9707cc..13e7fedd3c 100644
--- a/core/sis-referencing-by-identifiers/pom.xml
+++ b/core/sis-referencing-by-identifiers/pom.xml
@@ -144,6 +144,11 @@
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/core/sis-referencing/pom.xml b/core/sis-referencing/pom.xml
index 09367012f9..8584a8373e 100644
--- a/core/sis-referencing/pom.xml
+++ b/core/sis-referencing/pom.xml
@@ -169,6 +169,11 @@
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
diff --git a/ide-project/NetBeans/nbproject/project.properties
b/ide-project/NetBeans/nbproject/project.properties
index 3b2f26b94e..641e600dfe 100644
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@ -121,7 +121,7 @@ cm-logging.version = 1.2
slf4j.version = 1.7.28
junit.version = 4.13.2
hamcrest.version = 1.3
-derby.version = 10.14.2.0
+derby.version = 10.15.2.0
hsqldb.version = 2.7.1
h2.version = 2.1.214
postgresql.version = 42.5.1
@@ -149,6 +149,8 @@ javac.processorpath=\
javac.test.classpath=\
${javac.classpath}:\
${maven.repository}/org/apache/derby/derby/${derby.version}/derby-${derby.version}.jar:\
+
${maven.repository}/org/apache/derby/derbytools/${derby.version}/derbytools-${derby.version}.jar:\
+
${maven.repository}/org/apache/derby/derbyshared/${derby.version}/derbyshared-${derby.version}.jar:\
${maven.repository}/org/hsqldb/hsqldb/${hsqldb.version}/hsqldb-${hsqldb.version}.jar:\
${maven.repository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar:\
${maven.repository}/gov/nist/math/jama/${jama.version}/jama-${jama.version}.jar:\
@@ -179,6 +181,8 @@ run.classpath=\
${build.classes.dir}:\
${run.jaxb.classpath}:\
${maven.repository}/org/apache/derby/derby/${derby.version}/derby-${derby.version}.jar:\
+
${maven.repository}/org/apache/derby/derbytools/${derby.version}/derbytools-${derby.version}.jar:\
+
${maven.repository}/org/apache/derby/derbyshared/${derby.version}/derbyshared-${derby.version}.jar:\
${run.netcdf.classpath}
run.test.classpath=\
${javac.test.classpath}:\
diff --git a/pom.xml b/pom.xml
index f5e7421ed3..29575fe45d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -486,7 +486,13 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.14.2.0</version> <!-- 10.14 is the last series
compatible with JDK 8. -->
+ <version>10.15.2.0</version> <!-- 10.15 is the last series
compatible with JDK 11. -->
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>10.15.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/storage/pom.xml b/storage/pom.xml
index 1172482c55..4287379b06 100644
--- a/storage/pom.xml
+++ b/storage/pom.xml
@@ -149,6 +149,11 @@
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.sis.core</groupId>
<artifactId>sis-utility</artifactId>
diff --git a/storage/sis-sqlstore/pom.xml b/storage/sis-sqlstore/pom.xml
index cf1f6f385c..1e1b16d0a7 100644
--- a/storage/sis-sqlstore/pom.xml
+++ b/storage/sis-sqlstore/pom.xml
@@ -129,6 +129,11 @@
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
