ACE+TAO-6_5_13ACE+TAO-6_5_13

10 files changed, 278 insertions, 46 deletions

diff --git a/ACE/ChangeLogs/ACE-6_5_13 b/ACE/ChangeLogs/ACE-6_5_13
new file mode 100644
index 00000000000..2b677f723a6
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_13
@@ -0,0 +1,181 @@
+commit fb1c569bc48ecf8d8adc79af59fed680aa12d3dc
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed May 12 15:14:57 2021 -0500
+
+    Fix Branch Issue with Release Script
+    
+    Also do some cleanup, and change the `*_VERSION_CODE` macros to be
+    formatted using hexadecimal.
+
+commit b8cefe674cb26661cc1035115304fdfdb16c57f0
+Merge: 3f6995a6947 de11aebcd63
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri May 7 08:14:52 2021 -0500
+
+    Merge pull request #1503 from iguessthislldo/igtd/6-5-13-news
+    
+    6.5.13 News
+
+commit de11aebcd633592e09d7d4ab39fd991c7b12c373
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Thu May 6 22:34:49 2021 -0500
+
+    Apply suggestions from code review
+    
+    Co-authored-by: Adam Mitz <mitza@objectcomputing.com>
+
+commit f0d00737acf3cb588ecd6b8bf62034450e87a6a1
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Thu May 6 18:09:40 2021 -0500
+
+    6.5.13 News
+
+commit a9d7e7b9a82447e4f20c22f57b78a697ab5ba809
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Thu May 6 11:30:18 2021 -0500
+
+    Remove Latest Branch Skip in Release Script
+
+commit 87a939ae150be86cb4b2a1e2dedc6083b23e7e48
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed May 5 23:43:56 2021 -0500
+
+    Branch Option for Release Script
+
+commit e83a4ee8cb2285c002edaa38c7895c17d651bdfc
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Jan 19 11:28:42 2021 -0600
+
+    platform_g++_common.GNU: Remove ARFLAGS += -c
+    
+    Older GNU ar may not have this option and this just supresses an extra
+    log output, so we can remove it.
+
+commit 5f014185220ac20655f4f3cbcf53c885c86c2449
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 18 19:05:05 2021 +0100
+
+    Manually apply fix of #1414 for ace6tao2
+    
+        * ACE/include/makeinclude/platform_g++_common.GNU:
+
+commit 83c488f991ead833aefaf297e2fbe50151e70910
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Jan 5 23:52:10 2021 -0600
+
+    Add Missing Export to ACE_OS::thr_gettid
+
+commit a43b786edefd6ec11df656d918d16777da08f782
+Merge: f1733f33df4 eb4963c4747
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Jan 5 08:51:46 2021 -0600
+
+    Merge pull request #1352 from kuznetsovmoci/IPv6_fixes
+    
+    [ACE6] Fixes for IPv6 multicast and inet_ntop/inet_pton on Windows
+
+commit eb4963c474759e86e6c621a5b240e708ec7af690
+Author: Mike Kuznetsov <kuznetsovm@objectcomputing.com>
+Date:   Mon Jan 4 15:11:53 2021 -0600
+
+    Fixes as per PR#1352 review
+
+commit 96c0e79c13f98142c0e04c88f4e2ec4bc22396d5
+Author: Mike Kuznetsov <kuznetsovm@objectcomputing.com>
+Date:   Mon Jan 4 11:53:44 2021 -0600
+
+    Fixes as per PR#1352 review
+
+commit 5a32d3b4aae39dec23a3dcd65fc7e1d47a269187
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Dec 30 18:07:41 2020 -0600
+
+    Fix Logic for ANDROID_ABI and ANDROID_ARCH
+    
+    Also fix where I accidentally enabled NEON to be default that got
+    carried over from ACE7. NEON should remain disabled by default in ACE6
+    since that's how it currently is.
+
+commit 51170e43e87ebac98e8de4a504f134edaf22159a
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Dec 30 17:41:01 2020 -0600
+
+    Always Define ANDROID_ABI for Compatibility
+
+commit eb5d5e01a17054a5b568c4eae9c1c09cd2ab4178
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Dec 30 17:49:02 2020 -0600
+
+    Move -llog from platform_android.GNU to acedefaults
+
+commit 1d5ef81d1eb0b38cad6628e9efca36778945b2ab
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Dec 29 22:01:50 2020 -0600
+
+    Fix Older NDKs Not Having armv7a-* Prefixed Tools
+    
+    Will have to check for them or fallback to the arm-* prefix.
+
+commit b7088652c6b5621f975dcd6b1699fc41fa3d8cc5
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Dec 29 22:01:18 2020 -0600
+
+    Revert to Current Include Style
+
+commit f5c406b5cf67fd86deacd54a76d98bdc552ff5ec
+Author: Mike Kuznetsov <kuznetsovm@objectcomputing.com>
+Date:   Wed Dec 23 09:36:42 2020 -0600
+
+    Removed trailing whitespace
+
+commit 43471263f8defb73609ada4b6d5c2925688b87dd
+Author: Mike Kuznetsov <kuznetsovm@objectcomputing.com>
+Date:   Wed Dec 23 09:25:18 2020 -0600
+
+    Fixes for IPv6 on Windows
+
+commit f6770cf33569bf04bedfa8be87179e826cd79f70
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Sat Dec 12 20:24:18 2020 -0600
+
+    Changes from #1321
+    
+    https://github.com/DOCGroup/ACE_TAO/pull/1321
+
+commit 66cd36af76472454c9575c92057e638893bb54d3
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Sat Dec 12 20:23:47 2020 -0600
+
+    config-android.h: Minor Tweaks
+
+commit 155a2b72c27bd2cc056914e4e68e779c2f1f2c63
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Sun Dec 6 15:46:16 2020 -0600
+
+    Android NDK >=r19 for Direct Build
+
+commit be6fe94f998d2f9bccc9e1d62b989157cd5352da
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Oct 28 15:17:53 2020 +0100
+
+    Upgrade xcode check to include 12.0
+    
+        * ACE/tests/Compiler_Features_32_Test.cpp:
+
+commit 1d7c9f996e4b62c050e5a46e92e37c198b9c490c
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Sat Dec 5 16:04:50 2020 -0600
+
+    Support Building with Android NDK Directly
+    
+    Changes in https://github.com/DOCGroup/ACE_TAO/pull/1318 modified for
+    capability's sake for ACE6.
+    
+    - Made it easier to use `gnuace`-built libraries in as imported
+      libraries in CMake-based Android Studio native projects.
+    
+    - Replaced `ANDROID_ABI` with `android_abi`, but kept the former as an
+      alias of the later for compatibility.
+    
+    - Remove need to pass a macro to compiler about `android/ndk-version.h`
+      unless the NDK is old
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index ec2169becd6..b2185061816 100644
--- a/ACE/PROBLEM-REPORT-FORM
+++ b/ACE/PROBLEM-REPORT-FORM
@@ -40,7 +40,7 @@
 To: ace-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 6.5.12
