Author: myrnavl
Date: Fri Jun 15 14:57:45 2007
New Revision: 547808
URL: http://svn.apache.org/viewvc?view=rev&rev=547808
Log:
bumping version number to 10.4.0.0 alpha
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testclientij.out
db/derby/code/trunk/tools/ant/properties/release.properties
db/derby/code/trunk/tools/release/build.xml
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out?view=diff&rev=547808&r1=547807&r2=547808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
Fri Jun 15 14:57:45 2007
@@ -13,7 +13,7 @@
Column result scale after division is: 23
dc / 2 = 5.55000000000000000000000
dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.3 (10.3.0.0 alpha -(EXPECTED
SUBVERSION INFO))
+JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.4 (10.4.0.0 alpha -(EXPECTED
SUBVERSION INFO))
getProcedures():
PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],RESERVED1[INTEGER],RESERVED2[INTEGER],RESERVED3[INTEGER],REMARKS[VARCHAR],PROCEDURE_TYPE[SMALLINT],SPECIFIC_NAME[VARCHAR]
,APP,GETPCTEST1,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc,1,xxxxGENERATED-IDxxxx
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out?view=diff&rev=547808&r1=547807&r2=547808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
Fri Jun 15 14:57:45 2007
@@ -43,7 +43,7 @@
Column result scale after division is: 23
dc / 2 = 5.55000000000000000000000
dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.3 (10.3.0.0 alpha -(EXPECTED
SUBVERSION INFO))
+JDBC Driver 'Apache Derby Network Client JDBC Driver', version 10.4 (10.4.0.0 alpha -(EXPECTED
SUBVERSION INFO))
getProcedures():
PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],NUM_INPUT_PARAMS[INTEGER],NUM_OUTPUT_PARAMS[INTEGER],NUM_RESULT_SETS[INTEGER],REMARKS[VARCHAR],PROCEDURE_TYPE[SMALLINT]
,APP,GETPCTEST1,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc,1
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out?view=diff&rev=547808&r1=547807&r2=547808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out
Fri Jun 15 14:57:45 2007
@@ -1,6 +1,6 @@
main-NSinSameJVM: Derby drivers loaded
-Apache Derby Network Server - 10.3.0.0 alpha -(EXPECTED SUBVERSION INFO) started and ready
to accept connections on port 20000 at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.4.0.0 alpha -(EXPECTED SUBVERSION INFO) started and ready
to accept connections on port 20000 at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
main-NSinSameJVM: NetworkServer started
main-NSinSameJVM: Connected to database NSinSameJVMTestDB;create=true
getting ready to shutdown
-Apache Derby Network Server - 10.3.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.4.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out?view=diff&rev=547808&r1=547807&r2=547808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out
Fri Jun 15 14:57:45 2007
@@ -163,7 +163,7 @@
INSERT INTO FLIGHTS_HISTORY (STATUS) VALUES ('INSERTED FROM TRIG2');
0 rows inserted/updated/deleted
ij> COMMIT;
-ij> ij version 10.3
+ij> ij version 10.4
WARNING 01J01: Database 'toursDB' not created, connection made to existing database instead.
CONNECTION0* - jdbc:derby:toursDB
* = current connection
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out?view=diff&rev=547808&r1=547807&r2=547808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
Fri Jun 15 14:57:45 2007
@@ -13,7 +13,7 @@
Column result scale after division is: 23
dc / 2 = 5.55000000000000000000000
dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.3 (10.3.0.0 alpha -(EXPECTED
SUBVERSION INFO))
+JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.4 (10.4.0.0 alpha -(EXPECTED
SUBVERSION INFO))
getProcedures():
PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],RESERVED1[INTEGER],RESERVED2[INTEGER],RESERVED3[INTEGER],REMARKS[VARCHAR],PROCEDURE_TYPE[SMALLINT],SPECIFIC_NAME[VARCHAR]
,APP,GETPCTEST1,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc,1,xxxxGENERATED-IDxxxx
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out?view=diff&rev=547808&r1=547807&r2=547808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
Fri Jun 15 14:57:45 2007
@@ -43,7 +43,7 @@
Column result scale after division is: 23
dc / 2 = 5.55000000000000000000000
dc / 2 = 5.55500000000000000000000
-JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.3 (10.3.0.0 alpha -(EXPECTED
SUBVERSION INFO))
+JDBC Driver 'Apache Derby Embedded JDBC Driver', version 10.4 (10.4.0.0 alpha -(EXPECTED
SUBVERSION INFO))
getProcedures():
PROCEDURE_CAT[VARCHAR],PROCEDURE_SCHEM[VARCHAR],PROCEDURE_NAME[VARCHAR],NUM_INPUT_PARAMS[INTEGER],NUM_OUTPUT_PARAMS[INTEGER],NUM_RESULT_SETS[INTEGER],REMARKS[VARCHAR],PROCEDURE_TYPE[SMALLINT]
,APP,GETPCTEST1,null,null,null,org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc,1
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out?view=diff&rev=547808&r1=547807&r2=547808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out
Fri Jun 15 14:57:45 2007
@@ -3,21 +3,21 @@
org.apache.derby.drda.NetworkServerControl start -noSecurityManager
Successfully Connected
org.apache.derby.drda.NetworkServerControl shutdown
-Apache Derby Network Server - 10.3.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.4.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
Testing System properties Port 1529
-----Dderby.drda.portNumber=1529 org.apache.derby.drda.NetworkServerControl start -noSecurityManager
Successfully Connected
org.apache.derby.drda.NetworkServerControl shutdown -p 1529
-Apache Derby Network Server - 10.3.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.4.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
Testing command line option. Port 1530
org.apache.derby.drda.NetworkServerControl start -p 1530 -noSecurityManager
Successfully Connected
org.apache.derby.drda.NetworkServerControl shutdown -p 1530
-Apache Derby Network Server - 10.3.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.4.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
Testing start server by specifying system properties without values
First shutdown server started on default port by the test harness
org.apache.derby.drda.NetworkServerControl shutdown -p 1527
-Apache Derby Network Server - 10.3.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.4.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
-----Dderby.drda.logConnections -Dderby.drda.traceAll -Dderby.drda.traceDirectory -Dderby.drda.keepAlive
-Dderby.drda.timeSlice -Dderby.drda.host -Dderby.drda.portNumber -Dderby.drda.minThreads -Dderby.drda.maxThreads
-Dderby.drda.startNetworkServer -Dderby.drda.debug org.apache.derby.drda.NetworkServerControl
start -noSecurityManager
----- listing properties --
derby.drda.maxThreads=0
@@ -61,7 +61,7 @@
derby.drda.host=xxxFILTERED_HOSTNAMExxx
derby.drda.traceAll=false
org.apache.derby.drda.NetworkServerControl shutdown -p 1527
-Apache Derby Network Server - 10.3.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
+Apache Derby Network Server - 10.4.0.0 alpha -(EXPECTED SUBVERSION INFO) shutdown at xxxxxxFILTERED-TIMESTAMPxxxxxGMT
org.apache.derby.drda.NetworkServerControl
No arguments given.
Usage: NetworkServerControl <commands>
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testclientij.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testclientij.out?view=diff&rev=547808&r1=547807&r2=547808
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testclientij.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/testclientij.out
Fri Jun 15 14:57:45 2007
@@ -1,4 +1,4 @@
-ij version 10.3
+ij version 10.4
ij> --
-- Licensed to the Apache Software Foundation (ASF) under one or more
-- contributor license agreements. See the NOTICE file distributed with
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?view=diff&rev=547808&r1=547807&r2=547808
==============================================================================
--- db/derby/code/trunk/tools/ant/properties/release.properties (original)
+++ db/derby/code/trunk/tools/ant/properties/release.properties Fri Jun 15 14:57:45 2007
@@ -2,8 +2,8 @@
drdamaint=0
maint=0000000
major=10
-minor=3
-eversion=10.3
+minor=4
+eversion=10.4
beta=true
-copyright.comment=Copyright 1997, 2006 The Apache Software Foundation or its licensors, as
applicable.
+copyright.comment=Copyright 1997, 2007 The Apache Software Foundation or its licensors, as
applicable.
vendor=The Apache Software Foundation
Modified: db/derby/code/trunk/tools/release/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/release/build.xml?view=diff&rev=547808&r1=547807&r2=547808
==============================================================================
--- db/derby/code/trunk/tools/release/build.xml (original)
+++ db/derby/code/trunk/tools/release/build.xml Fri Jun 15 14:57:45 2007
@@ -376,24 +376,12 @@
<target name="regex.masters">
<property file="${basedir}/tools/release/maintversion.properties"/>
<antcall target="regex.version">
- <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out"/>
- </antcall>
- <antcall target="regex.version">
- <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out"/>
- </antcall>
- <antcall target="regex.version">
<param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out"/>
</antcall>
<antcall target="regex.version">
<param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out"/>
</antcall>
<antcall target="regex.version">
- <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out"/>
- </antcall>
- <antcall target="regex.version">
- <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out"/>
- </antcall>
- <antcall target="regex.version">
<param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/metadata.out"/>
</antcall>
<antcall target="regex.version">
@@ -403,7 +391,10 @@
<param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/NSinSameJVM.out"/>
</antcall>
<antcall target="regex.version">
- <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/testProperties.out"/>
+ <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/testclientij.out"/>
+ </antcall>
+ <antcall target="regex.version">
+ <param name="regex.file" value="java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out"/>
</antcall>
</target>
|