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

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

commit dcb4f6595c65c5c057ab8bb57b8bf020ba761d5d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Feb 5 08:19:58 2024 +0000

    First pass at updating version to 1.3
---
 HOWTO-RELEASE.txt                 |  20 +-
 jnirelease.sh                     |   2 +-
 native/NMAKEmakefile              |   2 +-
 native/build/rpm/tcnative.spec.in |  10 +-
 native/os/win32/libtcnative.rc    |   2 +-
 xdocs/index.xml                   |   7 +-
 xdocs/miscellaneous/changelog.xml | 702 +-------------------------------------
 xdocs/news/2008.xml               |  57 ----
 xdocs/news/2009.xml               |  41 ---
 xdocs/news/2010.xml               |  46 ---
 xdocs/news/2012.xml               |  52 ---
 xdocs/news/2013.xml               |  55 ---
 xdocs/news/2014.xml               |  52 ---
 xdocs/news/2015.xml               |  59 ----
 xdocs/news/2016.xml               |  72 ----
 xdocs/news/2017.xml               |  55 ---
 xdocs/news/2018.xml               |  55 ---
 xdocs/news/2019.xml               |  44 ---
 xdocs/news/2020.xml               |  49 ---
 xdocs/news/2021.xml               |  54 ---
 xdocs/news/2022.xml               |  54 ---
 xdocs/news/2023.xml               |  57 ----
 xdocs/news/{2011.xml => 2024.xml} |  30 +-
 23 files changed, 44 insertions(+), 1533 deletions(-)

diff --git a/HOWTO-RELEASE.txt b/HOWTO-RELEASE.txt
index d0cb3cdcf..4dc2d8c79 100644
--- a/HOWTO-RELEASE.txt
+++ b/HOWTO-RELEASE.txt
@@ -43,10 +43,10 @@ Ensure dates and/or version numbers are up to date:
 
 Run the release script to check the Java code is aligned with the current 9.0.x
 source.
-./jnirelease.sh --ver=1.2.x --with-apr=/path/to/apr/source
+./jnirelease.sh --ver=1.3.x --with-apr=/path/to/apr/source
 
-Switch back to the 1.2.x branch
-git checkout 1.2.x
+Switch back to the 1.3.x branch
+git checkout 1.3.x
 
 Tagging
 -------
@@ -63,11 +63,11 @@ git status
 git diff
 
 # Tag (modify version as appropriate)
-git commit -a -m "Tag 1.2.35"
-git tag 1.2.35
-git push origin 1.2.35
+git commit -a -m "Tag 1.3.0"
+git tag 1.3.0
+git push origin 1.3.0
 
-# Reset 1.2.x
+# Reset 1.3.x
 git reset --hard HEAD~1
 
 
@@ -75,10 +75,10 @@ Create the source release
 -------------------------
 
 # Modify version as appropriate
-./jnirelease.sh --ver=1.2.35 --with-apr=/path/to/apr/source
+./jnirelease.sh --ver=1.3.0 --with-apr=/path/to/apr/source
 
-# Switch back to the 1.2.x branch
-git checkout 1.2.x
+# Switch back to the 1.3.x branch
+git checkout 1.3.x
 
 
 Create the binary release for Windows
diff --git a/jnirelease.sh b/jnirelease.sh
index f76cda464..aa4cc82f0 100755
--- a/jnirelease.sh
+++ b/jnirelease.sh
@@ -178,7 +178,7 @@ if [ $diffcount -ne 0 ]; then
     echo "WARNING: git subtree is not up to date with"
     echo "         $TCJAVA_GITBASE"
     echo "         Either correct now by running"
-    echo "         'git checkout 1.2.x'"
+    echo "         'git checkout 1.3.x'"
     echo "         'git rm -rf java/org/apache/tomcat/jni'"
     echo "         'git read-tree --prefix=java/org/apache/tomcat/jni/ -u 
tcjava/9.0.x:java/org/apache/tomcat/jni'"
     echo "         'git commit'"
diff --git a/native/NMAKEmakefile b/native/NMAKEmakefile
index ad02d3152..129ebe7b7 100644
--- a/native/NMAKEmakefile
+++ b/native/NMAKEmakefile
@@ -69,7 +69,7 @@ INCLUDES = $(INCLUDES) -I$(WITH_OPENSSL)\inc32
 LDIRS = $(LDIRS) /libpath:"$(WITH_OPENSSL)\out32"
 !ENDIF
 
-LFLAGS = $(LFLAGS) /version:1.2
+LFLAGS = $(LFLAGS) /version:1.3
 LFLAGS = $(LFLAGS) user32.lib psapi.lib gdi32.lib shlwapi.lib wldap32.lib 
ole32.lib
 LFLAGS = $(LFLAGS) $(APR_LIB)
 !IF DEFINED(WITH_FIPS)
diff --git a/native/build/rpm/tcnative.spec.in 
b/native/build/rpm/tcnative.spec.in
index 73c164240..078ca8366 100644
--- a/native/build/rpm/tcnative.spec.in
+++ b/native/build/rpm/tcnative.spec.in
@@ -17,7 +17,7 @@
 
 %define tcnver 1
 %define aprmajor 1
-%define aprminor 4
+%define aprminor 6
 
 Summary: Tomcat Native Java library
 Name: tcnative
@@ -28,7 +28,7 @@ Group: System Environment/Libraries
 URL: http://apr.apache.org/
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 
%{aprmajor}.%{aprminor}.0, openssl >= 1.0.2
+BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 
%{aprmajor}.%{aprminor}.0, openssl >= 1.1.1
 
 %description
 The mission of the Tomcat Native Library (TCN) is to provide a
@@ -38,7 +38,7 @@ contains additional utility interfaces for Java.
 %package devel
 Group: Development/Libraries
 Summary: Tomcat Native development kit
