db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1808812 - 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 Tue, 19 Sep 2017 02:37:01 GMT
Author: rhillegas
Date: Tue Sep 19 02:37:01 2017
New Revision: 1808812

URL: http://svn.apache.org/viewvc?rev=1808812&view=rev
Log:
DERBY-6941: Bump version number on trunk to 10.15: commit derby-6941-05-aa-bumpTrunkDDto10_15.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=1808812&r1=1808811&r2=1808812&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 19 02:37:01 2017
@@ -136,6 +136,9 @@ public interface DataDictionary
 	/** Derby 10.14 System Catalog version */
 	public static final int DD_VERSION_DERBY_10_14		= 260;
 
+	/** Derby 10.14 System Catalog version */
+	public static final int DD_VERSION_DERBY_10_15		= 270;
+
 	// 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=1808812&r1=1808811&r2=1808812&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 19 02:37:01 2017
@@ -154,6 +154,8 @@ public	class DD_Version implements	Forma
 			return "10.13";
 		case DataDictionary.DD_VERSION_DERBY_10_14:
 			return "10.14";
+		case DataDictionary.DD_VERSION_DERBY_10_15:
+			return "10.15";
 		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=1808812&r1=1808811&r2=1808812&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 19 02:37:01 2017
@@ -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_14);
+		softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_15);
 
 		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=1808812&r1=1808811&r2=1808812&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/release.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/release.properties Tue Sep 19 02:37:01 2017
@@ -17,10 +17,10 @@
 drdamaint=0
 maint=0000000
 major=10
-minor=14
-eversion=10.14
+minor=15
+eversion=10.15
 beta=true
-copyright.comment=Copyright 1997, 2016 The Apache Software Foundation or its licensors, as
applicable.
+copyright.comment=Copyright 1997, 2017 The Apache Software Foundation or its licensors, as
applicable.
 vendor=The Apache Software Foundation
-copyright.year=2016
-release.id.long=10.14.0.0 beta
+copyright.year=2017
+release.id.long=10.15.0.0 beta



Mime
View raw message