+    ACE VERSION: 6.5.13
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/VERSION.txt b/ACE/VERSION.txt
index ed10f670b0f..62e8c74e470 100644
--- a/ACE/VERSION.txt
+++ b/ACE/VERSION.txt
@@ -1,4 +1,4 @@
-This is ACE version 6.5.12, released Tue Oct 27 12:46:14 CET 2020
+This is ACE version 6.5.13, released Fri May 14 09:39:28 CEST 2021
 
 If you have any problems with or questions about ACE, please send
 e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu),
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index 0d4635b824b..ec0848ca684 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,8 +4,8 @@
 
 #define ACE_MAJOR_VERSION 6
 #define ACE_MINOR_VERSION 5
-#define ACE_MICRO_VERSION 12
-#define ACE_BETA_VERSION 12
-#define ACE_VERSION "6.5.12"
-#define ACE_VERSION_CODE 394508
+#define ACE_MICRO_VERSION 13
+#define ACE_BETA_VERSION 13
+#define ACE_VERSION "6.5.13"
+#define ACE_VERSION_CODE 0x6050d
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/ACE/debian/control b/ACE/debian/control
index c1645f8eec1..12d6d3e763c 100644
--- a/ACE/debian/control
+++ b/ACE/debian/control
@@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator
   * mpc-ace: generates project files for a single target
   * mwc-ace: generates workspace files for a set of projects
 
