ACE+TAO-7_0_6ACE+TAO-7_0_6

10 files changed, 477 insertions, 44 deletions

diff --git a/ACE/ChangeLogs/ACE-7_0_6 b/ACE/ChangeLogs/ACE-7_0_6
new file mode 100644
index 00000000000..bab9ec3bf0d
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-7_0_6
@@ -0,0 +1,144 @@
+commit d61d61771cb9f73a9c2a0fc4c4f896385513c212
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 20 08:26:33 2022 +0100
+
+    List changes
+    
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit e1066915005387ee81397e9cec2e24b72abb1bd9
+Merge: a8372419d0e 27acd637ea3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 17 14:40:36 2022 +0100
+
+    Merge pull request #1765 from jwillemsen/jwi-cleanup2
+    
+    Use doxygen/nullptr/bool
+
+commit 27acd637ea341c104749d6b8369d67fc5448920d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 17 11:57:46 2022 +0100
+
+    Use doxygen/nullptr/bool
+    
+        * ACE/ace/Log_Msg.cpp:
+        * ACE/ace/NT_Service.cpp:
+        * ACE/ace/Object_Manager.cpp:
+        * ACE/ace/Object_Manager.h:
+        * ACE/ace/Thread.inl:
+        * ACE/tests/Task_Test.cpp:
+        * TAO/tao/DynamicInterface/Request.cpp:
+        * TAO/tao/GIOP_Message_Base.cpp:
+        * TAO/tao/Messaging/AMH_Response_Handler.cpp:
+
+commit d41442943e4fcdfc689133619b2043aee7d62a59
+Merge: 97daeea11d2 ab0b550403f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 13 17:40:49 2022 +0100
+
+    Merge pull request #1761 from jwillemsen/jwi-defaultoverride
+    
+    Make use of C++ default/override
+
+commit ab0b550403f711d725405afdd04475107b8f3bd2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 13 10:28:36 2022 +0100
+
+    Make use of C++ default/override
+
+commit 97daeea11d251609247a90379d61551e8627910a
+Merge: 71c64284b43 0f69c85d3a3
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jan 10 21:20:04 2022 -0600
+
+    Merge pull request #1752 from mitza-oci/gha-install
+    
+    make install, pkgconfig, ace_for_tao fixes
+
+commit 0f69c85d3a38b8b50bd766fae5795b81329c7335
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jan 7 16:55:12 2022 -0600
+
+    Fixed a few pkg-config issues
+
+commit ee8f83a1e404008de94f274c821300b051c0f72e
+Merge: f6a98bf6e81 5edb3f8c49d
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jan 7 08:21:15 2022 -0600
+
+    Merge pull request #1749 from mitza-oci/idldep
+    
+    depgen for IDL: remove assumption about IDL files in subdirs
+
+commit cacd3ed5e1b549e9adb7c8701ca33d6996ea532d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 7 11:33:33 2022 +0100
+
+    Removed lef over for rcsid
+    
+        * ACE/bin/MakeProjectCreator/config/acedefaults.mpb:
+        * ACE/bin/libsize.pl:
+        * TAO/docs/minimumTAO.html:
+        * TAO/docs/performance.html:
+
+commit 5baa38055364284c93cade6beb486f5ca178d024
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jan 6 21:31:25 2022 -0600
+
+    Updated ace_for_tao project to allow it to install
+
+commit ac17f0ebd2d13b5e403adf782d2e4460695bc716
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jan 6 19:10:38 2022 -0600
+
+    removed a file that's no longer in the repo from ace_for_tao.mpc
+
+commit 5edb3f8c49de9b98900bcc03ba5e0500fcc020db
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jan 6 11:01:55 2022 -0600
+
+    depgen for IDL: remove assumption about IDL files in subdirs
+    
+    tao_idl dir/file.idl doesn't put its output in dir by default
+    The ObjectGenerator perl module doesn't know about the -o option to tao_idl
+    The base filename may work anyway due to VPATH
+
+commit 5d5cf9581bfb7fb92df367ea326b18c5b71cc4e4
+Author: Cristian Ungureanu <cristian.ungureanu@gmail.com>
+Date:   Tue Nov 30 09:43:01 2021 +0200
+
+    Fixed a minor OS version comparison error.
+
+commit acd22a1811e54c53472c15600c541922d779569f
+Author: Cristian Ungureanu <cristian.ungureanu@gmail.com>
+Date:   Mon Nov 29 15:41:53 2021 +0200
+
+    Will fallback to macOS 12 (latest) if on higher OS.
+
+commit 183f781cd689802874e9f56f10b3e5591b0914a7
+Author: Cristian Ungureanu <cristian.ungureanu@gmail.com>
+Date:   Mon Nov 29 15:20:04 2021 +0200
+
+    Support for MacOS 10.12 Monterey - Intel build.
+
+commit e66d46e38a26f3113edd07241337205e9842cf40
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Nov 18 15:03:57 2021 +0100
+
+    Fallback to MacOSX 11 latest when we have a not recognized major version
+    
+        * ACE/include/makeinclude/platform_macosx.GNU:
+        * TAO/NEWS:
+
+commit b75ee3d8e1cc3dcad8d508b590167837fe0bfa2a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Nov 17 11:30:38 2021 +0100
+
+    Prepare for next release and make x.0.5 public
+    
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index 5a6bcf0d611..616aa210060 100644
--- a/ACE/PROBLEM-REPORT-FORM
+++ b/ACE/PROBLEM-REPORT-FORM
@@ -25,7 +25,7 @@ include an entire platform-specific configuration file in the form.
 
 8<----------8<----------8<----------8<----------8<----------8<----------8<----
 
