You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2015/09/13 21:56:00 UTC
svn commit: r1702816 - in /db/derby/code/trunk:
java/engine/org/apache/derby/iapi/sql/dictionary/
java/engine/org/apache/derby/impl/sql/catalog/ tools/ant/properties/
Author: rhillegas
Date: Sun Sep 13 19:55:58 2015
New Revision: 1702816
URL: http://svn.apache.org/r1702816
Log:
DERBY-6811: Bump the release id on the trunk to 10.13; commit derby-6811-04-aa-bumpReleaseIdOnTrunk.diff.
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=1702816&r1=1702815&r2=1702816&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 Sun Sep 13 19:55:58 2015
@@ -130,6 +130,9 @@ public interface DataDictionary
/** Derby 10.12 System Catalog version */
public static final int DD_VERSION_DERBY_10_12 = 240;
+ /** Derby 10.13 System Catalog version */
+ public static final int DD_VERSION_DERBY_10_13 = 250;
+
// 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=1702816&r1=1702815&r2=1702816&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 Sun Sep 13 19:55:58 2015
@@ -150,6 +150,8 @@ public class DD_Version implements Forma
return "10.11";
case DataDictionary.DD_VERSION_DERBY_10_12:
return "10.12";
+ case DataDictionary.DD_VERSION_DERBY_10_13:
+ return "10.13";
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=1702816&r1=1702815&r2=1702816&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 Sun Sep 13 19:55:58 2015
@@ -519,7 +519,7 @@ public final class DataDictionaryImpl
public void boot(boolean create, Properties startParams)
throws StandardException
{
- softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_12);
+ softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_13);
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=1702816&r1=1702815&r2=1702816&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/release.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/release.properties Sun Sep 13 19:55:58 2015
@@ -17,10 +17,10 @@
drdamaint=0
maint=0000000
major=10
-minor=12
-eversion=10.12
+minor=13
+eversion=10.13
beta=true
-copyright.comment=Copyright 1997, 2014 The Apache Software Foundation or its licensors, as applicable.
+copyright.comment=Copyright 1997, 2015 The Apache Software Foundation or its licensors, as applicable.
vendor=The Apache Software Foundation
-copyright.year=2014
-release.id.long=10.12.0.0 beta
+copyright.year=2015
+release.id.long=10.13.0.0 beta