ACE+TAO-7_0_9ACE+TAO-7_0_9

10 files changed, 1451 insertions, 44 deletions

diff --git a/ACE/ChangeLogs/ACE-7_0_9 b/ACE/ChangeLogs/ACE-7_0_9
new file mode 100644
index 00000000000..dbde29c17ce
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-7_0_9
@@ -0,0 +1,819 @@
+commit 6db9157a06c38119e160454d772d2a6303f1d312
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 29 10:27:36 2022 +0200
+
+    Update NEWS
+
+commit bdf31098cdda557b8b245b089306b737fb297305
+Merge: 697cb84ee1a 2c45e323a5b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 23 22:25:46 2022 +0200
+
+    Merge pull request #1944 from jwillemsen/jwi-dllistdocu
+    
+    Fixed documentation of ~ACE_DLList and use nullptr
+
+commit 2c45e323a5b597d17b1389abeb8be2fd25c74154
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 23 20:26:11 2022 +0200
+
+    Fixed documentation of ~ACE_DLList and use nullptr
+    
+        * ACE/ace/Containers_T.h:
+        * ACE/ace/Containers_T.inl:
+
+commit eb1fccda5feb81606a021382bb8fe4d40c85b087
+Author: Luke Mewburn <Luke@Mewburn.net>
+Date:   Fri Sep 23 19:01:43 2022 +1000
+
+    Fix -Wformat-security issues in examples
+
+commit 7b7e65323459375cda40274c9b5828b3f5aebda9
+Merge: 0b7e12778ae 2aab75d5fdd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 23 09:20:32 2022 +0200
+
+    Merge pull request #1941 from knutpett/knutpett/remove_void_part2
+    
+    Part 2: Remove obsolescent (void) in functions with no parameters
+
+commit 2aab75d5fddc126e8085c70fe8e1b875b75a30ef
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Mon Sep 19 14:37:02 2022 +0200
+
+    Part 2: Remove obsolescent (void) in functions with no parameters
+
+commit 64b5a4fecb5806522f220d63b0744ffa40bb6bcc
+Merge: ccbb3639f96 9bb6d09a139
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Sep 19 16:40:20 2022 -0500
+
+    Merge branch 'master' into format-security
+
+commit 96f0f9c16668c07531ea8c60c7b912f2e7b55806
+Merge: 14610fc4e13 d7c2081760f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 09:55:26 2022 +0200
+
+    Merge pull request #1934 from jwillemsen/jwi-require_truncation_
+    
+    Use uniform initialisation for require_truncation_ so tha we can generate a default constructor
+
+commit f110de2e2657cf09094d799152c52cff8c285afa
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Sep 18 10:34:06 2022 +0200
+
+    Layout change
+    
+        * ACE/ace/OS_NS_dirent.h:
+
+commit 8b0b7b43dbb949159a5d2384ea9897ff1cf0abf6
+Author: Chad Elliott <elliottc@objectcomputing.com>
+Date:   Fri Sep 16 06:29:10 2022 -0500
+
+    Added $(ACE_SHLIBS) to the link line for shared libraries.  This allows dlopen() to load in other dependency libraries.
+    
+    Removed the -soname option from the link line so that shared libraries do not have a hard-coded path built into them.
+
+commit 5c2ec52d1b878b4a8a7d18a6eb2f8319746b0ddf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 15 17:44:46 2022 +0200
+
+    Make use of default, uniform initialisation, and nullptr
+    
+        * ACE/ace/Dirent.h:
+        * ACE/ace/Dirent.inl:
+        * ACE/ace/Dirent_Selector.cpp:
+        * ACE/ace/Dirent_Selector.h:
+        * ACE/ace/Malloc_T.cpp:
+        * ACE/ace/POSIX_Asynch_IO.cpp:
+
+commit c9737bc0a77324eb91dd7e0a94d0ff7099eda09e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 13:49:46 2022 +0200
+
+    Use bcc32x in 32bit mode, at that moment it should have the same arguments as bcc64
+    
+        * ACE/ace/config-win32-borland.h:
+
+commit 1b723073155ca88a84cf04e276f7402a3b9867b2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 13:44:43 2022 +0200
+
+    bcc64 needs different commandline arguments to be used as preprocessor
+    
+        * ACE/ace/config-win32-borland.h:
+
+commit 3da59eac098c1ef9d2c98f2079185ff35c3b6105
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Tue Sep 13 22:57:39 2022 +0200
+
+    Remove obsolescent (void) in functions with no parameters
+
+commit ccbb3639f96d55c38f96914c6c7c4bc8c8998db9
+Merge: bdc29ef27a6 fe03724176d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 12 09:36:12 2022 +0200
+
+    Merge branch 'master' into format-security
+
+commit fe03724176dcfd20e0f9a6e493198469242be6b6
+Merge: 41a1f3bc12f 00b403be7df
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 12 08:32:34 2022 +0200
+
+    Merge pull request #1922 from knutpett/knutpett/whitespace
+    
+    Remove whitespace
+
+commit 41a1f3bc12f780cc087c936ab53d1074f363b630
+Merge: 37eece01ce5 8933b892aaf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 12 08:29:51 2022 +0200
+
+    Merge pull request #1919 from esohns/asynch_acceptor_addr_family_protected
+    
+    make addr_family_ protected so it can be accessed from derived classes
+
+commit bdc29ef27a6bc8dc63bc46309639e3ef307e8557
+Author: Luke Mewburn <Luke@Mewburn.net>
+Date:   Sun Sep 11 10:06:02 2022 +1000
+
+    Fixup previous adapt to ACE_TEXT_PRIs
+    
+    Add missing comma after format string.
+
+commit 15e81d1fdd3aceba9199802a697782507ecc87f2
+Author: Luke Mewburn <Luke@Mewburn.net>
+Date:   Sun Sep 11 10:03:05 2022 +1000
+
+    Fix -Wformat-security issues for ACE/tests
+    
+    Fixes issue #1906.
+
+commit 00b403be7df0442405bd5e3dcc07beaa6730ddd2
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Sat Sep 10 12:26:57 2022 +0200
+
+    Fixed Redundant blank line at the end of a code block should be deleted
+
+commit 60987b4ba42ff6e4e6a4f4457d902a18c0c6b0a0
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Sat Sep 10 12:19:28 2022 +0200
+
+    Remove leading blank lines after opening {
+
+commit c42abee7c0e81ed89bdfb47bf3a1bcb743cf256b
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Sat Sep 10 12:08:48 2022 +0200
+
+    Removed extra newline before closing }
+
+commit 983dabc472d4670a53a352584cdc82de749e2c41
+Author: Luke Mewburn <Luke@Mewburn.net>
+Date:   Sat Sep 10 17:12:19 2022 +1000
+
+    Fixup previous adapt to ACE_TEXT_PRIs
+    
+    Remove reference to removed variable in separate #if codepath.
+
+commit 2be659384defe6b235e020f03a7d683c80a16c7e
+Author: Luke Mewburn <Luke@Mewburn.net>
+Date:   Sat Sep 10 16:30:54 2022 +1000
+
+    Adapt to ACE_TEXT_PRIs
+    
+    Use ACE_TEXT_PRIs instead of conditional compilation
+    checking !defined(ACE_WIN32) && defined(ACE_USES_WCHAR).
+
+commit f5e5d7759a9314053509d294a4c10827d3946034
+Author: Luke Mewburn <Luke@Mewburn.net>
+Date:   Sat Sep 10 11:05:56 2022 +1000
+
+    Define ACE_TEXT_PRIs. Use to fix -Wformat-security
+    
+    Define ACE_TEXT_PRIs as "s" or "ls" depending upon the WCHAR mode.
+    (This is similar to the PRIxxx macros in <inttypes.h>)
+    
+    Use  ACE_TEXT("%") ACE_TEXT_PRIs  instead of "%s" or even
+    just the raw string without a format specifier.
+    
+    Fixes issue #1906.
+
+commit 126e88aeb3f288c770f0dccde5c6314ccaa6212c
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 15:46:54 2022 +0200
+
+    Replace 3 blank lines with just 2 blank lines
+
+commit 430d023f1d97173cfd104498f92dc4ccaa1c4135
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 14:31:18 2022 +0200
+
+    Remove extra newline after public, protected and private
+
+commit 6f72892d61032d294fe1387a36ec6e04e9efa9c2
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 10:38:55 2022 +0200
+
+    Fix trailing newline in class declarations
+
+commit 7de198658db10447a86ce14e457b5881140e95ce
+Author: Chad Elliott <elliottc@objectcomputing.com>
+Date:   Fri Sep 9 07:27:27 2022 -0500
+
+    Removed unnecessary check of ret inside the while condition.
+
+commit 6d7b6be10a2c2be4fc47bdd2e285657fcc4d60fd
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 10:31:07 2022 +0200
+
+    Fix more blank line issues
+
+commit e21a89220b0b1571e09f02e66feea5c5dc734cd7
+Author: Chad Elliott <elliottc@objectcomputing.com>
+Date:   Thu Sep 8 13:42:26 2022 -0500
+
+    Fixed indentation.
+
+commit 0a67ad7caf312a5ce67a071aee7859b3cf509824
+Author: Chad Elliott <elliottc@objectcomputing.com>
+Date:   Thu Sep 8 13:38:45 2022 -0500
+
+    Added support for VxWorks 21.03, including building for RTP mode.
+
+commit 8933b892aaf731a58554a71e7ea2cd03d23b8aa3
+Author: Erik Sohns <erik.sohns@posteo.de>
+Date:   Wed Sep 7 16:58:12 2022 +0200
+
+    corrected ctor initialization order
+
+commit f32b02507a1a1cc642d84c3883f513e864b8400b
+Author: Erik Sohns <erik.sohns@posteo.de>
+Date:   Tue Sep 6 20:16:15 2022 +0200
+
+    make addr_family_ protected so it can be accessed from derived classes
+
+commit 248271543f7574c7f10f98bfe0a905df8ea0889e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 5 08:26:47 2022 +0200
+
+    Fixed redefined ACE_FALLTHROUGH warnings
+    
+        * ACE/ace/config-g++-common.h:
+
+commit 023da962da06c7c6ab4e801d7a5861ef21ca9577
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Mon Aug 29 16:20:38 2022 +0200
+
+    Remove warnings -Wextra-semi
+
+commit 348277c5a753b65b7a0cc206720fd7ea47f81659
+Merge: c86d810dec3 dd6e9956697
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 29 15:24:44 2022 +0200
+
+    Merge pull request #1910 from Erich71/old_gcc_fix
+    
+    Fix ACE_FALLTHROUGH definition for old GCC compilers.
+
+commit c86d810dec3f11f7450312f7618fb1b25053cf16
+Merge: fe57f94c747 6e391dc5f42
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 29 15:24:13 2022 +0200
+
+    Merge pull request #1909 from jwillemsen/jwi-memorypoollogging
+    
+    Updated logging to include the class/method so that it is more obviou…
+
+commit fe57f94c7477e00cc6d3feaabbb76e4a0f9b4429
+Merge: 280392c8b78 d8409f7ce0b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 29 15:23:53 2022 +0200
+
+    Merge pull request #1908 from jwillemsen/jwi-redundantvoid3
+    
+    Removed redundant void
+
+commit dd6e99566974c958738973d72bd7f3695447af44
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 29 09:07:02 2022 +0200
+
+    Update config-g++-common.h
+    
+    With C++17 we can use https://en.cppreference.com/w/cpp/language/attributes/fallthrough
+
+commit 93d938a9e43e4c368d0cd5caabedf4651a0737f2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 29 08:59:18 2022 +0200
+
+    No need to define ACE_FALLTHROUGH for C++14, it is alreadys set from the C++11 part
+
+commit fc83f54e9330f3c325460f1f01cb4a10ef570f6f
+Author: Erich Ponstingl <erich.ponstingl@gmx.net>
+Date:   Fri Aug 26 14:58:39 2022 +0200
+
+    Fix ACE_FALLTHROUGH definition for old GCC compilers.
+
+commit d8409f7ce0bfe8f283d2bd80faeb80adb74e4b32
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 24 13:08:05 2022 +0200
+
+    Removed redundant void
+    
+        * ACE/ace/ATM_Acceptor.cpp:
+        * ACE/ace/ATM_Acceptor.inl:
+        * ACE/ace/ATM_Connector.cpp:
+
+commit 6e391dc5f42d373d5b42f6f9c9642d867ce0fc6d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 24 13:07:26 2022 +0200
+
+    Updated logging to include the class/method so that it is more obvious where these logging messages are coming from
+    
+        * ACE/ace/Shared_Memory.cpp:
+        * ACE/ace/Shared_Memory.h:
+        * ACE/ace/Shared_Memory_MM.cpp:
+        * ACE/ace/Shared_Memory_MM.h:
+        * ACE/ace/Shared_Memory_MM.inl:
+        * ACE/ace/Shared_Memory_Pool.cpp:
+        * ACE/ace/Shared_Memory_Pool.h:
+        * ACE/ace/Shared_Memory_SV.cpp:
+        * ACE/ace/Shared_Memory_SV.h:
+        * ACE/ace/Shared_Memory_SV.inl:
+
+commit 73d9dcd44d257cb427c8510bbec52b0df73a9190
+Merge: 49423535b6e a9a6b7e565c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Aug 15 09:51:55 2022 +0200
+
+    Merge pull request #1903 from likema/proc-gid
+    
+    Fix incorrect `uid_t` to `gid_t` in `ACE_Process`
+
+commit a9a6b7e565cda5187d4f0b14b62b2b19dc5fcbc8
+Author: Like Ma <likemartinma@gmail.com>
+Date:   Sun Aug 14 03:22:02 2022 +0800
+
+    Fix incorrect uid_t to gid_t in ACE_Process
+
+commit 41cfd85e05e3f72df6fe90353f2e1a2cf3069942
+Author: Bin Lan <lanbin@scutech.com>
+Date:   Wed Mar 23 16:19:44 2022 +0800
+
+    Fix localtime_r emulation for Windows.
+
+commit 05484cd6cd8d3bf884075311041242d95158a0d4
+Merge: 7aeb1020b1a 4a7649ed0a6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 14:42:58 2022 +0200
+
+    Merge pull request #1897 from jwillemsen/jwi-news8
+    
+    List changes for next release
+
+commit 7aeb1020b1a73c01bc1f5473b6ddabe940c0bd65
+Merge: 3d4038ad273 4a6478c41ac
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 14:42:41 2022 +0200
+
+    Merge pull request #1896 from jwillemsen/jwi-cleanup10
+    
+    Use override, remove redundant whitespacing, fixed typo
+
+commit 3d4038ad273524a32bf892921e9d1a8f0bc609d4
+Merge: 636f29faa68 a972e0f1637
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 14:42:17 2022 +0200
+
+    Merge pull request #1895 from jwillemsen/jwi-acedebug
+    
+    Changed internal debug_ flag to bool and initialise it to false
+
+commit 4a7649ed0a6a58e62ca46c8add446502ead50e7d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 08:47:12 2022 +0200
+
+    List changes for next release
+    
+        * ACE/NEWS:
+
+commit 4a6478c41ac4b1e17cea8e0e4f4bbb6afe91269b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 08:32:51 2022 +0200
+
+    Use override, remove redundant whitespacing, fixed typo
+    
+        * ACE/tests/Enum_Interfaces_Test.cpp:
+        * TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README:
+        * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp:
+        * TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl:
+
+commit a972e0f1637e8a2ec2ce70f02c0154adfef59f73
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 08:31:55 2022 +0200
+
+    Changed internal debug_ flag to bool and initialise it to false
+    
+        * ACE/ace/ACE.cpp:
+
+commit f10a95323666778399fca640bbe95ad3a4c8b0d1
+Author: Andrew Buettner <leeloo@cletis.net>
+Date:   Thu Jul 21 09:43:29 2022 -0500
+
+    Fix syntax error when compiling without threads.
+    
+    This addresses issue in [ACE-TAO Issue #1889](https://github.com/DOCGroup/ACE_TAO/issues/1889)
+
+commit bd92596bbc63635a2ed2131322e6c659a5420586
+Merge: b9e4a9a92a6 8f9a9f304ba
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 18 16:27:20 2022 +0200
+
+    Merge pull request #1887 from jwillemsen/jwi-codesetregistry
+    
+    Minor change for codeset registry generation and removed old Id tags
+
+commit d497168cef77c63a7557f6dad1c4483baf835754
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 18 13:21:48 2022 +0200
+
+    Updated tool to generate the same as we have Codeset_Registry_db.cpp
+    
+        * ACE/apps/mkcsregdb/mkcsregdb.cpp:
+
+commit 2f757b8bea56e2ca31c24507e8a1685c13733e13
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date:   Wed Jul 13 10:58:09 2022 -0500
+
+    Add header and footer for stuck stacks
+
+commit 3ebafd712042a344dc52677e1d190c9dfcbb3c65
+Merge: b619e577177 8096d513b52
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jul 14 11:57:11 2022 +0200
+
+    Merge pull request #1883 from jwillemsen/jwi-localhost
+    
+    Make use of ACE_LOCALHOST and removed Tru64/Irix remaining code
+
+commit 8096d513b52a30164b1820eab996dd26dbe2a4b8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jul 14 09:25:40 2022 +0200
+
+    Removed old code for Tru64/Irix, not supported anymore for a long time
+
+commit ea7ee2053a878b207203af4ce134cc7fddea8465
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 13 16:29:49 2022 +0200
+
+    Doxygen style comment
+    
+        * ACE/ace/INET_Addr.cpp:
+
+commit a0b4b6382c2010a622c819814bdee790ca3b7f8d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 13 15:50:53 2022 +0200
+
+    Layout changes
+    
+        * ACE/ace/Pipe.cpp:
+
+commit 941dfb2ba87b3fd32dd4fc861212d20460060570
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 13 15:40:57 2022 +0200
+
+    Removed redundant whiteline
+    
+        * ACE/ace/SPIPE_Addr.cpp:
+
+commit 7671a48aaf4f297d396ec1106ed76664cd93a172
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 13 15:40:42 2022 +0200
+
+    Make use of ACE_LOCALHOST
+    
+        * ACE/ace/MEM_Addr.cpp:
+
+commit b619e577177bd4a8f5b7daffe27f32c84f13e021
+Merge: 77df25b965b 55e5793c721
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 13 11:53:38 2022 +0200
+
+    Merge pull request #1882 from jwillemsen/jwi-cleanup32
+    
+    Removed duplicated define and layout changes
+
+commit 76c4b0736b2b7d0ebeaa7c3d9f04ecbac96c9d73
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 13 09:25:02 2022 +0200
+
+    Removed duplicated define
+    
+        * ACE/ace/config-integritySCA.h:
+
+commit 60dca03280c31b7861b1782649d23a00b7004d7b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 13 09:24:30 2022 +0200
+
+    Log the operation when reporting an error
+    
+        * ACE/ace/Select_Reactor_T.cpp:
+
+commit dee78f113e79812a438f050384ed6ec92d9d4cba
+Author: Timothy Simpson <simpsont@objectcomputing.com>
+Date:   Tue Jul 12 10:00:51 2022 -0500
+
+    Fixes for Static Initialization Order Issues Reported By AddressSanitizer
+
+commit b102db31aa3ff4cd53f25f1ae743277c452609aa
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 16:06:38 2022 +0200
+
+    Use VxWorks type for return value of sysClkRateGet
+    
+        * ACE/ace/OS_NS_Thread.cpp:
+        * ACE/ace/OS_NS_Thread.inl:
+
+commit 78d9da7d3f305160d4bd5c17edd56f02ef1418bd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 11:05:23 2022 +0200
+
+    Fixed compile error
+
+commit 2e5015f022ce6e154a9d46f5f3f48f9e80637ce6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 10:55:18 2022 +0200
+
+    Removed redundant void
+
+commit 36cee4c046b4f8fafe6b246b477af7349b91d2fd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 10:54:21 2022 +0200
+
+    Add back regular destructor
+    
+        * ACE/ace/Profile_Timer.h:
+        * ACE/ace/Profile_Timer.inl:
+
+commit c85f9f17b1741ef2f10edbbc2c87eb4442d70430
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 10:53:24 2022 +0200
+
+    Make use of default destructors
+
+commit f9cb5892de0657a1193aa0d37a01c7cc16bcce7a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 10:44:52 2022 +0200
+
+    Make use of default destructor
+
+commit f471ff957ddd5c41f24d7e42df80574c1f8dba6a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 10:32:29 2022 +0200
+
+    VxWorks 22.03 seems to provide a lot more APIs, not runtime tested, just compilation
+    
+        * ACE/ace/config-vxworks22.03.h:
+        * ACE/ace/config-vxworks6.8.h:
+
+commit cc30a10ec83e20f75d4afd1977b6f648a23f2804
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 09:28:11 2022 +0200
+
+    Removed setting of ACE_LACKS_MEMORY_H, not used
+    
+        * ACE/ace/README:
+        * ACE/ace/config-face-conftest.h:
+        * ACE/ace/config-integritySCA.h:
+        * ACE/ace/config-posix-nonetworking.h:
+        * ACE/ace/config-sunos5.5.h:
+        * ACE/ace/config-vxworks6.4.h:
+
+commit 69ce5d1ae70831d8776ef2e2cc6544e242a4adad
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 09:27:03 2022 +0200
+
+    Removed setting of ACE_LACKS_MALLOC_H, not used
+    
+        * ACE/ace/README:
+        * ACE/ace/config-WinCE.h:
+        * ACE/ace/config-freebsd.h:
+        * ACE/ace/config-integritySCA.h:
+        * ACE/ace/config-macosx-jaguar.h:
+        * ACE/ace/config-macosx-leopard.h:
+        * ACE/ace/config-macosx-panther.h:
+        * ACE/ace/config-macosx-tiger.h:
+        * ACE/ace/config-openvms.h:
+        * ACE/ace/config-vxworks6.4.h:
+
+commit 147fd87b68c94b39c6e5102b11ffedcd97c3763f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 09:26:11 2022 +0200
+
+    Updates for VxWorks API changes
+    
+        * ACE/ace/config-vxworks22.03.h:
+        * ACE/ace/config-vxworks6.4.h:
+
+commit ccab26600dd079be3187df64697af03126cb39e3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 08:48:00 2022 +0200
+
+    Removed not used member, removed redundant void
+    
+        * ACE/ace/Message_Queue_Vx.cpp:
+        * ACE/ace/Message_Queue_Vx.h:
+        * ACE/ace/Message_Queue_Vx.inl:
+
+commit 669ac3a4ae2dc752a8fa8add5f00ebc65b03008f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 08:45:04 2022 +0200
+
+    Silence compiler warning
+    
+        * ACE/ace/SOCK_SEQPACK_Acceptor.cpp:
+
+commit bc710dd497225059151efbfd8bc7015c7b2585c0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 08:41:44 2022 +0200
+
+    Add cast to short to silence compiler warning, done in more places already to calls to cond_init
+    
+        * ACE/ace/OS_NS_Thread.cpp:
+
+commit 43d1ea38792cb6d170e18f49ea9f30050091133e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 08:37:19 2022 +0200
+
+    Add truncate_cast to silence warning in 32bit build
+    
+        * ACE/ace/Time_Value.h:
+
+commit 1057396aed5bdd95dff9fc3b3af4014f687e41a7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 08:36:59 2022 +0200
+
+    Changed ~ACE_Condition_Attributes_T to default
+    
+        * ACE/ace/Condition_Attributes.h:
+        * ACE/ace/Condition_Attributes.inl:
+
+commit 94703dd1d5c6500e425ec00fd1db0ab9f0d84684
+Merge: 5ff9db33d6e a9a4ffd3504
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 4 08:12:47 2022 +0200
+
+    Merge branch 'master' into jwi-vxworkstaskid
+
+commit 5ff9db33d6e74f43be11c5e122571dbea63558a6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Jul 2 10:20:00 2022 +0200
+
+    Removed check for ACE_LACKS_VA_FUNCTIONS from VxWorks specific code
+    
+        * ACE/ace/OS_NS_Thread.cpp:
+
+commit e8f3989275cda650ab71b3c85ebd0a91fa272f10
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Jul 2 10:19:20 2022 +0200
+
+    Update some more taskSpawn return value checks
+    
+        * ACE/ace/OS_NS_Thread.cpp:
+
+commit ab6a0cda2826319044013c7de5808a4574b0eb11
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Jul 2 10:02:25 2022 +0200
+
+    Use ACE_VX_TASK_ID_ERROR
+    
+        * ACE/ace/OS_NS_Thread.cpp:
+
+commit a9a4ffd350481eb482bd6a738c40c2a8a38515a1
+Merge: 42ceeaaeb44 d1a837e449f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Jul 2 09:17:39 2022 +0200
+
+    Merge pull request #1877 from jwillemsen/jwi-vxworks2203
+    
+    Added config file for VxWorks 22.03
+
+commit 42ceeaaeb4478e0bf54eca6f36a0e9c084b5f7e9
+Merge: eafca4ec3ad cf9035f2ffe
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 20:15:02 2022 +0200
+
+    Merge pull request #1875 from jwillemsen/jwi-nameproxy
+    
+    Removed not used reactor_ member, cleanup, and const changes
+
+commit eafca4ec3ad0f1f4d9e80737a0ac25c6184d8b85
+Merge: e35823e1811 1fd113b0e02
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 20:13:37 2022 +0200
+
+    Merge pull request #1874 from jwillemsen/jwi-ctdtcompile
+    
+    ctdt is a c file, so compile as c file, not c++
+
+commit cf9035f2ffe88ce12fa484a752425ae1f09a263d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 13:00:14 2022 +0200
+
+    Removed not used reactor_ member, cleanup, and const changes
+    
+        * ACE/ace/Name_Proxy.cpp:
+        * ACE/ace/Name_Proxy.h:
+
+commit d1a837e449fa8908c3e836f4faf977b22f2de98a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 12:25:29 2022 +0200
+
+    Updated comment
+    
+        * ACE/ace/config-vxworks22.03.h:
+
+commit ea6b7064f8578aa8912f781d319aba909b04bdde
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 12:10:10 2022 +0200
+
+    New file for VxWorks 22.03
+
+commit 42a4f7db249d4d7a40dc73ebe42c4b198628517e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 12:06:40 2022 +0200
+
+    Make preprocessor check more readable
+    
+        * ACE/ace/OS_NS_sys_stat.h:
+
+commit 1fd113b0e0210221ea0be7f49b80d99f1ba3a2e1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 11:39:52 2022 +0200
+
+    ctdt is a c file, so compile as c file, not c++
+
+commit e35823e1811b6e38c0b175b4d238c7d9599e6c4e
+Merge: 582d76a3464 0ed5e6bcf74
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 10:27:10 2022 +0200
+
+    Merge pull request #1872 from jwillemsen/jwi-vxworks
+    
+    Fixed VxWorks compile error and minor cleanup
+
+commit bff9af24d9cfd567a0f91d15dbab8bf729758e5a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 09:55:07 2022 +0200
+
+    Updated
+    
+        * ACE/docs/bczar/bczar.html:
+        * TAO/NEWS:
+
+commit 812f982c65d4cd70b7e33fe0bed7064e2861261a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 09:22:06 2022 +0200
+
+    Update for x.0.8
+    
+        * ACE/NEWS:
+        * ACE/bin/copy-local-script.sh:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/etc/index.html:
+
+commit e30c5f68e6e216c735461235a546dae31e2c07bf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 08:59:21 2022 +0200
+
+    Updated return value check of taskSpawn
+    
+        * ACE/ace/OS_NS_Thread.cpp:
+
+commit 0ed5e6bcf74f4dc8feaac94da2aaea640fb066d4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jun 30 11:47:38 2022 +0200
+
+    Fixed compile error
+
+commit 6b131752925e286e135d0b00f7c1a312413acfa5
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jun 30 11:46:59 2022 +0200
+
+    Directly assign variable
+    
+        * ACE/ace/SOCK_Dgram_Mcast.cpp:
+
+commit 1cc25240a576c75b0210cfeee0fcc63aba5800c4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jun 30 11:46:45 2022 +0200
+
+    Fixed compile error
+
+commit 8780cb42e95433e4b05a4b3b423456a36311f631
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jun 30 11:46:15 2022 +0200
+
+    Fixed comment
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index 144fce9cf6b..7b07a7a0af9 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.8
+    ACE VERSION: 7.0.9
 
     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 2d034f23eaa..547f8a60e79 100644
--- a/ACE/VERSION.txt
+++ b/ACE/VERSION.txt
@@ -1,4 +1,4 @@
-This is ACE version 7.0.8, released Fri Jul 01 09:15:13 CEST 2022
+This is ACE version 7.0.9, released Sat Oct 01 14:28:35 CEST 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 627111d5027..e9c73d7e3b4 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 8
-#define ACE_VERSION "7.0.8"
-#define ACE_VERSION_CODE 0x70008
+#define ACE_MICRO_VERSION 9
+#define ACE_VERSION "7.0.9"
+#define ACE_VERSION_CODE 0x70009
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/ACE/debian/control b/ACE/debian/control
index d411899194d..f9fe8b0a521 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.8
+Package: libace-7.0.9
 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.8 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-7.0.9 (= ${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.8
+Package: libace-ssl-7.0.9
 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.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-7.0.9 (= ${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.8
+Package: libace-rmcast-7.0.9
 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.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-7.0.9 (= ${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.8
+Package: libace-tmcast-7.0.9
 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.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-7.0.9 (= ${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.8
+Package: libace-htbp-7.0.9
 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.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-7.0.9 (= ${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.8
+Package: libace-inet-7.0.9
 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.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-7.0.9 (= ${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.8
+Package: libace-inet-ssl-7.0.9
 Architecture: any
 Section: libs
-Depends: libace-inet-7.0.8, libace-ssl-7.0.8, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-7.0.9, libace-ssl-7.0.9, ${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.8 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-7.0.9 (= ${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.8
+Package: libacexml-7.0.9
 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.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-7.0.9 (= ${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.8
+Package: libace-xml-utils-7.0.9
 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.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-7.0.9 (= ${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.8
+Package: libkokyu-7.0.9
 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.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-7.0.9 (= ${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.8
+Package: libace-xtreactor-7.0.9
 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.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-7.0.9 (= ${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.8
+Package: libace-tkreactor-7.0.9
 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.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-7.0.9 (= ${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.8
+Package: libace-flreactor-7.0.9
 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.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends}
+Depends: libace-flreactor-7.0.9 (= ${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.8
+Package: libace-foxreactor-7.0.9
 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.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-7.0.9 (= ${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.8
+Package: libnetsvcs-7.0.9
 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.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-7.0.9 (= ${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 3e5a7e4fe5d..addb2dbd0c9 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.8
-%define TAOVER  3.0.8
+%define ACEVER  7.0.9
+%define TAOVER  3.0.9
 
 # Conditional build
 # Default values are
diff --git a/TAO/ChangeLogs/TAO-3_0_9 b/TAO/ChangeLogs/TAO-3_0_9
new file mode 100644
index 00000000000..25d5cad42ea
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-3_0_9
@@ -0,0 +1,588 @@
+commit a16ac15dd106967992baef21a91f73f002b2cb79
+Merge: 7b7e6532345 46bf3cb65ed
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 23 09:20:49 2022 +0200
+
+    Merge pull request #1942 from knutpett/knutpett/const_accessor
+    
+    Added const accessors for AST_Decl::local_name () and UTL_String::get_string ()
+
+commit 7b7e65323459375cda40274c9b5828b3f5aebda9
+Merge: 0b7e12778ae 2aab75d5fdd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 23 09:20:32 2022 +0200
+
+    Merge pull request #1941 from knutpett/knutpett/remove_void_part2
+    
+    Part 2: Remove obsolescent (void) in functions with no parameters
+
+commit 46bf3cb65ed64842f6272fb9d571af3c8d4ead59
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 23 08:47:45 2022 +0200
+
+    Remove the non-const version
+    
+    This is safe since non-const functions can call const-functions.
+
+commit 0b7e12778ae92315cbd51c901cb8402d6bd646a7
+Merge: f980f161749 64b5a4fecb5
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Sep 22 17:58:28 2022 -0500
+
+    Merge pull request #1907 from lukem/format-security
+    
+    Fix -Wformat-security issues
+
+commit 1aa4a63339a3990a68b5dd5f808bc3e5c33e193f
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Thu Sep 22 16:30:31 2022 +0200
+
+    Added const accessors for AST_Decl::local_name () and UTL_String::get_string ()
+
+commit 2aab75d5fddc126e8085c70fe8e1b875b75a30ef
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Mon Sep 19 14:37:02 2022 +0200
+
+    Part 2: Remove obsolescent (void) in functions with no parameters
+
+commit f980f161749eac82843c44943e6fec229920ba9f
+Merge: a3981dc07f3 90cfc149fdf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 21 08:38:51 2022 +0200
+
+    Merge pull request #1936 from jwillemsen/jwi-valuetypecdr
+    
+    Valuetype test extensions
+
+commit 90cfc149fdf58636ba5474b8ee5a3e60d24d7d90
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 20 16:39:55 2022 +0200
+
+    Correct project
+    
+        * TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc:
+
+commit e47c0ac2aa640d892e02ccb05a160a82d3490e6c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 20 16:35:24 2022 +0200
+
+    Move new test IDL to seperate project
+    
+        * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace2.idl:
+          Added.
+    
+        * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl:
+        * TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc:
+
+commit 64b5a4fecb5806522f220d63b0744ffa40bb6bcc
+Merge: ccbb3639f96 9bb6d09a139
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Sep 19 16:40:20 2022 -0500
+
+    Merge branch 'master' into format-security
+
+commit dcdc061a7e9e6446115374c404020c57577a2f62
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 14:45:51 2022 +0200
+
+    Use override instead of virtual
+    
+        * TAO/tao/Wait_On_LF_No_Upcall.h:
+        * TAO/tao/Wait_On_Leader_Follower.h:
+        * TAO/tao/Wait_On_Reactor.h:
+        * TAO/tao/Wait_On_Read.h:
+
+commit c43546b7c54c422c3fc6c3c8cf56d51703c1a58f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 14:44:02 2022 +0200
+
+    Add back virtual
+    
+        * TAO/tao/Wait_On_Leader_Follower.h:
+
+commit adf5bf4e71739a491b31ecec4fcfa8f82daded67
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 13:46:37 2022 +0200
+
+    Use default destructors
+    
+        * TAO/tao/Wait_On_LF_No_Upcall.cpp:
+        * TAO/tao/Wait_On_LF_No_Upcall.h:
+        * TAO/tao/Wait_On_Leader_Follower.cpp:
+        * TAO/tao/Wait_On_Leader_Follower.h:
+        * TAO/tao/Wait_On_Reactor.cpp:
+        * TAO/tao/Wait_On_Reactor.h:
+        * TAO/tao/Wait_On_Read.cpp:
+        * TAO/tao/Wait_On_Read.h:
+        * TAO/tao/Wait_Strategy.cpp:
+        * TAO/tao/Wait_Strategy.h:
+
+commit 417e48232eb31084b2908abf8a522531e7647ca9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 12:41:08 2022 +0200
+
+    More test
+    
+        * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl:
+
+commit c31931d437af978c72302bb66831f729e680f325
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 12:38:40 2022 +0200
+
+    More test extensins
+    
+        * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl:
+        * TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc:
+
+commit 55598ab199359c7daa3331520675f7a5c8e3cfe7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 11:27:26 2022 +0200
+
+    Extend test, enabled cdr
+    
+        * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl:
+        * TAO/tests/IDL_Test/Versioned_Namespace/Versioned_Namespace.mpc:
+
+commit 5e96bb28fc7572f39b63ac2aca72800c45cdb1ee
+Merge: 96f0f9c1666 84f0894d8f0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 09:55:44 2022 +0200
+
+    Merge pull request #1933 from jwillemsen/jwi-versionednamespacetest
+    
+    Extend test IDL
+
+commit 96f0f9c16668c07531ea8c60c7b912f2e7b55806
+Merge: 14610fc4e13 d7c2081760f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 19 09:55:26 2022 +0200
+
+    Merge pull request #1934 from jwillemsen/jwi-require_truncation_
+    
+    Use uniform initialisation for require_truncation_ so tha we can generate a default constructor
+
+commit d7c2081760f1fed0c7e5929c35b7cc0fe9429c2e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Sep 18 11:53:46 2022 +0200
+
+    Use uniform initialisation for require_truncation_ so tha we can generate a default constructor
+    
+        * TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp:
+        * TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
+
+commit 84f0894d8f00fcb6e865c4dace75115eac98ac42
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sun Sep 18 10:33:55 2022 +0200
+
+    Extend test IDL
+    
+        * TAO/tests/IDL_Test/Versioned_Namespace/TestVersionedNamespace.idl:
+
+commit 3f1236a89ac9381be2ece19ff833f6a6b5f4ae15
+Merge: da2ab4ef14f 062f194d4b3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 15 16:00:38 2022 +0200
+
+    Merge pull request #1930 from jwillemsen/jwi-sslcert
+    
+    Generated new certificates, old ones expired
+
+commit 062f194d4b339bc32dbd5705613800eb4db68960
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 15 16:00:04 2022 +0200
+
+    Generated new certificates, old ones expired
+
+commit bc05ebcc29b4ec7f5c7af14dad9ef6bd18883891
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Sep 15 09:34:26 2022 +0200
+
+    Revert addressof changes, looks it broke something
+    
+        * TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+        * TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp:
+
+commit 0a03a4b940b9bb549587d3f22eab9e66d617551c
+Merge: a457e9d14d9 0615e6ef888
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Sep 14 09:16:25 2022 +0200
+
+    Merge pull request #1926 from jwillemsen/jwi-taoidlnullptr3
+    
+    Use nullptr, check pointers with 1, use std::addressof, reduced sloc
+
+commit 3da59eac098c1ef9d2c98f2079185ff35c3b6105
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Tue Sep 13 22:57:39 2022 +0200
+
+    Remove obsolescent (void) in functions with no parameters
+
+commit 0615e6ef888bdcbbae4324e1dcbd04a21516e0e3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 13 13:39:29 2022 +0200
+
+    Removed empty line
+    
+        * TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
+
+commit 603ecf36e5a6142ced625b1579a3ea1d4e48bdd8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Sep 13 12:04:48 2022 +0200
+
+    Use nullptr, check pointers with 1, use std::addressof, reduced sloc
+    
+        * TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp:
+        * TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp:
+        * TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
+
+commit ccbb3639f96d55c38f96914c6c7c4bc8c8998db9
+Merge: bdc29ef27a6 fe03724176d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 12 09:36:12 2022 +0200
+
+    Merge branch 'master' into format-security
+
+commit fe03724176dcfd20e0f9a6e493198469242be6b6
+Merge: 41a1f3bc12f 00b403be7df
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 12 08:32:34 2022 +0200
+
+    Merge pull request #1922 from knutpett/knutpett/whitespace
+    
+    Remove whitespace
+
+commit 00b403be7df0442405bd5e3dcc07beaa6730ddd2
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Sat Sep 10 12:26:57 2022 +0200
+
+    Fixed Redundant blank line at the end of a code block should be deleted
+
+commit 60987b4ba42ff6e4e6a4f4457d902a18c0c6b0a0
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Sat Sep 10 12:19:28 2022 +0200
+
+    Remove leading blank lines after opening {
+
+commit ab436d45dc956c1eaec31bff0c43ca3a0cb0cb66
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Sat Sep 10 12:14:24 2022 +0200
+
+    Remove trailing whitespace forgotten in previous commit
+
+commit c42abee7c0e81ed89bdfb47bf3a1bcb743cf256b
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Sat Sep 10 12:08:48 2022 +0200
+
+    Removed extra newline before closing }
+
+commit 2be659384defe6b235e020f03a7d683c80a16c7e
+Author: Luke Mewburn <Luke@Mewburn.net>
+Date:   Sat Sep 10 16:30:54 2022 +1000
+
+    Adapt to ACE_TEXT_PRIs
+    
+    Use ACE_TEXT_PRIs instead of conditional compilation
+    checking !defined(ACE_WIN32) && defined(ACE_USES_WCHAR).
+
+commit f5e5d7759a9314053509d294a4c10827d3946034
+Author: Luke Mewburn <Luke@Mewburn.net>
+Date:   Sat Sep 10 11:05:56 2022 +1000
+
+    Define ACE_TEXT_PRIs. Use to fix -Wformat-security
+    
+    Define ACE_TEXT_PRIs as "s" or "ls" depending upon the WCHAR mode.
+    (This is similar to the PRIxxx macros in <inttypes.h>)
+    
+    Use  ACE_TEXT("%") ACE_TEXT_PRIs  instead of "%s" or even
+    just the raw string without a format specifier.
+    
+    Fixes issue #1906.
+
+commit 8bc991b1de07cdb3a4c472d0932c71bda181db34
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 23:19:18 2022 +0200
+
+    resurrect two removed virtuals
+
+commit 5b9eb336d9f631d62f51d7725b4f9a1df7e4c240
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 9 18:00:29 2022 +0200
+
+    Removed redunant void
+    :
+        * TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp:
+
+commit 9542877dc5440626262777674cc9481079d9ee0c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Sep 9 17:51:09 2022 +0200
+
+    Make use of std::addressof and removed some redundant whitespacing
+
+commit 126e88aeb3f288c770f0dccde5c6314ccaa6212c
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 15:46:54 2022 +0200
+
+    Replace 3 blank lines with just 2 blank lines
+
+commit 430d023f1d97173cfd104498f92dc4ccaa1c4135
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 14:31:18 2022 +0200
+
+    Remove extra newline after public, protected and private
+
+commit d75c37b54441651922e5dcfd287cbc87b1833e23
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 09:23:14 2022 +0200
+
+    Fix CodeFactor issues: blank lines
+
+commit f74944300c9af39d3e099aec8dff263e6d7918df
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 11:59:29 2022 +0200
+
+    Fix whitespace issues found by fuzz
+    
+    Running trailing_whitespaces check
+    Error: ./TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h:132: found trailing whitespace
+    Error: ./TAO/tao/CSD_Framework/CSD_POA.h:53: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/LifespanStrategyTransient.h:48: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h:54: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h:59: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:46: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:52: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:67: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:74: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:93: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:96: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:102: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:125: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:132: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h:44: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h:50: found trailing whitespace
+    Error: ./TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h:68: found trailing whitespace
+
+commit 6f72892d61032d294fe1387a36ec6e04e9efa9c2
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 10:38:55 2022 +0200
+
+    Fix trailing newline in class declarations
+
+commit 6d7b6be10a2c2be4fc47bdd2e285657fcc4d60fd
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Fri Sep 9 10:31:07 2022 +0200
+
+    Fix more blank line issues
+
+commit 1bc30d9abfac4b990a8ca25f43c666f28a8d61d2
+Merge: 156da73ce08 56377d8db17
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Sep 5 08:22:58 2022 +0200
+
+    Merge pull request #1912 from knutpett/warning_extra_semi
+    
+    Remove warnings -Wextra-semi
+
+commit c320b8022b5fd32b9237f1211f3f6d29c2192b21
+Author: Luke Mewburn <Luke@Mewburn.net>
+Date:   Fri Sep 2 21:18:26 2022 +1000
+
+    Fix -Wformat-security issues for wchar_t
+    
+    Use %ls instead of %s when using wchar_t
+    
+    Fixes issue #1906.
+
+commit 56377d8db17268f480e3800b020cbd5df5c1afab
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Tue Aug 30 10:43:31 2022 +0200
+
+    Fix issues found by CodeFactor: blank line
+    
+    CodeFactor reported:
+    Redundant blank line at the start of a code block should be deleted
+
+commit 18bda4f07b8a8fde245f26afe8772a4c650d0773
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Tue Aug 30 10:41:19 2022 +0200
+
+    Use default constructor
+
+commit c2181241c7dc3be203d4b0f231f2ab11b4f243e4
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Aug 29 17:39:16 2022 -0500
+
+    fuzz script comments
+
+commit a020ca7ad752fffd3b20b38e2f187cc8dcf5be10
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Aug 29 16:00:04 2022 -0500
+
+    Use ACE's Sync(h) traits in AST_Annotation_Appls
+    
+    - interprocess mutexes are not needed
+    - support threads=0 builds of tao_idl
+
+commit 023da962da06c7c6ab4e801d7a5861ef21ca9577
+Author: Knut Petter Svendsen <knut@altuma.no>
+Date:   Mon Aug 29 16:20:38 2022 +0200
+
+    Remove warnings -Wextra-semi
+
+commit 1c9614d34d09d39486e579c6c21b0218997739c8
+Author: Luke Mewburn <Luke@Mewburn.net>
+Date:   Sat Aug 20 11:17:07 2022 +1000
+
+    Fix -Wformat-security issues
+    
+    Ensure that methods with a printf()-like format string
+    are invoked with a literal string instead of a string
+    built from possibly untrusted sources.
+    
+    Fixes issue #1906.
+
+commit 44c80da21fe3daed65ce0b19e47b09ba6aa3f438
+Merge: 05484cd6cd8 368e8175c5e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 14:43:23 2022 +0200
+
+    Merge pull request #1898 from jwillemsen/jwi-ACE_NESTED_CLASS
+    
+    Removed old comments for ACE_NESTED_CLASS
+
+commit 368e8175c5eea00b008b9295a4b1146ab297c771
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 09:55:22 2022 +0200
+
+    Removed old comments for ACE_NESTED_CLASS
+    
+        * TAO/TAO_IDL/ast/ast_type.cpp:
+        * TAO/TAO_IDL/be/be_interface.cpp:
+        * TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp:
+        * TAO/tests/IDL_Test/params.idl:
+
+commit 4a6478c41ac4b1e17cea8e0e4f4bbb6afe91269b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Aug 10 08:32:51 2022 +0200
+
+    Use override, remove redundant whitespacing, fixed typo
+    
+        * ACE/tests/Enum_Interfaces_Test.cpp:
+        * TAO/orbsvcs/DevGuideExamples/Security/SecurityUnawareApp/README:
+        * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp:
+        * TAO/orbsvcs/tests/Security/ssliop_corbaloc/test_object.idl:
+
+commit d799942f683eee8dafa8f81384f6a5d835ccc649
+Merge: bd92596bbc6 7ff6fc7440e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 20 08:13:11 2022 +0200
+
+    Merge pull request #1888 from jwillemsen/jwi-vcpkgv10
+    
+    Upgrade to vcpkg v10
+
+commit 4e2f7ae34d81f4ce82e6930b668785b886fb31fe
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jul 19 09:32:06 2022 +0200
+
+    Layout changes
+
+commit bd92596bbc63635a2ed2131322e6c659a5420586
+Merge: b9e4a9a92a6 8f9a9f304ba
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 18 16:27:20 2022 +0200
+
+    Merge pull request #1887 from jwillemsen/jwi-codesetregistry
+    
+    Minor change for codeset registry generation and removed old Id tags
+
+commit 8f9a9f304ba52f05f9a06c2afa16ea3f4ca0b097
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 18 13:22:23 2022 +0200
+
+    Add semicolon to generation
+    
+        * TAO/utils/catior/Catior_i.cpp:
+
+commit 061375f9119599cadddb96fcb1284c06e0fa4695
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jul 18 13:22:11 2022 +0200
+
+    Removed old Id tag
+    
+        * TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp:
+
+commit f94bdbc8fd6ae29e2f2b998f27fbacb03ca8f6d0
+Merge: 3ebafd71204 dae27692c88
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 15 13:57:34 2022 +0200
+
+    Merge pull request #1886 from jwillemsen/jwi-irixcleanup
+    
+    Removed some old Irix related code
+
+commit dae27692c8897e7f1de112b819c25fe7971ee895
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 15 08:04:34 2022 +0200
+
+    Removed some old Irix related code
+    
+        * TAO/bin/tao_orb_tests.lst:
+        * TAO/bin/tao_other_tests.lst:
+        * TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp:
+        * TAO/tao/IIOP_Connection_Handler.cpp:
+        * TAO/tao/IIOP_Transport.cpp:
+
+commit 3ebafd712042a344dc52677e1d190c9dfcbb3c65
+Merge: b619e577177 8096d513b52
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jul 14 11:57:11 2022 +0200
+
+    Merge pull request #1883 from jwillemsen/jwi-localhost
+    
+    Make use of ACE_LOCALHOST and removed Tru64/Irix remaining code
+
+commit 8096d513b52a30164b1820eab996dd26dbe2a4b8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jul 14 09:25:40 2022 +0200
+
+    Removed old code for Tru64/Irix, not supported anymore for a long time
+
+commit 1edc75272eb9348504ce9932af88e8870d814c30
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 13 15:41:16 2022 +0200
+
+    Removed workaround for Tru64
+    
+        * TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc:
+
+commit 55e5793c7215c22c6ddf40fbcc0144a8862f76e2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Jul 13 09:25:12 2022 +0200
+
+    Layout changes
+    
+        * TAO/tao/Codeset/Codeset.cpp:
+        * TAO/tao/Codeset/Codeset_Manager_i.cpp:
+        * TAO/tao/Codeset/UTF8_Latin1_Factory.h:
+
+commit bff9af24d9cfd567a0f91d15dbab8bf729758e5a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jul 1 09:55:07 2022 +0200
+
+    Updated
+    
+        * ACE/docs/bczar/bczar.html:
+        * TAO/NEWS:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index f43f96f6aca..04ef8c14488 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.8
-    ACE VERSION: 7.0.8
+    TAO VERSION: 3.0.9
+    ACE VERSION: 7.0.9
 
     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 a4be5366a0a..ca7c5621860 100644
--- a/TAO/VERSION.txt
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 3.0.8, released Fri Jul 01 09:15:13 CEST 2022
+This is TAO version 3.0.9, released Sat Oct 01 14:28:35 CEST 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 cfcf95de6b8..60c806f739e 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 8
-#define TAO_VERSION "3.0.8"
-#define TAO_VERSION_CODE 0x30008
+#define TAO_MICRO_VERSION 9
+#define TAO_VERSION "3.0.9"
+#define TAO_VERSION_CODE 0x30009
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))