You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mg...@apache.org on 2020/03/02 09:57:16 UTC

[tomcat] branch master updated: MTOMCAT-319 Update test dependencies

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new 9207db1  MTOMCAT-319 Update test dependencies
9207db1 is described below

commit 9207db17f22400d305083a7825b02b863b39a144
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Mon Mar 2 11:55:10 2020 +0200

    MTOMCAT-319 Update test dependencies
    
    Update JUnit from 4.11 to 4.13
    Update H2 database from 1.3.152 to 1.4.200
    Update maven-eclipse-plugin from 2.5.1 to 2.10
    
    Use 'SELEC' (without T) as validation query because 'SELECT' is a valid one since 1.4.200: https://github.com/h2database/h2database/pull/2137/commits/42208fe2669d7a812efd019f1236c9c33720c53a
---
 modules/jdbc-pool/pom.xml                                           | 6 +++---
 .../org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml
index 59a990a..ff3adf9 100644
--- a/modules/jdbc-pool/pom.xml
+++ b/modules/jdbc-pool/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.11</version>
+      <version>4.13</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -82,7 +82,7 @@
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>1.3.152</version>
+      <version>1.4.200</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -125,7 +125,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>2.10</version>
         <configuration>
           <downloadSources>true</downloadSources>
           <downloadJavadocs>true</downloadJavadocs>
diff --git a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java
index 054df27..6382d64 100644
--- a/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java
+++ b/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/TestValidationQueryTimeout.java
@@ -137,7 +137,7 @@ public class TestValidationQueryTimeout extends DefaultTestCase {
         this.datasource.setInitialSize(1);
         this.datasource.setTestOnConnect(true);
         this.datasource.setValidationInterval(-1);
-        this.datasource.setValidationQuery("SELECT");
+        this.datasource.setValidationQuery("SELEC"); // 'SELECT' and 'SELECT 1' are valid queries
         this.datasource.setValidationQueryTimeout(1);
 
         this.datasource.getConnection();


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org