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 1F75D96C2 for ; Mon, 18 Mar 2013 14:05:57 +0000 (UTC) Received: (qmail 81279 invoked by uid 500); 18 Mar 2013 14:05:57 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 81254 invoked by uid 500); 18 Mar 2013 14:05:57 -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 81246 invoked by uid 99); 18 Mar 2013 14:05:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Mar 2013 14:05:56 +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; Mon, 18 Mar 2013 14:05:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AE6ED238897F; Mon, 18 Mar 2013 14:05:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1457771 - in /db/derby/code/trunk: java/engine/org/apache/derby/iapi/sql/dictionary/ java/engine/org/apache/derby/impl/sql/catalog/ tools/ant/properties/ Date: Mon, 18 Mar 2013 14:05:35 -0000 To: derby-commits@db.apache.org From: rhillegas@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130318140535.AE6ED238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhillegas Date: Mon Mar 18 14:05:35 2013 New Revision: 1457771 URL: http://svn.apache.org/r1457771 Log: DERBY-6104: Bump the release id on the trunk to 10.11.0.0 beta. Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java db/derby/code/trunk/tools/ant/properties/release.properties Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java?rev=1457771&r1=1457770&r2=1457771&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java Mon Mar 18 14:05:35 2013 @@ -126,6 +126,9 @@ public interface DataDictionary /** Derby 10.10 System Catalog version */ public static final int DD_VERSION_DERBY_10_10 = 220; + /** Derby 10.10 System Catalog version */ + public static final int DD_VERSION_DERBY_10_11 = 230; + // general info public static final String DATABASE_ID = "derby.databaseID"; Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java?rev=1457771&r1=1457770&r2=1457771&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java Mon Mar 18 14:05:35 2013 @@ -164,6 +164,8 @@ public class DD_Version implements Forma return "10.9"; case DataDictionary.DD_VERSION_DERBY_10_10: return "10.10"; + case DataDictionary.DD_VERSION_DERBY_10_11: + return "10.11"; default: return null; } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=1457771&r1=1457770&r2=1457771&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java Mon Mar 18 14:05:35 2013 @@ -532,7 +532,7 @@ public final class DataDictionaryImpl public void boot(boolean create, Properties startParams) throws StandardException { - softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_10); + softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_11); startupParameters = startParams; Modified: db/derby/code/trunk/tools/ant/properties/release.properties URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/ant/properties/release.properties?rev=1457771&r1=1457770&r2=1457771&view=diff ============================================================================== --- db/derby/code/trunk/tools/ant/properties/release.properties (original) +++ db/derby/code/trunk/tools/ant/properties/release.properties Mon Mar 18 14:05:35 2013 @@ -17,10 +17,10 @@ drdamaint=0 maint=0000000 major=10 -minor=10 -eversion=10.10 -beta=false +minor=11 +eversion=10.11 +beta=true copyright.comment=Copyright 1997, 2013 The Apache Software Foundation or its licensors, as applicable. vendor=The Apache Software Foundation copyright.year=2013 -release.id.long=10.10.0.0 +release.id.long=10.11.0.0 beta