-Package: libace-6.5.12
+Package: libace-6.5.13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -45,7 +45,7 @@ Description: C++ network programming framework
 Package: libace-dev
 Architecture: any
 Section: libdevel
-Depends: libace-6.5.12 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.13 (= ${binary:Version}), ${misc:Depends}
 Suggests: libace-doc, pkg-config
 Replaces: mpc-ace (<< 5.6.3-4)
 Description: C++ network programming framework - development files
@@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation
  This package contains the ACE overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libace-ssl-6.5.12
+Package: libace-ssl-6.5.13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -73,12 +73,12 @@ Description: ACE secure socket layer library
 Package: libace-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-ssl-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
 Description: ACE secure socket layer library - development files
  This package contains the header files and static library for the ACE
  SSL library.
 
-Package: libace-rmcast-6.5.12
+Package: libace-rmcast-6.5.13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -92,12 +92,12 @@ Description: ACE reliable multicast library
 Package: libace-rmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-rmcast-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE reliable multicast library - development files
  This package contains the header files and static library for the ACE
  reliable multicast library.
 
-Package: libace-tmcast-6.5.12
+Package: libace-tmcast-6.5.13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -111,12 +111,12 @@ Description: ACE transactional multicast library
 Package: libace-tmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tmcast-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE transactional multicast library - development files
  This package contains the header files and static library for the ACE
  transactional multicast library.
 
-Package: libace-htbp-6.5.12
+Package: libace-htbp-6.5.13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library
 Package: libace-htbp-dev
 Architecture: any
 Section: libdevel
-Depends: libace-htbp-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE protocol over HTTP tunneling library - development files
  This package contains the header files and static library for the ACE
  HTBP library.
 
-Package: libace-inet-6.5.12
+Package: libace-inet-6.5.13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -146,15 +146,15 @@ Description: ACE Inet protocol library
 Package: libace-inet-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE Inet protocol library - development files
  This package contains the header files and static library for the ACE
  Inet protocol library.
 
-Package: libace-inet-ssl-6.5.12
+Package: libace-inet-ssl-6.5.13
 Architecture: any
 Section: libs
-Depends: libace-inet-6.5.12, libace-ssl-6.5.12, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.13, libace-ssl-6.5.13, ${shlibs:Depends}, ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library
  This package provides an ACE addon library for clients (and possibly
  servers at some point) using Inet protocols which support SSL, such as
@@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library
 Package: libace-inet-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-ssl-6.5.12 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.13 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library - development files
  This package contains the header files and static library for the ACE
  SSL-enabled Inet protocol library.
@@ -180,7 +180,7 @@ Description: ACE perfect hash function generator
  basically the same options and functionality. ace_gperf simply takes
  advantage of some of the features provided by the ACE library.
 
-Package: libacexml-6.5.12
+Package: libacexml-6.5.13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -196,12 +196,12 @@ Package: libacexml-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libacexml-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SAX based XML parsing library - development files
  This package contains the header files and static library for the ACE
  XML parsing library.
 
-Package: libace-xml-utils-6.5.12
+Package: libace-xml-utils-6.5.13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -215,12 +215,12 @@ Package: libace-xml-utils-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libace-xml-utils-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
 Description: ACE XML utility classes and methods - development files
  This package contains the header files and static library for the ACE XML
  Utils library
 
-Package: libkokyu-6.5.12
+Package: libkokyu-6.5.13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library
 Package: libkokyu-dev
 Architecture: any
 Section: libdevel
-Depends: libkokyu-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE scheduling and dispatching library - development files
  This package contains the header files and static library for the ACE
  scheduling and dispatching library.
 
-Package: libace-xtreactor-6.5.12
+Package: libace-xtreactor-6.5.13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
 Description: ACE-GUI reactor integration for Xt - development files
  This package contains header files and static library for the ACE-Xt
  reactor integration.
 
-Package: libace-tkreactor-6.5.12
+Package: libace-tkreactor-6.5.13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tkreactor-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
 Description: ACE-GUI reactor integration for Tk - development files
  This package contains header files and static library for the ACE-Tk
  reactor integration.
 
-Package: libace-flreactor-6.5.12
+Package: libace-flreactor-6.5.13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
 Description: ACE-GUI reactor integration for FLTK - development files
  This package contains header files and static library for the ACE-FLTK
  reactor integration.
 