-    ACE VERSION: 7.0.5
+    ACE VERSION: 7.0.6
 
     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 ea1a25fc99d..16d2dd3f2c8 100644
--- a/ACE/VERSION.txt
+++ b/ACE/VERSION.txt
@@ -1,4 +1,4 @@
-This is ACE version 7.0.5, released Wed Nov 17 09:29:01 CET 2021
+This is ACE version 7.0.6, released Thu Jan 20 09:26:53 CET 2022
 
 If you have any problems with or questions about ACE, please open
 a issue or discussion on the ACE_TAO github project at
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index 8e0dfe20710..8a880da6b1e 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,7 +4,7 @@
 
 #define ACE_MAJOR_VERSION 7
 #define ACE_MINOR_VERSION 0
-#define ACE_MICRO_VERSION 5
-#define ACE_VERSION "7.0.5"
-#define ACE_VERSION_CODE 0x70005
+#define ACE_MICRO_VERSION 6
+#define ACE_VERSION "7.0.6"
+#define ACE_VERSION_CODE 0x70006
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/ACE/debian/control b/ACE/debian/control
index bd3f920807a..de23ca74674 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-7.0.5
+Package: libace-7.0.6
 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-7.0.5 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-7.0.6 (= ${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-7.0.5
+Package: libace-ssl-7.0.6
 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-7.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-7.0.6 (= ${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-7.0.5
+Package: libace-rmcast-7.0.6
 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-7.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-7.0.6 (= ${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-7.0.5
+Package: libace-tmcast-7.0.6
 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-7.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-7.0.6 (= ${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-7.0.5
+Package: libace-htbp-7.0.6
 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-7.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-7.0.6 (= ${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-7.0.5
+Package: libace-inet-7.0.6
 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-7.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-7.0.6 (= ${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-7.0.5
+Package: libace-inet-ssl-7.0.6
 Architecture: any
 Section: libs
-Depends: libace-inet-7.0.5, libace-ssl-7.0.5, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-7.0.6, libace-ssl-7.0.6, ${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-7.0.5 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-7.0.6 (= ${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-7.0.5
+Package: libacexml-7.0.6
 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-7.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-7.0.6 (= ${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-7.0.5
+Package: libace-xml-utils-7.0.6
 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-7.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-7.0.6 (= ${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-7.0.5
+Package: libkokyu-7.0.6
 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-7.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-7.0.6 (= ${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-7.0.5
+Package: libace-xtreactor-7.0.6
 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-7.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-7.0.6 (= ${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-7.0.5
+Package: libace-tkreactor-7.0.6
 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-7.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-7.0.6 (= ${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-7.0.5
+Package: libace-flreactor-7.0.6
 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-7.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends}
+Depends: libace-flreactor-7.0.6 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${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-7.0.5
+Package: libace-foxreactor-7.0.6
 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-7.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-7.0.6 (= ${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-7.0.5
+Package: libnetsvcs-7.0.6
 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-7.0.5 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-7.0.6 (= ${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 22d401bbd65..556fb60f418 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,6 +1,6 @@
 # Set the version number here.
-%define ACEVER  7.0.5
-%define TAOVER  3.0.5
+%define ACEVER  7.0.6
+%define TAOVER  3.0.6
 
 # Conditional build
 # Default values are
diff --git a/TAO/ChangeLogs/TAO-3_0_6 b/TAO/ChangeLogs/TAO-3_0_6
new file mode 100644
index 00000000000..8b6628c1ffa
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-3_0_6
@@ -0,0 +1,289 @@
+commit d61d61771cb9f73a9c2a0fc4c4f896385513c212
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 20 08:26:33 2022 +0100
+
+    List changes
+    
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit f67de62fc547264c093e4e7fd8db6f1981dbca76
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 20 08:22:51 2022 +0100
+
+    Fixed typo
+    
+        * TAO/tao/PortableServer/Root_POA.cpp:
+
+commit 6bed8a1e6e8067968ecd7bc2f1e60f6d1a5f5a64
+Merge: e1066915005 2067f66c702
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 18 13:25:36 2022 +0100
+
+    Merge pull request #1766 from jwillemsen/jwi-docucleanup2
+    
+    Corrected links to documentation, use nullptr/default, layout changes
+
+commit 2067f66c7028d125e09cdfcbe9fb33aed5a58692
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 18 10:51:55 2022 +0100
+
+    Use nullptr/default, docu changes
+    
+        * TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp:
+        * TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp:
+        * TAO/tao/BiDir_GIOP/BiDir_Policy_i.h:
+        * TAO/tao/GIOP_Message_Base.cpp:
+        * TAO/tao/ORB_Core.cpp:
+        * TAO/tao/PI/PolicyFactory_Loader.cpp:
+        * TAO/tao/Policy_Validator.cpp:
+        * TAO/tao/PortableServer/Default_Policy_Validator.cpp:
+        * TAO/tao/PortableServer/Default_Policy_Validator.h:
+        * TAO/tao/RTPortableServer/RT_Policy_Validator.cpp:
+        * TAO/tao/RTPortableServer/RT_Policy_Validator.h:
+        * TAO/tao/ZIOP/ZIOP_Policy_Validator.h:
+        * TAO/tests/BiDirectional/README:
+        * TAO/tests/BiDirectional/client.cpp:
+
+commit 5d3513f7346ef9465df43e3a8151e4643867d37b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 18 10:51:14 2022 +0100
+
+    Corrected links
+    
+        * TAO/docs/documentation.html:
+
+commit e1066915005387ee81397e9cec2e24b72abb1bd9
+Merge: a8372419d0e 27acd637ea3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 17 14:40:36 2022 +0100
+
+    Merge pull request #1765 from jwillemsen/jwi-cleanup2
+    
+    Use doxygen/nullptr/bool
+
+commit 27acd637ea341c104749d6b8369d67fc5448920d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 17 11:57:46 2022 +0100
+
+    Use doxygen/nullptr/bool
+    
+        * ACE/ace/Log_Msg.cpp:
+        * ACE/ace/NT_Service.cpp:
+        * ACE/ace/Object_Manager.cpp:
+        * ACE/ace/Object_Manager.h:
+        * ACE/ace/Thread.inl:
+        * ACE/tests/Task_Test.cpp:
+        * TAO/tao/DynamicInterface/Request.cpp:
+        * TAO/tao/GIOP_Message_Base.cpp:
+        * TAO/tao/Messaging/AMH_Response_Handler.cpp:
+
+commit a8372419d0e73f4b816fccd15d85b085c56ea4d3
+Merge: d41442943e4 2733b15ce02
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jan 14 16:48:18 2022 -0600
+
+    Merge pull request #1760 from mitza-oci/cxx20
+    
+    fixed build with GCC -std=c++20
+
+commit d41442943e4fcdfc689133619b2043aee7d62a59
+Merge: 97daeea11d2 ab0b550403f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 13 17:40:49 2022 +0100
+
+    Merge pull request #1761 from jwillemsen/jwi-defaultoverride
+    
+    Make use of C++ default/override
+
+commit ab0b550403f711d725405afdd04475107b8f3bd2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jan 13 10:28:36 2022 +0100
+
+    Make use of C++ default/override
+
+commit 8e4d70bc963383a8798b8d63e518fe4bcfb2b234
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Jan 11 20:34:43 2022 -0600
+
+    fixed build with GCC -std=c++20
+
+commit 97daeea11d251609247a90379d61551e8627910a
+Merge: 71c64284b43 0f69c85d3a3
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jan 10 21:20:04 2022 -0600
+
+    Merge pull request #1752 from mitza-oci/gha-install
+    
+    make install, pkgconfig, ace_for_tao fixes
+
+commit 71c64284b4334f0f715ffc91fcdcef8bf6f3d031
+Merge: ee8f83a1e40 bf32655ffa4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 10 21:26:03 2022 +0100
+
+    Merge pull request #1757 from jwillemsen/jwi-codeset
+    
+    Make use of C++11 default and override
+
+commit bf32655ffa453d723536b06570059f38ef2b0136
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 10 17:17:45 2022 +0100
+
+    Removed redundant void
+    
+        * TAO/tao/Codeset/Codeset.h:
+
+commit f30b9cbe69c8599f3e96e1e03b1ca41699019915
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 10 17:07:28 2022 +0100
+
+    Make use of C++11 default
+    
+        * TAO/tao/Cleanup_Func_Registry.h:
+        * TAO/tao/Cleanup_Func_Registry.inl:
+        * TAO/tao/Client_Strategy_Factory.h:
+        * TAO/tao/Codeset_Manager.h:
+        * TAO/tao/Codeset_Manager_Factory_Base.cpp:
+        * TAO/tao/Codeset_Manager_Factory_Base.h:
+
+commit 48e842b9afeb089a4f3d5c5011c69ea75f99631d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jan 10 17:02:33 2022 +0100
+
+    Make use of C++11 default and override
+    
+        * TAO/tao/Codeset/Codeset_Manager_i.cpp:
+        * TAO/tao/Codeset/Codeset_Manager_i.h:
+        * TAO/tao/Codeset/Codeset_Service_Context_Handler.h:
+        * TAO/tao/Codeset/Codeset_Translator_Factory.cpp:
+        * TAO/tao/Codeset/Codeset_Translator_Factory.h:
+        * TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp:
+        * TAO/tao/Codeset/Codeset_Translator_Factory_T.h:
+        * TAO/tao/Codeset/UTF16_BOM_Factory.cpp:
+        * TAO/tao/Codeset/UTF16_BOM_Factory.h:
+        * TAO/tao/Codeset/UTF16_BOM_Translator.cpp:
+        * TAO/tao/Codeset/UTF16_BOM_Translator.h:
+        * TAO/tao/Codeset/UTF8_Latin1_Factory.cpp:
+        * TAO/tao/Codeset/UTF8_Latin1_Factory.h:
+        * TAO/tao/Codeset/UTF8_Latin1_Translator.cpp:
+        * TAO/tao/Codeset/UTF8_Latin1_Translator.h:
+
+commit 0f69c85d3a38b8b50bd766fae5795b81329c7335
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jan 7 16:55:12 2022 -0600
+
+    Fixed a few pkg-config issues
+
+commit f6a98bf6e81d24b776921aab7ed812156d77eef1
+Merge: 5a2c18b21aa cacd3ed5e1b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 7 13:20:24 2022 +0100
+
+    Merge pull request #1754 from jwillemsen/jwi-rcsid
+    
+    Removed lef over for rcsid
+
+commit 5a2c18b21aab3ddc9efb4c365888872b427260ba
+Merge: 971a2f55600 37146c8f03e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 7 13:19:57 2022 +0100
+
+    Merge pull request #1753 from jwillemsen/jwi-bidircpp11
+    
+    Make use of C++11 features in BiDIR
+
+commit cacd3ed5e1b549e9adb7c8701ca33d6996ea532d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 7 11:33:33 2022 +0100
+
+    Removed lef over for rcsid
+    
+        * ACE/bin/MakeProjectCreator/config/acedefaults.mpb:
+        * ACE/bin/libsize.pl:
+        * TAO/docs/minimumTAO.html:
+        * TAO/docs/performance.html:
+
+commit 37146c8f03ecb28dfa9be8f8d4144466c90d946a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jan 7 09:48:37 2022 +0100
+
+    Make use of C++11 features in BiDIR
+    
+        * TAO/tao/BiDir_GIOP/BiDirGIOP.cpp:
+        * TAO/tao/BiDir_GIOP/BiDirGIOP.h:
+        * TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h:
+        * TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.h:
+        * TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.h:
+        * TAO/tao/BiDir_GIOP/BiDir_Policy_i.h:
+        * TAO/tao/BiDir_GIOP/BiDir_Service_Context_Handler.h:
+
+commit 3ad369c499d9a3045b041428c830dfba1bfdf468
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Dec 17 13:44:56 2021 -0600
+
+    Use the tao_rules base project to bring in makefile rules
+
+commit eba5995a2fb8ed7734a4bb5332606f17cf8f6122
+Merge: 982e921423e 94baee24599
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Dec 14 19:50:29 2021 +0100
+
+    Merge pull request #1745 from jwillemsen/jwi-exceptiondocu
+    
+    Modernize example code in deep copy documentation
+
+commit 8421ce146282ea06925a23229c2f046cba781814
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Dec 14 12:45:54 2021 +0100
+
+    Add an attribute with the name call as test case
+    
+        * TAO/tests/IDL_Test/interface.idl:
+
+commit 94baee245996a418a3cc1ada80e50f1f2e9a343b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Dec 14 12:38:15 2021 +0100
+
+    Modernize excample code in deep copy documentation
+    
+        * TAO/tao/Exception.h:
+
+commit 3f9404e68a0abe4755f328d70fdff6f403327de5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Dec 14 12:37:30 2021 +0100
+
+    Add test case where we have an argument `call` which lead to non compiling generated code
+    
+        * TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_operation/operation.cpp:
+        * TAO/tests/IDL_Test/interface.idl:
+
+commit 65f57025d8615cff69543ab63ddc30701f7f4e85
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Nov 19 16:07:46 2021 -0600
+
+    fixed comments in tao_idl-generated code
+    
+    (cherry picked from commit f8d8777b9cb4c42d8e693b9c97f8f9469740de76)
+
+commit e66d46e38a26f3113edd07241337205e9842cf40
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Nov 18 15:03:57 2021 +0100
+
+    Fallback to MacOSX 11 latest when we have a not recognized major version
+    
+        * ACE/include/makeinclude/platform_macosx.GNU:
+        * TAO/NEWS:
+
+commit b75ee3d8e1cc3dcad8d508b590167837fe0bfa2a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Nov 17 11:30:38 2021 +0100
+
+    Prepare for next release and make x.0.5 public
+    
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index c1000d0c367..2545dbb41f4 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: 3.0.5
-    ACE VERSION: 7.0.5
+    TAO VERSION: 3.0.6
+    ACE VERSION: 7.0.6
 
     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 c9a5cb50f28..ca9885b89e0 100644
--- a/TAO/VERSION.txt
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 3.0.5, released Wed Nov 17 09:29:01 CET 2021
+This is TAO version 3.0.6, released Thu Jan 20 09:26:53 CET 2022
 
 If you have any problems with or questions about TAO, please open
 a issue or discussion on the ACE_TAO github project at
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 2d4d8796222..bcadd6b9f1a 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,7 +4,7 @@
 
 #define TAO_MAJOR_VERSION 3
 #define TAO_MINOR_VERSION 0
-#define TAO_MICRO_VERSION 5
-#define TAO_VERSION "3.0.5"
-#define TAO_VERSION_CODE 0x30005
+#define TAO_MICRO_VERSION 6
+#define TAO_VERSION "3.0.6"
+#define TAO_VERSION_CODE 0x30006
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))