Author: markt
Date: Sun Jul 26 22:32:26 2015
New Revision: 1692777
URL: http://svn.apache.org/r1692777
Log:
Prep for next release
Modified:
tomcat/jk/trunk/native/STATUS.txt
tomcat/jk/trunk/native/common/jk_version.h
tomcat/jk/trunk/native/configure.ac
tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/STATUS.txt?rev=1692777&r1=1692776&r2=1692777&view=diff
==============================================================================
--- tomcat/jk/trunk/native/STATUS.txt (original)
+++ tomcat/jk/trunk/native/STATUS.txt Sun Jul 26 22:32:26 2015
@@ -18,7 +18,8 @@ Last modified at [$Date$]
Release:
- 1.2.41 : in development
+ 1.2.42 : in development
+ 1.2.41 : release vote in progress
1.2.40 : released April 15, 2014
1.2.39 : released March 11, 2014
1.2.38 : not released
Modified: tomcat/jk/trunk/native/common/jk_version.h
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1692777&r1=1692776&r2=1692777&view=diff
==============================================================================
--- tomcat/jk/trunk/native/common/jk_version.h (original)
+++ tomcat/jk/trunk/native/common/jk_version.h Sun Jul 26 22:32:26 2015
@@ -26,7 +26,7 @@
/************** START OF AREA TO MODIFY BEFORE RELEASING *************/
#define JK_VERMAJOR 1
#define JK_VERMINOR 2
-#define JK_VERFIX 41
+#define JK_VERFIX 42
/* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
#define JK_VERISRELEASE 0
Modified: tomcat/jk/trunk/native/configure.ac
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/configure.ac?rev=1692777&r1=1692776&r2=1692777&view=diff
==============================================================================
--- tomcat/jk/trunk/native/configure.ac (original)
+++ tomcat/jk/trunk/native/configure.ac Sun Jul 26 22:32:26 2015
@@ -23,7 +23,7 @@ AC_PREREQ(2.59)
dnl package and version.
dnl synchronization with common/jk_version.h ?
-AC_INIT([mod_jk], [1.2.41])
+AC_INIT([mod_jk], [1.2.42])
AC_CONFIG_SRCDIR([common/jk_worker.h])
AC_CONFIG_HEADER(common/config.h)
Modified: tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism?rev=1692777&r1=1692776&r2=1692777&view=diff
==============================================================================
--- tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism
(original)
+++ tomcat/jk/trunk/native/iis/installer/isapi-redirector-win32-msi.ism Sun Jul
26 22:32:26 2015
@@ -3420,7 +3420,7 @@ TQBzAGkAAQBSAGUAbABlAGEAcwBlAA==
<row><td>ProductID</td><td>none</td><td/></row>
<row><td>ProductLanguage</td><td>1033</td><td/></row>
<row><td>ProductName</td><td>Tomcat Isapi
Redirector</td><td/></row>
- <row><td>ProductVersion</td><td>1.2.41</td><td/></row>
+ <row><td>ProductVersion</td><td>1.2.42</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/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1692777&r1=1692776&r2=1692777&view=diff
==============================================================================
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Sun Jul 26 22:32:26 2015
@@ -40,6 +40,8 @@
new documentation project for JK was started.
</p>
</section>
+<section name="Changes between 1.2.41 and 1.2.42">
+</section>
<section name="Changes between 1.2.40 and 1.2.41">
<br />
<subsection name="Native">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
