This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch UpdateJakartaEEApi10
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/UpdateJakartaEEApi10 by this
push:
new 7da9f0c12e [TOMEE-4061] Derby 10.15.2.0
new b5da358cec Merge pull request #1021 from sultan/plume10derby
7da9f0c12e is described below
commit 7da9f0c12e954ff8bfc3539ecacd7c3df793d681
Author: Swell <[email protected]>
AuthorDate: Tue Feb 7 11:10:04 2023 +0100
[TOMEE-4061] Derby 10.15.2.0
---
.../apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java | 6 +-----
examples/xa-datasource/pom.xml | 2 +-
pom.xml | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
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 7bb43ca320..d2e4afe922 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>10.0.0-SNAPSHOT</tomee.version>
</properties>
<build>
diff --git a/pom.xml b/pom.xml
index c6a1bc924c..73eb9c5def 100644
--- a/pom.xml
+++ b/pom.xml
@@ -235,7 +235,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 -->
