ACE+TAO-6_5_15ACE+TAO-6_5_15

10 files changed, 234 insertions, 46 deletions

diff --git a/ACE/ChangeLogs/ACE-6_5_15 b/ACE/ChangeLogs/ACE-6_5_15
new file mode 100644
index 00000000000..837c2a02fbb
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_15
@@ -0,0 +1,111 @@
+commit 91630f5cdb507babf94e0a9e7cc8ac236bc97648
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 17 08:54:01 2021 +0200
+
+    Update NEWS
+
+commit 216a00bb8e60d3163dec87e634eabdbd8a6118e3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 9 19:27:16 2021 +0200
+
+    Update NEWS
+
+commit f959e309ee75b1b5e51b27e80fb6a0a55cc4dfa1
+Merge: 106e4736533 e2e639121ad
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Sep 6 11:23:46 2021 -0500
+
+    Merge pull request #1670 from mitza-oci/no-conv-lib-62
+    
+    [ace6tao2] Removed conv_lib.mpb
+
+commit 106e47365336828900e66d8e33934e0959ef7838
+Merge: d035863b2a8 615284ae6d9
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Sep 6 11:23:10 2021 -0500
+
+    Merge pull request #1664 from simpsont-oci/atomic_op_gcc_tsan_fixes_and_updated_atomics
+    
+    [ACE6] Update ACE_Atomic_Op_GCC to support newer __atomic operations when available
+
+commit e2e639121adf82de5183688b0d26fd0a6097dd3b
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Aug 31 21:01:43 2021 -0500
+
+    Removed conv_lib.mpb
+    
+    Replaced uses of it with install_lib
+    
+    (cherry picked from commit 1bfbc674980869ef05c6fed94c01f291ff5fd7d4)
+
+commit 615284ae6d9ca661bd1f644b042003dd8e161f30
+Author: Timothy Simpson <simpsont@objectcomputing.com>
+Date:   Thu Aug 26 12:52:39 2021 -0500
+
+    make use of clang's compatibility with GCC's __atomic methods
+
+commit c04bb36209f697dab1f0f46a2868f4f43a5bfe29
+Author: Timothy Simpson <simpsont@objectcomputing.com>
+Date:   Wed Aug 25 22:45:34 2021 -0500
+
+    support for newer preferred C++11 style __atomic methods when applicable and load-side synchronization
+
+commit 2f773602b3a7788e27c0ce05dda02c0eb0326ed2
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Aug 20 15:58:40 2021 -0500
+
+    Fixed warning in ACE_SOCK_Dgram::make_multicast_ifaddr
+
+commit 31673b8bcb8ff7e4b8e67f2671deef5a3f32d521
+Merge: b2600884c13 5dc04f8e9ff
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Aug 20 14:51:03 2021 -0500
+
+    Merge pull request #1657 from jrw972/support-big-sur
+    
+    ACE 6 doesn't support Big Sur
+
+commit f416adcbdc76f096ae34bb984a50c1070e957701
+Author: Justin R. Wilson <wilsonj@objectcomputing.com>
+Date:   Fri Aug 20 11:00:40 2021 -0500
+
+    ACE 6 doesn't support Big Sur
+    
+    Problem
+    -------
+    
+    ACE 6 doesn't compile for macOS Big Sur.
+    
+    Solution
+    --------
+    
+    Update platform_macosx.GNU and related files to support Catalina and
+    Big Sur.
+
+commit ac4db46a6b9505ec3f2fe0e6792b9a08a8534843
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 16 16:20:25 2021 +0200
+
+    Updated Embarcadero C++ Compiler checks
+    
+        * ACE/ace/Compression/rle/RLECompressor.cpp:
+        * ACE/ace/post.h:
+        * ACE/ace/pre.h:
+
+commit b344abde2f0676ecda529735264f1c41e3c5ee94
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 16 08:32:08 2021 +0200
+
+    Updated Embarcadero version checks
+
+commit 38bfd5a69ed2f584e436980b9fe309935010919f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 16 08:28:09 2021 +0200
+
+    Updated Embarcadero version checks
+
+commit 448e4b00edd5d4e5e7ccdbbfcb97dbc686ecfdb5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 4 08:48:30 2021 +0200
+
+    Updated for next release
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index 286fb97431e..808bd9ef0c7 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.14
+    ACE VERSION: 6.5.15
 
     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 fd935229cfd..f1ed65e3af7 100644