-Requires: tcnative = %{version}-%{release}, apr-devel >= 
%{aprmajor}.%{aprminor}.0, openssl-devel >= 1.0.2
+Requires: tcnative = %{version}-%{release}, apr-devel >= 
%{aprmajor}.%{aprminor}.0, openssl-devel >= 1.1.1
 
 %description devel
 The mission of the Tomcat Native Library (TCN) is to provide a
@@ -90,8 +90,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc --parents html
 
 %changelog
+* Mon Feb 05 2024 Mark Thomas <ma...@apache.org> 1.3.0-1
+- update for tcnative 1.3
 * Sat Oct 31 2015 Rainer Jung <rj...@apache.org> 1.2.0-1
 - update for tcnative 1.2
 * Tue Jun 22 2004 Mladen Turk <mt...@jboss.com> 1.0.0-1
 - update to support v1.0.2 of APR
-                                                                               
 
+                                                                               
 
\ No newline at end of file
diff --git a/native/os/win32/libtcnative.rc b/native/os/win32/libtcnative.rc
index d1a1f7647..55b45baa8 100644
--- a/native/os/win32/libtcnative.rc
+++ b/native/os/win32/libtcnative.rc
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
                      "See the License for the specific language governing " \
                      "permissions and limitations under the License."
 
-#define TCN_VERSION "1.2.40"
+#define TCN_VERSION "1.3.0"
 1000 ICON "apache.ico"
 
 1001 DIALOGEX 0, 0, 252, 51
diff --git a/xdocs/index.xml b/xdocs/index.xml
index f5bdc049a..0a5d77003 100644
--- a/xdocs/index.xml
+++ b/xdocs/index.xml
@@ -60,10 +60,10 @@
 <section name="Headlines">
 <ul>
 
-<li><a href="news/2023.html#20231003">3 October 2023 - <b>TC-Native-1.2.39
+<li><a href="news/2024.html#20240208">8 February 2024 - <b>TC-Native-1.3.0
 released</b></a>
 <p>The Apache Tomcat team is proud to announce the immediate availability of
-Tomcat Native 1.2.39 Stable.</p>
+Tomcat Native 1.3.0 Stable.</p>
 <p>
 The sources and the binaries for selected platforms are available from the
 <a href="../download-native.cgi">Download page</a>.
@@ -205,7 +205,8 @@ INFO: Initializing Coyote HTTP/1.1 on http-8080</source>
 
   <p>
     Refer to the tomcat documentation to configure the connectors (See
-    <a href="http://tomcat.apache.org/tomcat-10.0-doc/apr.html";>Tomcat 
10.0.x</a>,
+    <a href="http://tomcat.apache.org/tomcat-11.0-doc/apr.html";>Tomcat 
11.0.x</a>,
+    <a href="http://tomcat.apache.org/tomcat-10.1-doc/apr.html";>Tomcat 
10.1.x</a>,
     <a href="http://tomcat.apache.org/tomcat-9.0-doc/apr.html";>Tomcat 
9.0.x</a> and 
     <a href="http://tomcat.apache.org/tomcat-8.5-doc/apr.html";>Tomcat 
8.5.x</a>)
   </p>
diff --git a/xdocs/miscellaneous/changelog.xml 
b/xdocs/miscellaneous/changelog.xml
index 60fe4e4c1..68b1136e2 100644
--- a/xdocs/miscellaneous/changelog.xml
+++ b/xdocs/miscellaneous/changelog.xml
@@ -27,10 +27,11 @@
 
 <section name="Preface">
   <p>
-  This is the Changelog for Tomcat Native 1.2.
+  This is the Changelog for Tomcat Native 1.3.x. The Tomcat Native 1.3.x branch
+  started from the 1.2.39 tag.
   </p>
 </section>
-<section name="Changes in 1.2.40">
+<section name="Changes in 1.3.0">
   <changelog>
     <update>
       Drop useless <code>compile.optimize</code> option. (michaelo)
@@ -52,700 +53,9 @@
     </fix>
   </changelog>
 </section>
