openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject [openjpa] 01/02: OPENJPA-2754 update to latest dbcp2 SNAPSHOT
Date Sun, 28 Oct 2018 12:08:47 GMT
This is an automated email from the ASF dual-hosted git repository.

struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git

commit 5c38bfaa49a2f9485a690e147f07399047f7d2d2
Author: Mark Struberg <struberg@apache.org>
AuthorDate: Sun Oct 28 13:05:08 2018 +0100

    OPENJPA-2754 update to latest dbcp2 SNAPSHOT
    
    This also requires us to update to apache commons-pool-2.6.1-SNAPSHOT
    and commons-dbcp2-2.6.0-SNAPSHOT.
    Both are NOT yet released, but important to solve a deadlock which kills
    our unit tests and has already hit me in production as well.
---
 pom.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 79916d7..8e1e5bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -584,6 +584,8 @@
                 <!-- DBCP overrides for MySQL testing -->
                 <dbcp.maxIdle>0</dbcp.maxIdle>
                 <dbcp.minIdle>0</dbcp.minIdle>
+
+                <mysql.server.version>5.7</mysql.server.version>
             </properties>
 
             <build>
@@ -594,7 +596,7 @@
                         <configuration>
                             <images>
                                 <image>
-                                    <name>mysql/mysql-server:5.7</name>
+                                    <name>mysql/mysql-server:${mysql.server.version}</name>
                                     <run>
                                         <env>
                                             <MYSQL_DATABASE>${openjpa.mysql.dbname}</MYSQL_DATABASE>
@@ -1340,7 +1342,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-pool2</artifactId>
-                <version>2.6.0</version>
+                <version>2.6.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>commons-logging</groupId>
@@ -1406,7 +1408,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-dbcp2</artifactId>
-                <version>2.5.0</version>
+                <version>2.6.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>javax.xml.bind</groupId>


Mime
View raw message