--- a/ACE/VERSION.txt
+++ b/ACE/VERSION.txt
@@ -1,4 +1,4 @@
-This is ACE version 6.5.14, released Wed Aug 04 08:36:34 CEST 2021
+This is ACE version 6.5.15, released Wed Sep 29 09:17:26 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 b9e677ec2f3..bbd1a4a3d89 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 14
-#define ACE_BETA_VERSION 14
-#define ACE_VERSION "6.5.14"
-#define ACE_VERSION_CODE 0x6050e
+#define ACE_MICRO_VERSION 15
+#define ACE_BETA_VERSION 15
+#define ACE_VERSION "6.5.15"
+#define ACE_VERSION_CODE 0x6050f
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/ACE/debian/control b/ACE/debian/control
index 05b868d7ff5..a9ebd8daf5f 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.14
+Package: libace-6.5.15
 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.14 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.15 (= ${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.14
+Package: libace-ssl-6.5.15
 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.14 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.15 (= ${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.14
+Package: libace-rmcast-6.5.15
 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.14 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.15 (= ${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.14
+Package: libace-tmcast-6.5.15
 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.14 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.15 (= ${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.14
+Package: libace-htbp-6.5.15
 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.14 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.15 (= ${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.14
+Package: libace-inet-6.5.15
 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.14 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.15 (= ${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.14
+Package: libace-inet-ssl-6.5.15
 Architecture: any
 Section: libs
-Depends: libace-inet-6.5.14, libace-ssl-6.5.14, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.15, libace-ssl-6.5.15, ${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.14 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.15 (= ${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.14
+Package: libacexml-6.5.15
 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.14 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.15 (= ${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.14
+Package: libace-xml-utils-6.5.15
 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.14 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.15 (= ${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.14
+Package: libkokyu-6.5.15
 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.14 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.15 (= ${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.14
+Package: libace-xtreactor-6.5.15
 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.14 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.15 (= ${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.14
+Package: libace-tkreactor-6.5.15
 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.14 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.15 (= ${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.14
+Package: libace-flreactor-6.5.15
 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.14 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.15 (= ${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.14
+Package: libace-foxreactor-6.5.15
 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.14 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.15 (= ${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.14
+Package: libnetsvcs-6.5.15
 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.14 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.15 (= ${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 9be97599e61..ada8cf952bf 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.14
-%define TAOVER  2.5.14
+%define ACEVER  6.5.15
+%define TAOVER  2.5.15
 
 # Conditional build
 # Default values are
diff --git a/TAO/ChangeLogs/TAO-2_5_15 b/TAO/ChangeLogs/TAO-2_5_15
new file mode 100644
index 00000000000..f2b532e4a29
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_5_15
@@ -0,0 +1,77 @@
+commit e2e639121adf82de5183688b0d26fd0a6097dd3b
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Aug 31 21:01:43 2021 -0500
+
+    Removed conv_lib.mpb
+    
+    Replaced uses of it with install_lib
+    
+    (cherry picked from commit 1bfbc674980869ef05c6fed94c01f291ff5fd7d4)
+
+commit 01c351d947d384751554b134232ca98a9e2f0a42
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Aug 26 16:35:59 2021 -0500
+
+    update for ace6tao2 branch
+
+commit b04549c0a1ccef03e8ebc08b2c3e7875d5147772
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Aug 26 16:32:34 2021 -0500
+
+    annotest_idl.mpc: simplify using tao_idl_fe.mpb now that it's fixed
+    
+    (cherry picked from commit b4b2c11a6121786288b489eca3e2f155bea26167)
+
+commit ddf34497171687b3e7310714a3efd6da96f8439a
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Aug 26 16:20:30 2021 -0500
+
+    Unit test for TAO_IDL_FE's AST
+    
+    (cherry picked from commit 5e2989a4d63b05cab291bd99acf2fdb00cb0578e)
+
+commit 8d13e38185201f272e619113cc901319d2319c9c
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Aug 26 16:17:44 2021 -0500
+
+    removed invalid base project from tao_idl_fe
+    
+    (cherry picked from commit 26c8e7643c6623ffee6c902203ec9b55c7f216cf)
+
+commit 3a344501bebb195b1728c209d3e162622e8ec506
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Aug 26 08:48:34 2021 -0500
+
+    TAO_IDL_FE: NT_fixed needs owns_base_type in typedef
+
+commit ee7ce31bfef2fff492986fb7a585d0e0804ae72e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 16 17:01:15 2021 +0200
+
+    Updated Embarcadero compiler checks
+    
+        * TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp:
+        * TAO/tests/Bug_3574_Regression/test.cpp:
+
+commit c2b320bec71aa87b0f58251df05146d7cf84f459
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 16 16:49:28 2021 +0200
+
+    Updated Embarcadero compiler checks
+    
+        * TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MC_Default_Factory.h:
+        * TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h:
+
+commit 050a5a59990fd781fe33e464c82af448dbb6f32e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 16 16:34:29 2021 +0200
+
+    Updated compiler check
+    
+        * TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp:
+
+commit 448e4b00edd5d4e5e7ccdbbfcb97dbc686ecfdb5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 4 08:48:30 2021 +0200
+
+    Updated for next release
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 63c4a23aaa6..2475376e942 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.14
-    ACE VERSION: 6.5.14
+    TAO VERSION: 2.5.15
+    ACE VERSION: 6.5.15
 
     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 bd16d5998b8..d02d28b8929 100644
--- a/TAO/VERSION.txt
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 2.5.14, released Wed Aug 04 08:36:34 CEST 2021
+This is TAO version 2.5.15, released Wed Sep 29 09:17:26 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 a5eb72b9a35..dc51e2195d4 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 14
-#define TAO_BETA_VERSION 14
-#define TAO_VERSION "2.5.14"
-#define TAO_VERSION_CODE 0x2050e
+#define TAO_MICRO_VERSION 15
+#define TAO_BETA_VERSION 15
+#define TAO_VERSION "2.5.15"
+#define TAO_VERSION_CODE 0x2050f
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))