-<section name="Changes in 1.2.39">
-  <changelog>
-    <fix>
-      <bug>67061</bug>: If the insecure optionalNoCA certificate verification
-      mode is used, disable OCSP if enabled else client certificates from
-      unknown certificate authorities will be rejected. (markt)
-    </fix>
-    <update>
-      Update the recommended minimum version of OpenSSL to 3.0.11. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.38">
-  <changelog>
-    <update>
-      Align default pass phrase prompt with HTTPd. (michaelo)
-    </update>
-    <fix>
-      <bug>66669</bug>: Fix memory leak in SNI processing. (markt)
-    </fix>
-    <update>
-      Update the recommended minimum version of OpenSSL to 1.1.1v. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.37">
-  <changelog>
-    <update>
-      Update the recommended minimum version of APR to 1.7.4. (markt)
-    </update>
-    <update>
-      Update the recommended minimum version of OpenSSL to 1.1.1u. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.36">
-  <changelog>
-    <update>
-      Update the recommended minimum version of APR to 1.7.2. (markt)
-    </update>
-    <update>
-      Update the recommended minimum version of OpenSSL to 1.1.1t. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.35">
-  <changelog>
-    <docs>
-      Document the TLS rengotiation behaviour. (markt)
-    </docs>
-    <docs>
-      Add HOWTO-RELEASE.txt that describes the release process. (markt)
-    </docs>
-    <update>
-      Update recommended OpenSSL version to 1.1.1q or later. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.34">
-  <changelog>
-    <scode>
-      Refactor library initialization so it is compatible with Tomcat 10.1.x
-      onwards where a number of Java classes have been removed. (markt)
-    </scode>
-    <add>
-      Map the OpenSSL 3.x FIPS behaviour to the OpenSSL 1.x API to allow 
clients
-      to determine if the FIPS provider is being used when Tomcat Native is
-      compiled against OpenSSL 3.x. (markt)
-    </add>
-  </changelog>
-</section>
-<section name="Changes in 1.2.33">
-  <changelog>
-    <fix>
-      <bug>66035</bug>: Fix crash when attempting to read TLS session ID after 
a
-      handshake failure. (schultz/markt)
-    </fix>
-    <fix>
-      Enable <code>download_deps.sh</code> to be called from any directory. 
Pull
-      request <pr>12</pr> provided by Dimitrios Soumis. (markt)
-    </fix>
-    <update>
-      Update recommended OpenSSL version to 1.1.1o or later. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.32">
-  <changelog>
-    <update>
-      Update recommended OpenSSL version to 1.1.1n or later. (markt)
-    </update>
-    <fix>
-      Fix release script so it works with the current git layout. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.31">
-  <changelog>
-    <fix>
-      <bug>65441</bug>: Correct previous fix that enabled building to continue
-      with OpenSSL 3.x. Patch provided by lzsiga. (markt)
-    </fix>
-    <fix>
-      <bug>65659</bug>: Remove remaining reference to <code>pkg-config</code>
-      which is no longer included in the Tomcat Native distribution. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.30">
-  <changelog>
-    <add>
-      <bug>65181</bug>: Additional changes required to provided support for
-      using OpenSSL Engines that use proprietary key formats. Based on a patch
-      provided by Edin Hodzic. (markt)
-    </add>
-    <fix>
-      <bug>65329</bug>: Correct handling of <code>WINVER</code> in make file to
-      use correct constant for Windows 7. Add constants for Windows 8,
-      Windows 8.1 and Windows 10. Rename <code>WINNT</code> to
-      <code>WIN2k</code> as it is used for Windows 2000 upwards, not Windows NT
-      upwards. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.29 (not released)">
-  <changelog>
-    <fix>
-      Add a patch for APR that fixes an issue where some Windows systems in 
some
-      configurations would only listen on IPv6 addresses on dual stack systems
-      even though configured to listen on both IPv6 and IPv4 addresses.
-      (michaelo)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.28">
-  <changelog>
-    <fix>
-      Correct a regression in the fix for <bug>65181</bug> that prevented an
-      error message from being displayed if an invalid key file was provided
-      and no OpenSSL Engine was configured. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.27">
-  <changelog>
-    <add>
-      <bug>65181</bug>: Improve support for using OpenSSL Engines that use
-      proprietary key formats. Patch provided by Edin Hodzic. (markt)
-    </add>
-    <update>
-      Update recommended OpenSSL version to 1.1.1k or later. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.26">
-  <changelog>
-    <fix>
-      Enable building to continue against OpenSSL 3.x and 1.1.1. (markt)
-    </fix>
-    <add>
-      <bug>64942</bug>: Expose support for Unix Domain Sockets in APR v1.6 and 
up. (minfrin)
-    </add>
-    <update>
-      Update recommended OpenSSL version to 1.1.1i or later. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.25">
-  <changelog>
-    <fix>
-      Incomplete name mangling fix for C++ compilers in tcn_api.h. (michaelo)
-    </fix>
-    <update>
-      Improve OS-specific header include for native thread id. (michaelo)
-    </update>
-    <fix>
-      Disable keylog callback support for LibreSSL. (michaelo)
-    </fix>
-    <add>
-      Add support for <code>SSLContext.addChainCertificateRaw()</code> with
-      LibreSSL 2.9.1 and up. (michaelo)
-    </add>
-    <add>
-      Add support for HP-UX's _lwp_self() in our
-      ssl_thread_id(void). (michaelo)
-    </add>
-    <remove>
-      Remove default option passed for rpath to linker on HP-UX. (michaelo)
-    </remove>
-    <add>
-      Add an option to allow the OCSP responder check to be bypassed. Note that
-      if OCSP is enabled, a missing responder is now treated as an error.
-      (jfclere)
-    </add>
-    <fix>
-      <bug>64429</bug>: Fix compilation with LibreSSL. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.24">
-  <changelog>
-    <fix>
-      <bug>63671</bug>: libtcnative does not compile with OpenSSL &lt; 1.1.0
-      and APR w/o threading support. (michaelo)
-    </fix>
-    <fix>
-      Correct configure message for OpenSSL libdir. (michaelo)
-    </fix>
-    <update>
-      <bug>64260</bug>: Clean up install target. (michaelo)
-    </update>
-    <fix>
-      <bug>64315</bug>: configure output for OpenSSL wrong/incomplete 
sometimes.
-      (michaelo)
-    </fix>
-    <update>
-      Drop obsolete build time workarounds for HP-UX. (michaelo)
-    </update>
-    <add>
-      Add support for FreeBSD's pthread_getthreadid_np() in our
-      ssl_thread_id(void). (michaelo)
-    </add>
-    <update>
-      <bug>63701</bug>: Use new OpenSSL initialisation process when building 
with
-      OpenSSL 1.1.0 onwards. (mturk)
-    </update>
-    <add>
-      <bug>64316</bug>: Introduce tcn_get_thread_id(void) to reduce code
-         duplication. (michaelo)
-    </add>
-    <fix>
-      Fix linking against OpenSSL in non-standard locations on FreeBSD.
-      (michaelo)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.23">
-  <changelog>
-    <fix>
-      Make file fixes to enable building with APR 1.7.x. (markt)
-    </fix>
-    <fix>
-      Switch to Windows 7 as the default target. (markt)
-    </fix>
-    <update>
-      Update minimum OpenSSL version to 1.0.2r. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.22">
-  <changelog>
-    <fix>
-      <bug>63159</bug>: Unable to complete build when build directory is
-      outside of the source tree. Patch provided by Bob Huemmer. (markt)
-    </fix>
-    <fix>
-      <bug>63356</bug>: Fix client certificate authentication when a 
certificate
-      contains an AIA extension without an OCSP URI. Patch provided by Milind
-      Takawale. (markt)
-    </fix>
-    <fix>
-      <bug>63500</bug>: Fix JVM crash on Connector start when a certificate
-      revocation file or path is specified for OpenSSL. (markt)
-    </fix>
-    <add>
-      Add support for TLS key logging when using OpenSSL 1.1.1 or later. If the
-      environment variable SSLKEYLOGFILE is set then the TLS keys will be 
logged
-      to that file. Patch provided by John Kelly. (markt)
-    </add>
-    <fix>
-      Update build script after migration of soucre repository from Subversion
-      to Git. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.21">
-  <changelog>
-    <fix>
-      Correct a possible JVM crash during shutdown caused by a bug in the fix
-      for the per connection memory leak included in 1.2.20. (rjung)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.20">
-  <changelog>
-    <fix>
-      Update includedir name to tomcat-native instead of apr. (csutherl)
-    </fix>
-    <fix>
-      Fix a minor memory leak. It occurred every time a TLS connector was
-      started so the impact was very unlikely to be noticed. (markt)
-    </fix>
-    <fix>
-      Fix some minor memory leaks that could occur after error conditions 
during
-      TLS connector initialisation. (markt)
-    </fix>
-    <fix>
-      Fix a per connection memory leak when using OpenSSL BIO. This is 
typically
-      used when OpenSSL is providing the TLS support for NIO or NIO2. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.19">
-  <changelog>
-    <fix>
-      <bug>62892</bug>: Fix memory leaks in OCSP handling. (jfclere)
-    </fix>
-    <fix>
-      <bug>62944</bug>: Fix copy/paste error that prevented TLS 1.0 and TLS 1.1
-      from being used if TLS 1.3 was available. Patch provided by Dean Rasheed.
-      (markt)
-    </fix>
-    <fix>
-      Include OpenSSL licensing information in the Tomcat Native binaries for
-      Windows that are built with OpenSSL. (markt)
-    </fix>
-    <update>
-      Update recommended OpenSSL version to 1.0.2q or later. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.18">
-  <changelog>
-    <fix>
-      <bug>62641</bug>: libtool invocations should use --tag=CC. (michaelo)
-    </fix>
-    <scode>
-      Remove support for Netware as there has not been a supported Netware
-      platform for a number of years. (markt)
-    </scode>
-    <add>
-      <bug>62748</bug>: Add support for TLS 1.3 when built with OpenSSL 1.1.1 
or
-      equivalent. (schultz/markt)
-    </add>
-    <add>
-      Expose the API necessary for CLIENT-CERT authentication to be correctly
-      supported when using Tomcat's JSSE implementation backed by OpenSSL.
-      (markt)
-    </add>
-  </changelog>
-</section>
-<section name="Changes in 1.2.17">
-  <changelog>
-    <fix>
-      <bug>62094</bug>: Certificate verification using CRL with
-      Tomcat APR connector does not work. (jfclere)
-    </fix>
-    <fix>
-      <bug>62122</bug>: undefined symbol: SSL_COMP_free_compression_methods. 
(jfclere)
-    </fix>
-    <fix>
-      <bug>62221</bug>: OCSP response processing uses always the first
-      entry in the response. (jfclere)
-    </fix>
-    <fix>
-      Further clean-up in the OCSP extension logic. (jfclere)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.16">
-  <changelog>
-    <fix>
-      Further clean-up in the parsing of the OCSP extension. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.15">
-  <changelog>
-    <update>
-      Update recommended OpenSSL version to 1.0.2m. (markt)
-    </update>
-    <fix>
-      Correctly calculate field lengths when parsing the OCSP extension so
-      that longer values are read correctly. (markt)
-    </fix>
-    <update>
-      Update the recommended APR version to 1.6.3 or later. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.14">
-  <changelog>
-    <fix>
-      Fix a small memory leak during certificate initialization. (rjung)
-    </fix>
-    <fix>
-      Replace use of deprecated <code>ASN1_STRING_data</code> with
-      <code>ASN1_STRING_get0_data</code> when building against
-      OpenSSL 1.1.0 and newer. (rjung)
-    </fix>
-    <fix>
-      Fix a thread local key leak. Only relevant when doing
-      SSL.initialize() and Library.terminate() a lot of times. (rjung)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.13">
-  <changelog>
-    <fix>
-      Add missing source files to Visual Studio project files. (wrowe)
-    </fix>
-    <add>
-      Add support for the OpenSSL SSL_CONF API. (rjung)
-    </add>
-    <add>
-      Add SSLContext.getCiphers(). (rjung)
-    </add>
-    <add>
-      Add method to add a single CA certificate to the list of CA certificates
-      which are accepted as issuers of client certificates. (rjung)
-    </add>
-    <fix>
-      Fix an error not announcing the correct CA list for client certificates
-      during TLS handshake. (rjung)
-    </fix>
-    <fix>
-      Fix renegotiation to obtain a client certificate from a user agent.
-      (markt)
-    </fix>
-    <fix>
-      <bug>58434</bug>: Allow Tomcat Native to be compiled with LibreSSL. Note
-      that some features may not be available when using LibreSSL. (markt)
-    </fix>
-    <fix>
-      <bug>60290</bug>: When building Tomcat Native, don't ignore the value of
-      <code>CC</code> if explicitly set. Patch provided by Michael Osipov.
-      (markt)
-    </fix>
-    <fix>
-      <bug>60301</bug>: When building Tomcat Native, allow the user to override
-      the libtool specified by APR by setting the <code>LIBTOOL</code>
-      environment variable. (markt)
-    </fix>
-    <update>
-      Update build to use APR 1.6.x, with 1.6.2 recommended. (markt)
-    </update>
-    <update>
-      Update recommended OpenSSL version to 1.0.2l. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.12">
-  <changelog>
-    <fix>
-      Correct a regression in the fix for <bug>59797</bug> that triggered a JVM
-      crash on shutdown in some Tomcat unit tests when using the APR/native
-      connector. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.11">
-  <changelog>
-    <fix>
-      <bug>52627</bug>: Prevent a crash in <code>File.infoGet()</code> caused 
by
-      the use of uninitialised variables. Based on patch by Ilya Maykov. 
(markt)
-    </fix>
-    <fix>
-      <bug>55113</bug>: Document the process for creating a static tc-native
-      library with a FIPS-enabled OpenSSL and update the nmake make file to
-      support the process. (markt)
-    </fix>
-    <fix>
-      <bug>55114</bug>: Clean up building instructions for the native component
-      and expand the instructions for building for Windows platforms. (markt)
-    </fix>
-    <fix>
-      <bug>55938</bug>: Resolve remaining clang-analyzer warnings. Note that 
the
-      use of <code>-1</code> to indicate the full array in
-      <code>File.(read|write)[Full]</code> has been removed since it was only
-      partially implemented and the implementation was faulty. (markt)
-    </fix>
-    <fix>
-      <bug>58082</bug>: Update unit tests to use JUnit 4. Refactor unit tests
-      into separate tests and use an external to reference them in the same way
-      an external is used to reference the main code. (markt)
-    </fix>
-    <fix>
-      <bug>59797</bug>: Ensure that the per thread error hash maintained by
-      OpenSSL is cleaned up as individual threads exit to ensure it does not
-      grow too large. Patch provided by Nate Clark. (markt)
-    </fix>
-    <fix>
-      <bug>59996</bug>: Correctly handle building tc-native on a 64-bit system
-      when using an OpenSSL distribution that is not in <code>/usr</code>.
-      (csutherl)
-    </fix>
-    <fix>
-      <bug>60388</bug>: The --disable-maintainer-mode option of the configure
-      script no longer enables the maintainer mode. (ebourg)
-    </fix>
-    <update>
-      Update minimum recommended OpenSSL version to 1.0.2k. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.10">
-  <changelog>
-    <update>
-      Update minimum recommended OpenSSL version to 1.0.2j. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.9">
-  <changelog>
-    <update>
-      Update minimum recommended OpenSSL version to 1.0.2i. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.8">
-  <changelog>
-    <fix>
-      <bug>59616</bug>: Correct the Windows build files so that OCSP is
-      correctly enabled and disabled in the respective Windows binaries. 
(markt)
-    </fix>
-    <fix>
-      Correctly handle OS level EAGAIN return codes during non-blocking TLS 
I/O.
-      (markt)
-    </fix>
-    <fix>
-      Correct a potential performance problem identified by Nate Clark due to
-      Tomcat Native providing OpenSSL with thread identifiers poorly suited to
-      the hash function used by OpenSSL when selecting a bucket for the hash
-      that holds the per thread error data. Tomcat Native on Windows and on
-      Solaris were not affected. A fix has been applied for OSX and Linux. 
Other
-      platforms may still be affected. (markt/rjung)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.7">
-  <changelog>
-    <update>
-      Update minimum recommended OpenSSL version to 1.0.2h. (markt)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.6">
-  <changelog>
-    <update>
-      Change the OpenSSL version check in <code>configure</code>
-      to be fatal. (rjung)
-    </update>
-    <update>
-      Use new OpenSSL 1.1.0 protocol version max and min API
-      when creating a new SSL context. (rjung)
-    </update>
-    <update>
-      Improve renegotiation code and make it compatible with
-      OpenSSL 1.1.0. (rjung)
-    </update>
-    <scode>
-      OpenSSL 1.1.0 compatibility updates. (rjung)
-    </scode>
-    <fix>
-      Fix some compiler warnings in native ssl code. (rjung)
-    </fix>
-    <add>
-      Add support for using Java keystores for certificate chains. (markt)
-    </add>
-    <update>
-      Remove the explicit CRL check when verifying certificates.
-      The checks were already part of the internal certification
-      verification since OpenSSL 0.9.7. Backport from mod_ssl.
-      (rjung)
-    </update>
-  </changelog>
-</section>
-<section name="Changes in 1.2.5">
-  <changelog>
-    <update>
-      Enable OpenSSL version check in <code>configure</code> by
-      default. It can be turned off using
-      <code>--disable-openssl-version-check</code>. (rjung)
-    </update>
-    <fix>
-      <bug>59024</bug>: Native function <code>versionString()</code> and
-      for OpenSSL 1.1.0 also <code>version()</code> (both in in ssl.c) now
-      return the OpenSSL run time version, not the compile time version.
-      (rjung)
-    </fix>
-    <scode>
-      Track changes in the OpenSSL master branch so it is possible to build
-      Tomcat Native with that branch. (billbarker)
-    </scode>
-  </changelog>
-</section>
-<section name="Changes in 1.2.4">
-  <changelog>
-    <fix>
-      SSL.getHandshakeCount(), which was unused, now returns the handshake
-      completed count rather than the handshake started count. (remm)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.3">
-  <changelog>
-    <fix>
-      Remove Java classes that do not have C implementation code
-      for their native methods in the current library. They were
-      used for NPN support which is superseded by ALPN support
-      in the current code. (kkolinko)
-    </fix>
-    <fix>
-      Fix typo in declaration of a stub method used when the library is
-      compiled without OpenSSL support. (kkolinko)
-    </fix>
-    <fix>
-      Fix the signature of the implementation of the native SSL method
-      newSSL() in the case when OPENSSL is not available. (rjung)
-    </fix>
-    <fix>
-      Fix the signature of the implementation of the native SSLSocket
-      method getInfoB() to return jbyteArray instead of jobject.
-      This is consistent with what it actually returns and how
-      the native Java method is declared. (rjung)
-    </fix>
-    <add>
-      Add support for using Java keystores for certificates and keys. (jfclere)
-    </add>
-    <scode>
-      Remove code that performs a read after a renegotiation that appears to be
-      unnecessary with OpenSSL 1.0.2. (billbarker)
-    </scode>
-    <add>
-      Expose <code>SSL_renegotiate</code> to the Java API. (remm)
-    </add>
-  </changelog>
-</section>
-<section name="Changes in 1.2.2">
-  <changelog>
-    <fix>
-      Fix broken debug and maintainer mode build. (rjung)
-    </fix>
-    <fix>
-      Forward port additional fixes to the OpenSSL I/O to align it with
-      non-OpenSSL I/O. (markt)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.1">
-  <changelog>
-    <fix>
-      <bug>58566</bug>: Enable Tomcat Native 1.2.x to work with Tomcat releases
-      that do not have the necessary Java code to support SNI. (markt)
-    </fix>
-    <update>
-      Minor rework of "buildconf" script. (rjung)
-    </update>
-    <fix>
-      Fix APR dependency version expression in RPM spec file. (rjung)
-    </fix>
-    <fix>
-      Fix major library version number in Windows build files, RPM spec file
-      and build description. (rjung)
-    </fix>
-    <fix>
-      Remove files "KEYS" and "download_deps.sh" from Windows (zip)
-      source distribution. (rjung)
-    </fix>
-    <fix>
-      Fix "unused variable" compiler warning. (rjung)
-    </fix>
-  </changelog>
-</section>
-<section name="Changes in 1.2.0">
-  <changelog>
-    <add>
-      Add support for TLS extension ALPN. (markt)
-    </add>
-    <add>
-      Add support for TLS extension SNI (Server Name Indication).
-      (markt)
-    </add>
-    <add>
-      Add support for OpenSSL BIO. (jfclere)
-    </add>
-    <add>
-      Support wakeable pollsets and add Poll.interrupt() API.
-      (mturk)
-    </add>
-    <add>
-      Add Pool.unmanaged() API. (mturk)
-    </add>
-    <update>
-      APIs SSL.generateRSATempKey() and SSL.loadDSATempKey()
-      have been removed. (rjung)
-    </update>
-    <update>
-      The minimum required APR version is 1.4.3.
-    </update>
-    <update>
-      The minimum required OpenSSL version is 1.0.2.
-    </update>
-  </changelog>
+<section name="Changes in 1.2.x">
+<p>Please see the <a 
href="../../native-1.2-doc/miscellaneous/changelog.html">1.2.x
+   changelog</a>.</p>
 </section>
 <section name="Changes in 1.1.x">
 <p>Please see the <a 
