DERBY-7010: Bump release number on trunk to 10.16.0.0; commit derby-7010-03-aa-bumpTrunkTo10.16.diff.
git-svn-id: https://svn.apache.org/repos/asf/db/derby/code/trunk@1850581 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
index ceb68d0..cc0bc09 100644
--- a/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
+++ b/java/org.apache.derby.engine/org/apache/derby/iapi/sql/dictionary/DataDictionary.java
@@ -139,6 +139,9 @@
/** Derby 10.14 System Catalog version */
public static final int DD_VERSION_DERBY_10_15 = 270;
+ /** Derby 10.14 System Catalog version */
+ public static final int DD_VERSION_DERBY_10_16 = 280;
+
// general info
public static final String DATABASE_ID = "derby.databaseID";
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DD_Version.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DD_Version.java
index a090bfd..052ad9d 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DD_Version.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DD_Version.java
@@ -156,6 +156,8 @@
return "10.14";
case DataDictionary.DD_VERSION_DERBY_10_15:
return "10.15";
+ case DataDictionary.DD_VERSION_DERBY_10_16:
+ return "10.16";
default:
return null;
}
diff --git a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
index b18528a..421fb62 100644
--- a/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
+++ b/java/org.apache.derby.engine/org/apache/derby/impl/sql/catalog/DataDictionaryImpl.java
@@ -517,7 +517,7 @@
public void boot(boolean create, Properties startParams)
throws StandardException
{
- softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_15);
+ softwareVersion = new DD_Version(this, DataDictionary.DD_VERSION_DERBY_10_16);
startupParameters = startParams;
diff --git a/tools/ant/properties/release.properties b/tools/ant/properties/release.properties
index 52e7604..ab2eaf4 100644
--- a/tools/ant/properties/release.properties
+++ b/tools/ant/properties/release.properties
@@ -17,10 +17,10 @@
drdamaint=0
maint=0000000
major=10
-minor=15
-eversion=10.15
-beta=true
-copyright.comment=Copyright 1997, 2018 The Apache Software Foundation or its licensors, as applicable.
+minor=16
+eversion=10.16
+beta=false
+copyright.comment=Copyright 1997, 2019 The Apache Software Foundation or its licensors, as applicable.
vendor=The Apache Software Foundation
-copyright.year=2018
-release.id.long=10.15.0.0 beta
+copyright.year=2019
+release.id.long=10.16.0.0
