Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AFA499DA9 for ; Fri, 18 Nov 2011 17:20:00 +0000 (UTC) Received: (qmail 79745 invoked by uid 500); 18 Nov 2011 17:20:00 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 79721 invoked by uid 500); 18 Nov 2011 17:20:00 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 79714 invoked by uid 99); 18 Nov 2011 17:20:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Nov 2011 17:20:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Nov 2011 17:19:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 053C22388993; Fri, 18 Nov 2011 17:19:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1203754 - in /db/derby/code/trunk/java: client/org/apache/derby/client/net/ engine/org/apache/derby/impl/jdbc/ testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ Date: Fri, 18 Nov 2011 17:19:38 -0000 To: derby-commits@db.apache.org From: rhillegas@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111118171939.053C22388993@eris.apache.org> Author: rhillegas Date: Fri Nov 18 17:19:38 2011 New Revision: 1203754 URL: http://svn.apache.org/viewvc?rev=1203754&view=rev Log: DERBY-5488: Change jdbc level to 4.1 when running on Java 6 or 7. Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java?rev=1203754&r1=1203753&r2=1203754&view=diff ============================================================================== --- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java (original) +++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetDatabaseMetaData40.java Fri Nov 18 17:19:38 2011 @@ -51,7 +51,7 @@ public class NetDatabaseMetaData40 exten */ public int getJDBCMinorVersion() throws SQLException { checkForClosedConnection(); - return 0; + return 1; } /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java?rev=1203754&r1=1203753&r2=1203754&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData40.java Fri Nov 18 17:19:38 2011 @@ -46,7 +46,7 @@ public class EmbedDatabaseMetaData40 ext * @return JDBC version minor number */ public int getJDBCMinorVersion() { - return 0; + return 1; } public RowIdLifetime getRowIdLifetime() throws SQLException { Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java?rev=1203754&r1=1203753&r2=1203754&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java Fri Nov 18 17:19:38 2011 @@ -668,13 +668,16 @@ public class DatabaseMetaDataTest extend int jdbcMinor = dmd.getJDBCMinorVersion(); int expectedJDBCMajor = -1; + int expectedJDBCMinor = -1; if (JDBC.vmSupportsJDBC4()) { expectedJDBCMajor = 4; + expectedJDBCMinor = 1; } else if (JDBC.vmSupportsJDBC3()) { expectedJDBCMajor = 3; + expectedJDBCMajor = 0; } else if (JDBC.vmSupportsJSR169()) { @@ -686,7 +689,7 @@ public class DatabaseMetaDataTest extend { assertEquals("JDBC Major version", expectedJDBCMajor, jdbcMajor); - assertEquals("JDBC Minor version", 0, jdbcMinor); + assertEquals("JDBC Minor version", expectedJDBCMinor, jdbcMinor); } }