href="../../native-1.1-doc/miscellaneous/changelog.html">1.1.x
diff --git a/xdocs/news/2008.xml b/xdocs/news/2008.xml
deleted file mode 100644
index 20e2d466a..000000000
--- a/xdocs/news/2008.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2008.html">
-
-  &project;
-
-  <properties>
-    <title>2008 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2008 News &amp; Status">
-<subsection anchor="20081118.1" name="18 November - TC-Native-1.1.16 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.16. This is a stable release adding some bug fixes.
-</p>
-</subsection>
-<subsection anchor="20080911.1" name="11 September - TC-Native-1.1.15 
released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.15. This is a stable release adding some bug fixes.
-</p>
-</subsection>
-<subsection anchor="20080704.1" name="4 July - TC-Native-1.1.14 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.14. This is a stable release adding some bug fixes.
-</p>
-</subsection>
-<subsection anchor="20080115.1" name="15 February - TC-Native-1.1.13 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.13. This is a stable release adding few new features
-and some bug fixes.
-</p><p>
- Please see the <a 
href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a 
full list of changes.
-</p>
-</subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2009.xml b/xdocs/news/2009.xml
deleted file mode 100644
index 7bd0592aa..000000000
--- a/xdocs/news/2009.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2009.html">
-
-  &project;
-
-  <properties>
-    <title>2009 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2009 News &amp; Status">
-<subsection anchor="20091123.1" name="23 November - TC-Native-1.1.18 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.18. This is a stable release adding some bug fixes.
-</p><p>
- Please see the <a 
href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a 
full list of changes.
-</p>
-</subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2010.xml b/xdocs/news/2010.xml
deleted file mode 100644
index e407bd78c..000000000
--- a/xdocs/news/2010.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2010.html">
-
-  &project;
-
-  <properties>
-    <title>2010 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2010 News &amp; Status">
-<subsection anchor="20100217.1" name="17 February - TC-Native-1.1.20 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.20. This is a stable release adding some bug fixes.
-</p>
-</subsection>
-<subsection anchor="20100108.1" name="8 January - TC-Native-1.1.19 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.19. This is a stable release adding some bug fixes.
-</p><p>
- Please see the <a 
href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a 
full list of changes.
-</p>
-</subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2012.xml b/xdocs/news/2012.xml
deleted file mode 100644
index 902d48f04..000000000
--- a/xdocs/news/2012.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2012.html">
-
-  &project;
-
-  <properties>
-    <title>2012 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2012 News &amp; Status">
-<subsection anchor="20120613.1" name="13 June - TC-Native-1.1.24 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.24. This is a feature-add release adding support for
-per-socket Poller timeouts.
-</p>
-<p>
- Please see the <a 
href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a 
full list of changes.
-</p>
-</subsection>
-<subsection anchor="20120302.1" name="02 March - TC-Native-1.1.23 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.23. This is a stable release adding some bug fixes and
-experimental support for OCSP and PKCS12 certificates.
-</p>
-<p>
- Please see the <a 
href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a 
full list of changes.
-</p>
-</subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2013.xml b/xdocs/news/2013.xml
deleted file mode 100644
index 55230ba6b..000000000
--- a/xdocs/news/2013.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2013.html">
-
-  &project;
-
-  <properties>
-    <title>2013 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2013 News &amp; Status">
-<subsection anchor="20131015.1" name="15 October - TC-Native-1.1.29 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.29. This is a bug fixing release.
-</p>
-</subsection>
-<subsection anchor="20130916.1" name="16 September - TC-Native-1.1.28 
released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.28. This is a bug fixing release.
-</p>
-<p>
- Please see the <a 
href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a 
full list of changes.
-</p>
-</subsection>
-<subsection anchor="20130212.1" name="12 February - TC-Native-1.1.27 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.27. This is a bug fixing release.
-</p>
-<p>
- Please see the <a 
href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a 
full list of changes.
-</p>
-</subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2014.xml b/xdocs/news/2014.xml
deleted file mode 100644
index 76e6a76b8..000000000
--- a/xdocs/news/2014.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2014.html">
-
-  &project;
-
-  <properties>
-    <title>2014 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2014 News &amp; Status">
- <subsection anchor="20141023.1" name="23 October 2014 - TC-Native-1.1.32 
released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.1.32. This release add support for TLSv1.1 and TLSv1.2 and
-  includes Windows binaries built with OpenSSL 1.0.1j and APR 1.5.1.
-  </p>
- </subsection>    
- <subsection anchor="20140707.1" name="7 July 2014 - TC-Native-1.1.31 
released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.1.31. This is a bug fixing release and includes Windows
-  binaries built with OpenSSL 1.0.1h.
-  </p>
- </subsection>    
- <subsection anchor="20140415.1" name="15 April - TC-Native-1.1.30 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.1.30. This is a bug fixing release with added support for
-  EC ciphers if supported by OpenSSL.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2015.xml b/xdocs/news/2015.xml
deleted file mode 100644
index c5c821161..000000000
--- a/xdocs/news/2015.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2015.html">
-
-  &project;
-
-  <properties>
-    <title>2015 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2015 News &amp; Status">
- <subsection anchor="20151215" name="12 Dec 2015 - TC-Native-1.2.3 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.3. This is a bug fix release and includes Windows
-  binaries built with OpenSSL 1.0.2e and APR 1.5.1.
-  </p>
- </subsection>
- <subsection anchor="20151109" name="9 Nov 2015 - TC-Native-1.2.2 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.2. This is a bug fix release and includes Windows
-  binaries built with OpenSSL 1.0.2d and APR 1.5.1.
-  </p>
- </subsection>
- <subsection anchor="20151028" name="28 Oct 2015 - TC-Native-1.2.0 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.0. This is the first release of the 1.2.x series that
-  provides ALPN, SNI and OpenSSl BIO support. It includes Windows binaries 
built
-  with OpenSSL 1.0.2d and APR 1.5.1.
-  </p>
- </subsection>
- <subsection anchor="20150323.1" name="23 March 2015 - TC-Native-1.1.33 
released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.1.33. This is a bug fixing release and includes Windows
-  binaries built with OpenSSL 1.0.1m and APR 1.5.1.
-  </p>
- </subsection>    
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2016.xml b/xdocs/news/2016.xml
deleted file mode 100644
index 4a5fd66cb..000000000
--- a/xdocs/news/2016.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2016.html">
-
-  &project;
-
-  <properties>
-    <title>2016 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2016 News &amp; Status">
- <subsection anchor="20161005" name="5 October 2016 - TC-Native-1.2.10 
released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.10. This is a release to update dependencies for the
-  Windows binaries and includes Windows binaries built with OpenSSL 1.0.2j and
-  APR 1.5.2.
-  </p>
- </subsection>
- <subsection anchor="20160702" name="2 July 2016 - TC-Native-1.2.8 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.8. This is a bug fix release release and includes 
Windows
-  binaries built with OpenSSL 1.0.2h and APR 1.5.2.
-  </p>
- </subsection>
- <subsection anchor="20160508" name="8 May 2016 - TC-Native-1.2.7 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.7. This is a release to update dependencies for the
-  Windows binaries and includes Windows binaries built with OpenSSL 1.0.2h and
-  APR 1.5.2.
-  </p>
- </subsection>
- <subsection anchor="20160426" name="26 Apr 2016 - TC-Native-1.2.6 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.6. This is a bug fix release and includes Windows
-  binaries built with OpenSSL 1.0.2g and APR 1.5.2.
-  </p>
- </subsection>
- <subsection anchor="20160307" name="7 Mar 2016 - TC-Native-1.2.5 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.5. This is a bug fix release and includes Windows
-  binaries built with OpenSSL 1.0.2g and APR 1.5.1.
-  </p>
- </subsection>
- <subsection anchor="20160111" name="11 Jan 2016 - TC-Native-1.2.4 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.4. This is a bug fix release and includes Windows
-  binaries built with OpenSSL 1.0.2e and APR 1.5.1.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2017.xml b/xdocs/news/2017.xml
deleted file mode 100644
index 405b06ed3..000000000
--- a/xdocs/news/2017.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2017.html">
-
-  &project;
-
-  <properties>
-    <title>2017 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2017 News &amp; Status">
- <subsection anchor="20171120" name="20 Nov 2017 - TC-Native-1.2.16 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.16. This is a bugfix release that also updates the
-  dependencies for the Windows binaries and includes Windows binaries built 
with
-  OpenSSL 1.0.2m and APR 1.6.3.
-  </p>
- </subsection>
- <subsection anchor="20170904" name="4 Sep 2017 - TC-Native-1.2.14 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.14. This is a bugfix release that also updates the
-  dependencies for the Windows binaries and includes Windows binaries built 
with
-  OpenSSL 1.0.2l and APR 1.6.2.
-  </p>
- </subsection>
- <subsection anchor="20170221" name="21 Feb 2017 - TC-Native-1.2.12 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability
-  of Tomcat Native 1.2.12. This is a release to update dependencies for the
-  Windows binaries and includes Windows binaries built with OpenSSL 1.0.2k and
-  APR 1.5.2.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2018.xml b/xdocs/news/2018.xml
deleted file mode 100644
index 2da1fdd7f..000000000
--- a/xdocs/news/2018.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2018.html">
-
-  &project;
-
-  <properties>
-    <title>2018 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2018 News &amp; Status">
- <subsection anchor="20181204" name="4 Dec 2018 - TC-Native-1.2.19 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.19. This is a bugfix release that also updates the
-  dependencies for the Windows binaries and includes Windows binaries built
-  with OpenSSL 1.0.2q/APR 1.6.5 and 1.1.1a/APR 1.6.5.
-  </p>
- </subsection>
- <subsection anchor="20181020" name="20 Oct 2018 - TC-Native-1.2.18 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.18. This is a feature and bugfix release that adds TLSv1.3
-  support when built with OpenSSL 1.1.1. It also includes Windows binaries 
built
-  with OpenSSL 1.0.2p/APR 1.6.5 and 1.1.1/APR 1.6.5.
-  </p>
- </subsection>
- <subsection anchor="20180613" name="13 Jun 2018 - TC-Native-1.2.17 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.17. This is a bugfix release that also updates the
-  dependencies for the Windows binaries and includes Windows binaries built 
with
-  OpenSSL 1.0.2o and APR 1.6.3.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2019.xml b/xdocs/news/2019.xml
deleted file mode 100644
index 7c8fa5819..000000000
--- a/xdocs/news/2019.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2019.html">
-
-  &project;
-
-  <properties>
-    <title>2019 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2019 News &amp; Status">
- <subsection anchor="20190702" name="07 Jul 2019 - TC-Native-1.2.23 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.23. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20190131" name="31 Jan 2019 - TC-Native-1.2.21 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.21. This is a bugfix release.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2020.xml b/xdocs/news/2020.xml
deleted file mode 100644
index 3f96ff0c7..000000000
--- a/xdocs/news/2020.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2020.html">
-
-  &project;
-
-  <properties>
-    <title>2020 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2020 News &amp; Status">
- <subsection anchor="20201221" name="21 Dec 2020 - TC-Native-1.2.26 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.26. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20200903" name="3 Sep 2020 - TC-Native-1.2.25 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.25. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20200429" name="29 Apr 2020 - TC-Native-1.2.24 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.24. This is a bugfix release.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2021.xml b/xdocs/news/2021.xml
deleted file mode 100644
index 91263b1fe..000000000
--- a/xdocs/news/2021.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2021.html">
-
-  &project;
-
-  <properties>
-    <title>2021 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2021 News &amp; Status">
- <subsection anchor="20210901" name="1 Sep 2021 - TC-Native-1.2.31 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.31. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20210604" name="4 Jun 2021 - TC-Native-1.2.30 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.30. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20210406" name="6 Apr 2021 - TC-Native-1.2.28 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.28. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20210329" name="29 Mar 2021 - TC-Native-1.2.27 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.27. This is a bugfix release.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2022.xml b/xdocs/news/2022.xml
deleted file mode 100644
index c3ef6eac8..000000000
--- a/xdocs/news/2022.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2022.html">
-
-  &project;
-
-  <properties>
-    <title>2022 News and Status</title>
-  </properties>
-
-<body>
-
-<section name="2022 News &amp; Status">
- <subsection anchor="20220712" name="12 July 2022 - TC-Native-1.2.35 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.35. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20220614" name="14 June 2022 - TC-Native-1.2.34 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.34. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20220509" name="5 May 2022 - TC-Native-1.2.33 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.33. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20220322" name="22 Mar 2022 - TC-Native-1.2.32 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.32. This is a bugfix release.
-  </p>
- </subsection>
-</section>
-</body>
-</document>
diff --git a/xdocs/news/2023.xml b/xdocs/news/2023.xml
deleted file mode 100644
index 052410b37..000000000
--- a/xdocs/news/2023.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!DOCTYPE document [
-  <!ENTITY project SYSTEM "project.xml">
-]>
-<document url="2023.html">
-
-  &project;
-
-  <properties>
-    <title>2023 News and Status</title>
-  </properties>
-
-  <body>
-
-    <section name="2023 News &amp; Status">
-    
-      <subsection anchor="20231003" name="3 October 2023 - TC-Native-1.2.39 
released">
-        <p>The Apache Tomcat team is proud to announce the immediate
-        availability of Tomcat Native 1.2.39.</p>
-      </subsection>
-      
-      <subsection anchor="20230807" name="7 August 2023 - TC-Native-1.2.38 
released">
-        <p>The Apache Tomcat team is proud to announce the immediate
-        availability of Tomcat Native 1.2.38.</p>
-      </subsection>
-      
-      <subsection anchor="20230602" name="2 June 2023 - TC-Native-1.2.37 
released">
-        <p>The Apache Tomcat team is proud to announce the immediate
-        availability of Tomcat Native 1.2.37.</p>
-      </subsection>
-      
-      <subsection anchor="20230213" name="13 February 2023 - TC-Native-1.2.36 
released">
-        <p>The Apache Tomcat team is proud to announce the immediate
-        availability of Tomcat Native 1.2.36.</p>
-      </subsection>
-      
-    </section>
-    
-  </body>
-
-</document>
\ No newline at end of file
diff --git a/xdocs/news/2011.xml b/xdocs/news/2024.xml
similarity index 64%
rename from xdocs/news/2011.xml
rename to xdocs/news/2024.xml
index e24720167..26fd9aba2 100644
--- a/xdocs/news/2011.xml
+++ b/xdocs/news/2024.xml
@@ -18,25 +18,25 @@
 <!DOCTYPE document [
   <!ENTITY project SYSTEM "project.xml">
 ]>
-<document url="2011.html">
+<document url="2024.html">
 
   &project;
 
   <properties>
-    <title>2011 News and Status</title>
+    <title>2024 News and Status</title>
   </properties>
 
-<body>
+  <body>
 
-<section name="2011 News &amp; Status">
-<subsection anchor="20110808.1" name="08 August - TC-Native-1.1.22 released">
-<p>The Apache Tomcat team is proud to announce the immediate availability
-of Tomcat Native 1.1.22. This is a stable release adding some bug fixes.
-</p>
-<p>
- Please see the <a 
href="../../native-1.1-doc/miscellaneous/changelog.html">ChangeLog</a> for a 
full list of changes.
-</p>
-</subsection>
-</section>
-</body>
-</document>
+    <section name="2024 News &amp; Status">
+    
+      <subsection anchor="20240208" name="8 February 2024 - TC-Native-1.3.0 
released">
+        <p>The Apache Tomcat team is proud to announce the immediate
+        availability of Tomcat Native 1.3.0.</p>
+      </subsection>
+      
+    </section>
+    
+  </body>
+
+</document>
\ No newline at end of file


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

Reply via email to