You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2020/11/28 19:38:09 UTC
[tomee] branch master updated: Align all Derby versions
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push:
new 8d6a4ca Align all Derby versions
8d6a4ca is described below
commit 8d6a4ca9d4f9523acdb68de039b30505f6e38713
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Sat Nov 28 20:37:25 2020 +0100
Align all Derby versions
---
container/openejb-core/pom.xml | 8 ++++----
pom.xml | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/container/openejb-core/pom.xml b/container/openejb-core/pom.xml
index cd6ca6a..6b208ad 100644
--- a/container/openejb-core/pom.xml
+++ b/container/openejb-core/pom.xml
@@ -293,20 +293,20 @@
<artifactItem>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.10.1.1</version>
+ <version>${derby.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/drivers</outputDirectory>
- <destFileName>derby-10.10.1.1.jar</destFileName>
+ <destFileName>derby-${derby.version}.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.9.1.0</version>
+ <version>${derby.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/drivers</outputDirectory>
- <destFileName>derby-10.9.1.0.jar</destFileName>
+ <destFileName>derby-${derby.version}.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
diff --git a/pom.xml b/pom.xml
index 416dd8f..deb1ad4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,6 +199,7 @@
<log4j.version>1.2.17</log4j.version>
<log4j2.version>2.0.1</log4j2.version>
<osgi.framework.version>4.2.0</osgi.framework.version>
+ <derby.version>10.14.2.0</derby.version>
<version.hsqldb>2.3.2</version.hsqldb>
<version.axiom>1.2.20</version.axiom>
<version.xalan>2.7.2</version.xalan>