db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1615084 - 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 Fri, 01 Aug 2014 12:40:56 GMT
Author: rhillegas
Date: Fri Aug  1 12:40:56 2014
New Revision: 1615084

URL: http://svn.apache.org/r1615084
Log:
DERBY-6588: Bump trunk version number to 10.12; commit derby-6588-06-aa-bumpTrunkVersionNumber.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=1615084&r1=1615083&r2=1615084&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
Fri Aug  1 12:40:56 2014
@@ -124,9 +124,12 @@ 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 */
+	/** Derby 10.11 System Catalog version */
 	public static final int DD_VERSION_DERBY_10_11		= 230;
 
+	/** Derby 10.12 System Catalog version */
+	public static final int DD_VERSION_DERBY_10_12		= 240;
+
 	// 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=1615084&r1=1615083&r2=1615084&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 Fri
Aug  1 12:40:56 2014
@@ -145,6 +145,8 @@ public	class DD_Version implements	Forma
 			return "10.10";
 		case DataDictionary.DD_VERSION_DERBY_10_11:
 			return "10.11";
+		case DataDictionary.DD_VERSION_DERBY_10_12:
+			return "10.12";
 		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=1615084&r1=1615083&r2=1615084&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
Fri Aug  1 12:40:56 2014
@@ -510,7 +510,7 @@ public final class	DataDictionaryImpl
 	public void boot(boolean create, Properties startParams) 
 			throws StandardException
 	{
-		softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_11);
+		softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_12);
 
 		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=1615084&r1=1615083&r2=1615084&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/release.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/release.properties Fri Aug  1 12:40:56 2014
@@ -17,10 +17,10 @@
 drdamaint=0
 maint=0000000
 major=10
-minor=11
-eversion=10.11
+minor=12
+eversion=10.12
 beta=true
-copyright.comment=Copyright 1997, 2013 The Apache Software Foundation or its licensors, as
applicable.
+copyright.comment=Copyright 1997, 2014 The Apache Software Foundation or its licensors, as
applicable.
 vendor=The Apache Software Foundation
-copyright.year=2013
-release.id.long=10.11.0.0 beta
+copyright.year=2014
+release.id.long=10.12.0.0 beta



Mime
View raw message