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 2022/05/17 17:13:32 UTC

svn commit: r1901001 - in /db/derby/code/trunk: java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/ java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/ tools/ant/properties/

Author: rhillegas
Date: Tue May 17 17:13:32 2022
New Revision: 1901001

URL: http://svn.apache.org/viewvc?rev=1901001&view=rev
Log:
DERBY-7136: Change the trunk version to 10.17.0.0; commit derby-7136-03-aa-updateTrunkVersion.diff.

Modified:
    db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
    db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DD_Version.java
    db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
    db/derby/code/trunk/tools/ant/properties/release.properties

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java?rev=1901001&r1=1901000&r2=1901001&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java Tue May 17 17:13:32 2022
@@ -142,6 +142,9 @@ public interface DataDictionary
 	/** Derby 10.14 System Catalog version */
 	public static final int DD_VERSION_DERBY_10_16		= 280;
 
+	/** Derby 10.14 System Catalog version */
+	public static final int DD_VERSION_DERBY_10_17		= 290;
+
 	// general info
 	public	static	final	String	DATABASE_ID = "derby.databaseID";
 

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DD_Version.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DD_Version.java?rev=1901001&r1=1901000&r2=1901001&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DD_Version.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DD_Version.java Tue May 17 17:13:32 2022
@@ -155,6 +155,8 @@ public	class DD_Version implements	Forma
 			return "10.15";
 		case DataDictionary.DD_VERSION_DERBY_10_16:
 			return "10.16";
+		case DataDictionary.DD_VERSION_DERBY_10_17:
+			return "10.17";
 		default:
 			return null;
 		}

Modified: db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java?rev=1901001&r1=1901000&r2=1901001&view=diff
==============================================================================
--- db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java (original)
+++ db/derby/code/trunk/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java Tue May 17 17:13:32 2022
@@ -513,7 +513,7 @@ public final class	DataDictionaryImpl
 	public void boot(boolean create, Properties startParams) 
 			throws StandardException
 	{
-		softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_16);
+		softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_17);
 
 		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=1901001&r1=1901000&r2=1901001&view=diff
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/release.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/release.properties Tue May 17 17:13:32 2022
@@ -17,10 +17,10 @@
 drdamaint=0
 maint=0000000
 major=10
-minor=16
-eversion=10.16
-beta=false
-copyright.comment=Copyright 1997, 2019 The Apache Software Foundation or its licensors, as applicable.
+minor=17
+eversion=10.17
+beta=true
+copyright.comment=Copyright 1997, 2022 The Apache Software Foundation or its licensors, as applicable.
 vendor=The Apache Software Foundation
-copyright.year=2019
-release.id.long=10.16.0.0
+copyright.year=2022
+release.id.long=10.17.0.0 beta