Author: rjung
Date: Sun Dec 17 05:53:14 2006
New Revision: 487981
URL: http://svn.apache.org/viewvc?view=rev&rev=487981
Log:
Start dev cycle for version 1.2.21: increase version number etc.
Modified:
tomcat/connectors/trunk/jk/native/STATUS.txt
tomcat/connectors/trunk/jk/native/common/jk_version.h
tomcat/connectors/trunk/jk/native/common/portable.h.sample
tomcat/connectors/trunk/jk/native/configure.in
tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism
tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc
tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/connectors/trunk/jk/native/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/STATUS.txt?view=diff&rev=487981&r1=487980&r2=487981
==============================================================================
--- tomcat/connectors/trunk/jk/native/STATUS.txt (original)
+++ tomcat/connectors/trunk/jk/native/STATUS.txt Sun Dec 17 05:53:14 2006
@@ -3,6 +3,7 @@
Release:
+ 1.2.21 : in development
1.2.20 : released December 10, 2006
1.2.19 : released September 17, 2006
1.2.18 : released July, 2006
Modified: tomcat/connectors/trunk/jk/native/common/jk_version.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_version.h?view=diff&rev=487981&r1=487980&r2=487981
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_version.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_version.h Sun Dec 17 05:53:14
2006
@@ -26,14 +26,14 @@
/************** START OF AREA TO MODIFY BEFORE RELEASING *************/
#define JK_VERMAJOR 1
#define JK_VERMINOR 2
-#define JK_VERFIX 20
-#define JK_VERSTRING "1.2.20"
+#define JK_VERFIX 21
+#define JK_VERSTRING "1.2.21"
/* Beta number */
#define JK_VERBETA 0
#define JK_BETASTRING "0"
/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
-#define JK_VERISRELEASE 1
+#define JK_VERISRELEASE 0
#define JK_VERRC 0
#define JK_RCSTRING "0"
Modified: tomcat/connectors/trunk/jk/native/common/portable.h.sample
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/portable.h.sample?view=diff&rev=487981&r1=487980&r2=487981
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/portable.h.sample (original)
+++ tomcat/connectors/trunk/jk/native/common/portable.h.sample Sun Dec 17
05:53:14 2006
@@ -93,4 +93,4 @@
#define USE_SO_SNDTIMEO 1
/* Version number of package */
-#define VERSION "1.2.20"
+#define VERSION "1.2.21"
Modified: tomcat/connectors/trunk/jk/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/configure.in?view=diff&rev=487981&r1=487980&r2=487981
==============================================================================
--- tomcat/connectors/trunk/jk/native/configure.in (original)
+++ tomcat/connectors/trunk/jk/native/configure.in Sun Dec 17 05:53:14 2006
@@ -11,7 +11,7 @@
dnl package and version. (synchronization with common/jk_version.h ?)
PACKAGE=mod_jk
-VERSION=1.2.20
+VERSION=1.2.21
AM_INIT_AUTOMAKE(${PACKAGE}, ${VERSION})
Modified:
tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism?view=diff&rev=487981&r1=487980&r2=487981
==============================================================================
---
tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism
(original)
+++
tomcat/connectors/trunk/jk/native/iis/installer/isapi-redirector-win32-msi.ism
Sun Dec 17 05:53:14 2006
@@ -3288,7 +3288,7 @@
<row><td>ProductID</td><td>none</td><td/></row>
<row><td>ProductLanguage</td><td>1033</td><td/></row>
<row><td>ProductName</td><td>Jakarta Isapi
Redirector</td><td/></row>
- <row><td>ProductVersion</td><td>1.2.20</td><td/></row>
+ <row><td>ProductVersion</td><td>1.2.21</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>
Modified: tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc?view=diff&rev=487981&r1=487980&r2=487981
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc (original)
+++ tomcat/connectors/trunk/jk/native/iis/isapi_redirect.rc Sun Dec 17 05:53:14
2006
@@ -14,13 +14,13 @@
"specific language governing permissions and " \
"limitations under the License."
-#define JK_VERSION_STR "1.2.20"
+#define JK_VERSION_STR "1.2.21"
#define JK_DLL_BASENAME "isapi_redirect-" JK_VERSION_STR
1 VERSIONINFO
- FILEVERSION 1,2,20,0
- PRODUCTVERSION 1,2,20,0
+ FILEVERSION 1,2,21,0
+ PRODUCTVERSION 1,2,21,0
FILEFLAGSMASK 0x3fL
#if defined(_DEBUG)
FILEFLAGS 0x01L
Modified: tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml?view=diff&rev=487981&r1=487980&r2=487981
==============================================================================
--- tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/connectors/trunk/jk/xdocs/miscellaneous/changelog.xml Sun Dec 17
05:53:14 2006
@@ -22,6 +22,13 @@
new documentation project for JK was started.
</p>
</section>
+<section name="Changes between 1.2.20 and 1.2.21">
+ <br />
+ <subsection name="Native">
+ <changelog>
+ </changelog>
+ </subsection>
+</section>
<section name="Changes between 1.2.19 and 1.2.20">
<br />
<subsection name="Native">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
