You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2023/02/07 07:05:57 UTC
[tomee] branch tomee-9.x updated: [TOMEE-4061] Derby 10.15.2.0
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-9.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/tomee-9.x by this push:
new 05706dc5bd [TOMEE-4061] Derby 10.15.2.0
05706dc5bd is described below
commit 05706dc5bd13e2093e4a9ab9d23121d68552ddf4
Author: Swell <57...@users.noreply.github.com>
AuthorDate: Tue Oct 4 17:55:18 2022 +0200
[TOMEE-4061] Derby 10.15.2.0
---
arquillian/arquillian-tomee-remote/pom.xml | 6 ++++++
.../apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java | 6 +-----
examples/xa-datasource/pom.xml | 2 +-
pom.xml | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/arquillian/arquillian-tomee-remote/pom.xml b/arquillian/arquillian-tomee-remote/pom.xml
index c59e74bcfb..2e12567d0c 100644
--- a/arquillian/arquillian-tomee-remote/pom.xml
+++ b/arquillian/arquillian-tomee-remote/pom.xml
@@ -186,6 +186,12 @@
<version>${version.derby}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${version.derby}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java
index 5a4ff6ebe2..253b24be00 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java
@@ -58,11 +58,7 @@ public class AlternateDriverJarTest {
p.put("JdbcOne.Password", PASSWORD);
p.put("JdbcOne.JtaManaged", "false");
- final File file = new File(drivers, "derby-10.14.2.0.jar");
- Assert.assertTrue("Failed to find: " + file, file.exists());
-
- p.put("JdbcTwo", "new://Resource?type=DataSource&classpath="
- + file.getAbsolutePath().replace("\\", "/"));
+ p.put("JdbcTwo", "new://Resource?type=DataSource&classpath=mvn:org.apache.derby:derby:10.14.2.0");
p.put("JdbcTwo.JdbcDriver", "org.apache.derby.jdbc.EmbeddedDriver");
p.put("JdbcTwo.JdbcUrl", "jdbc:derby:memory:JdbcTwo;create=true");
p.put("JdbcTwo.UserName", USER);
diff --git a/examples/xa-datasource/pom.xml b/examples/xa-datasource/pom.xml
index 40f502c35a..3f186a7a86 100644
--- a/examples/xa-datasource/pom.xml
+++ b/examples/xa-datasource/pom.xml
@@ -26,7 +26,7 @@
<name>TomEE :: Examples :: XA Datasource configuration and usage</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.derby>10.14.2.0</version.derby>
+ <version.derby>10.15.2.0</version.derby>
<tomee.version>9.0.1-SNAPSHOT</tomee.version>
</properties>
<build>
diff --git a/pom.xml b/pom.xml
index cc0a4cae17..63358faf52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,7 +234,7 @@
<version.deltaspike>1.9.6</version.deltaspike>
<!-- JDBC Drivers -->
- <version.derby>10.14.2.0</version.derby>
+ <version.derby>10.15.2.0</version.derby>
<version.hsqldb>2.7.1</version.hsqldb>
<!-- unused properties -->