You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/02/20 16:27:05 UTC

[tomcat-connectors] branch master updated (d2e25d0 -> 2bfb670)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git.


    from d2e25d0  Updates for changes in supported Windows versions
     new 49372ec  Update changelog
     new 2bfb670  Increment version to 1.2.48 for release

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 HOWTO-RELEASE.txt                       | 8 ++++----
 native/common/jk_version.h              | 2 +-
 native/configure.ac                     | 2 +-
 native/iis/README                       | 2 +-
 native/netscape/README                  | 2 +-
 tools/dist/binaries/windows/README.html | 2 +-
 xdocs/index.xml                         | 6 +++---
 xdocs/miscellaneous/changelog.xml       | 8 ++++++++
 xdocs/news/20200201.xml                 | 4 ++--
 9 files changed, 22 insertions(+), 14 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat-connectors] 01/02: Update changelog

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git

commit 49372eccb6fd3a066441ac12feb3717f90face62
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 20 16:22:38 2020 +0000

    Update changelog
---
 xdocs/miscellaneous/changelog.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xdocs/miscellaneous/changelog.xml b/xdocs/miscellaneous/changelog.xml
index 8e1f0ce..bb5a8ac 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -40,6 +40,14 @@
   new documentation project for JK was started.
   </p>
 </section>
+<section name="Changes between 1.2.47 and 1.2.48">
+  <changelog>
+    <update>
+      IIS: Update the installation how-to to remove windows versions that are no
+      longer supported and to add Windows Server 2019. (markt)
+    </update>
+  </changelog>
+</section>
 <section name="Changes between 1.2.46 and 1.2.47">
   <subsection name="Native">
     <changelog>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat-connectors] 02/02: Increment version to 1.2.48 for release

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git

commit 2bfb6701ce6e93c319db90b225ff8ddf28e75c9b
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Feb 20 16:26:25 2020 +0000

    Increment version to 1.2.48 for release
---
 HOWTO-RELEASE.txt                       | 8 ++++----
 native/common/jk_version.h              | 2 +-
 native/configure.ac                     | 2 +-
 native/iis/README                       | 2 +-
 native/netscape/README                  | 2 +-
 tools/dist/binaries/windows/README.html | 2 +-
 xdocs/index.xml                         | 6 +++---
 xdocs/news/20200201.xml                 | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index c1523de..94c757f 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -81,11 +81,11 @@ Use the pattern below for tagging the tomcat-connectors directory.
 
 TAG=JK_{MAJOR_REVISION}_{MINOR_REVISION}_{RELEASE}
 
-Here is an example for mod_jk 1.2.47
+Here is an example for mod_jk 1.2.48
 
-git commit -a -m "Tag JK_1_2_47"
-git tag JK_1_2_47
-git push origin JK_1_2_47
+git commit -a -m "Tag JK_1_2_48"
+git tag JK_1_2_48
+git push origin JK_1_2_48
 # reset master
 
 
diff --git a/native/common/jk_version.h b/native/common/jk_version.h
index dcff298..30ce5f1 100644
--- a/native/common/jk_version.h
+++ b/native/common/jk_version.h
@@ -25,7 +25,7 @@
 /************** START OF AREA TO MODIFY BEFORE RELEASING *************/
 #define JK_VERMAJOR     1
 #define JK_VERMINOR     2
-#define JK_VERFIX       47
+#define JK_VERFIX       48
 
 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */
 #define JK_VERISRELEASE 0
diff --git a/native/configure.ac b/native/configure.ac
index d869a6b..9ec7e9c 100644
--- a/native/configure.ac
+++ b/native/configure.ac
@@ -22,7 +22,7 @@ AC_PREREQ(2.59)
 
 dnl package and version.
 dnl synchronization with common/jk_version.h ?
-AC_INIT([mod_jk], [1.2.47])
+AC_INIT([mod_jk], [1.2.48])
 
 AC_CONFIG_SRCDIR([common/jk_worker.h])
 AC_CONFIG_HEADER(common/config.h)
diff --git a/native/iis/README b/native/iis/README
index 6944d93..1e6893a 100644
--- a/native/iis/README
+++ b/native/iis/README
@@ -56,7 +56,7 @@ RELEASING
 
 Construct the binary distributions    
 
-  set VER=1.2.47
+  set VER=1.2.48
   mkdir tomcat-connectors-%VER%-windows-i386-iis
   copy ..\LICENSE tomcat-connectors-%VER%-windows-i386-iis\
   copy ..\NOTICE tomcat-connectors-%VER%-windows-i386-iis\
diff --git a/native/netscape/README b/native/netscape/README
index 68b3ff2..8893ee8 100644
--- a/native/netscape/README
+++ b/native/netscape/README
@@ -25,7 +25,7 @@ The steps that you need to take are:
       directory or edit the nsapi.dsp and replace all $(IPLANET_HOME)
       occurrences with the real path
    3. Execute the following command:
-      nmake -f Makefile.vc [SO_VERSION=-1.2.47]
+      nmake -f Makefile.vc [SO_VERSION=-1.2.48]
 
 An alternative will be to open the isapi workspace file (nsapi.dsw) in msdev and
 build it using the build menu.
diff --git a/tools/dist/binaries/windows/README.html b/tools/dist/binaries/windows/README.html
index 9ec2a17..b5a3cc1 100644
--- a/tools/dist/binaries/windows/README.html
+++ b/tools/dist/binaries/windows/README.html
@@ -27,7 +27,7 @@
    connector to fail.
 </p>
 
-<h2><a name="released">The current stable release is 1.2.47</a></h2>
+<h2><a name="released">The current stable release is 1.2.48</a></h2>
 
 <p>See the Apache Tomcat Connectors
 <a href="http://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html">changelog</a>
diff --git a/xdocs/index.xml b/xdocs/index.xml
index 79bb0ec..03e45ab 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -63,12 +63,12 @@ manual is described in more detail below.</p>
 
 <section name="Headlines">
 <ul>
-<li><a href="news/20200201.html#JK-1.2.47 released"><b>JK-1.2.47 released</b></a>
+<li><a href="news/20200201.html#JK-1.2.48 released"><b>JK-1.2.48 released</b></a>
 <p>The Apache Tomcat team is proud to announce the immediate availability
-   of Tomcat Connectors 1.2.47 Stable. This release contains improvements and
+   of Tomcat Connectors 1.2.48 Stable. This release contains improvements and
    bug fixes for issues found in previous releases.</p>
    
-<p>Download the <a href="//tomcat.apache.org/download-connectors.cgi">JK 1.2.47
+<p>Download the <a href="//tomcat.apache.org/download-connectors.cgi">JK 1.2.48
    release</a>.</p>
 </li>
 
diff --git a/xdocs/news/20200201.xml b/xdocs/news/20200201.xml
index 894d263..3f785b5 100644
--- a/xdocs/news/20200201.xml
+++ b/xdocs/news/20200201.xml
@@ -31,9 +31,9 @@
 
 <section name="2020 News &amp; Status">
 
-<subsection name="February - JK-1.2.47 released">
+<subsection name="February - JK-1.2.48 released">
     <p>The Apache Tomcat team is proud to announce the immediate availability
-       of Tomcat Connectors 1.2.47. This is a maintenance release.</p>
+       of Tomcat Connectors 1.2.48. This is a maintenance release.</p>
 
     <p>Please see the <a href="../miscellaneous/changelog.html">ChangeLog</a>
        for a full list of changes.</p>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org