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 bp...@apache.org on 2016/09/27 03:27:12 UTC

svn commit: r1762398 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/sql/dictionary/DataDictionary.java impl/sql/catalog/DD_Version.java impl/sql/catalog/DataDictionaryImpl.java

Author: bpendleton
Date: Tue Sep 27 03:27:11 2016
New Revision: 1762398

URL: http://svn.apache.org/viewvc?rev=1762398&view=rev
Log:
DERBY-6911: Update the release id in trunk to 10.14

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

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=1762398&r1=1762397&r2=1762398&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 Tue Sep 27 03:27:11 2016
@@ -133,6 +133,9 @@ public interface DataDictionary
 	/** Derby 10.13 System Catalog version */
 	public static final int DD_VERSION_DERBY_10_13		= 250;
 
+	/** Derby 10.14 System Catalog version */
+	public static final int DD_VERSION_DERBY_10_14		= 260;
+
 	// 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=1762398&r1=1762397&r2=1762398&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 Tue Sep 27 03:27:11 2016
@@ -152,6 +152,8 @@ public	class DD_Version implements	Forma
 			return "10.12";
 		case DataDictionary.DD_VERSION_DERBY_10_13:
 			return "10.13";
+		case DataDictionary.DD_VERSION_DERBY_10_14:
+			return "10.14";
 		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=1762398&r1=1762397&r2=1762398&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 Tue Sep 27 03:27:11 2016
@@ -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_13);
+		softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_14);
 
 		startupParameters = startParams;