-Package: libace-foxreactor-6.5.12
+Package: libace-foxreactor-6.5.13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX
 Package: libace-foxreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-foxreactor-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for FOX - development files
  This package contains header files and static library for the ACE-FOX
  reactor integration.
@@ -343,7 +343,7 @@ Description: ACE network service implementations
  files to link the various ACE network services together, either
  statically or dynamically, and form complete server programs.
 
-Package: libnetsvcs-6.5.12
+Package: libnetsvcs-6.5.13
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries
 Package: libnetsvcs-dev
 Architecture: any
 Section: libdevel
-Depends: libnetsvcs-6.5.12 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.13 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE network service implementations - development files
  ACE network services provide reusable components for common
  distributed system tasks such as logging, naming, locking, and time
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index 016f775e646..b0306707f07 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,6 +1,6 @@
 # Set the version number here.
-%define ACEVER  6.5.12
-%define TAOVER  2.5.12
+%define ACEVER  6.5.13
+%define TAOVER  2.5.13
 
 # Conditional build
 # Default values are
diff --git a/TAO/ChangeLogs/TAO-2_5_13 b/TAO/ChangeLogs/TAO-2_5_13
new file mode 100644
index 00000000000..c88fa136123
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_5_13
@@ -0,0 +1,51 @@
+commit de11aebcd633592e09d7d4ab39fd991c7b12c373
+Author: Fred Hornsey <fred@hornsey.us>
+Date:   Thu May 6 22:34:49 2021 -0500
+
+    Apply suggestions from code review
+    
+    Co-authored-by: Adam Mitz <mitza@objectcomputing.com>
+
+commit f0d00737acf3cb588ecd6b8bf62034450e87a6a1
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Thu May 6 18:09:40 2021 -0500
+
+    6.5.13 News
+
+commit 71d98de755a05fc66c19bf79f8a8ad87b949c88a
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Apr 27 12:45:22 2021 -0500
+
+    Remove Support Macro
+
+commit 263e285c83a4b21691121e7697daf71792fcba3d
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Mon Apr 26 21:57:47 2021 -0500
+
+    Support C++ Keywords in DCPS_DATA_SEQUENCE_TYPE
+    
+    Made for https://github.com/objectcomputing/OpenDDS/pull/2608
+
+commit 144e34c2aa485f48dbe5e4acc1e2eb30f322e128
+Author: Timothy Simpson <simpsont@objectcomputing.com>
+Date:   Mon Apr 12 12:29:17 2021 -0500
+
+    fix wstring coerce leak in tao_idl
+
+commit bca5a4aa34ca2e9a9597f145c8f2ec60e678c9b2
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jan 21 10:21:26 2021 -0600
+
+    MPC updates for building TAO in a path with spaces
+
+commit faab6830cf4ecf67b452183dba712caae7996be4
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jan 21 08:33:01 2021 -0600
+
+    tao_idl: ACE logging with %p requires an additional varargs argument, %m doesn't
+
+commit 447b84385531427c1ec1a7aa8298e9bb5a846c0d
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jan 21 08:32:19 2021 -0600
+
+    tao_idl: when invoking preproc don't add quotes to args that already have them
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index fcfe13e826b..faa2ad4b4de 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -40,8 +40,8 @@
 To: tao-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 2.5.12
-    ACE VERSION: 6.5.12
+    TAO VERSION: 2.5.13
+    ACE VERSION: 6.5.13
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/VERSION.txt b/TAO/VERSION.txt
index de53a1d46af..c51ba11733e 100644
--- a/TAO/VERSION.txt
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 2.5.12, released Tue Oct 27 12:46:14 CET 2020
+This is TAO version 2.5.13, released Fri May 14 09:39:28 CEST 2021
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu),
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 10655235dc0..61d42672ccc 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,8 +4,8 @@
 
 #define TAO_MAJOR_VERSION 2
 #define TAO_MINOR_VERSION 5
-#define TAO_MICRO_VERSION 12
-#define TAO_BETA_VERSION 12
-#define TAO_VERSION "2.5.12"
-#define TAO_VERSION_CODE 132364
+#define TAO_MICRO_VERSION 13
+#define TAO_BETA_VERSION 13
+#define TAO_VERSION "2.5.13"
+#define TAO_VERSION_CODE 0x2050d
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))