ACE+TAO-7_0_2ACE+TAO-7_0_2

10 files changed, 1066 insertions, 44 deletions

diff --git a/ACE/ChangeLogs/ACE-7_0_2 b/ACE/ChangeLogs/ACE-7_0_2
new file mode 100644
index 00000000000..747648785ae
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-7_0_2
@@ -0,0 +1,519 @@
+commit 39460b2f2d8cb37ff8535dcc6f032f837001b6dc
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu May 13 08:31:16 2021 -0500
+
+    release script: default branch update
+
+commit b2d1220c18fb95537015ecc752846ffe2b5989fa
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Thu May 13 08:19:43 2021 -0500
+
+    cherry-picked release script changes from fb1c569bc48ecf8d8adc79af59fed680aa12d3dc
+    
+    Fix Branch Issue with Release Script
+    
+    Also do some cleanup, and change the `*_VERSION_CODE` macros to be
+    formatted using hexadecimal.
+
+commit c02aea2adb2caa25bd9f6a16098c5b78029d6d5f
+Merge: 0a1799a8301 de7c9791b4b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat May 8 09:19:44 2021 +0200
+
+    Merge pull request #1501 from iguessthislldo/igtd/non-master-release-ace7
+    
+    [ACE7] Branch Option for Release Script
+
+commit de7c9791b4be2d264401b566024755b17269615d
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Thu May 6 11:29:45 2021 -0500
+
+    Remove Latest Branch Skip in Release Script
+
+commit 9a2044a2bbc4b24eb339f29ee5a432da1917458c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu May 6 18:28:12 2021 +0200
+
+    Small bullet fix
+    
+        * ACE/docs/ACE-bug-process.html:
+
+commit 798d121311fa9edbc86b92a9ae741c19a1d1644e
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed May 5 23:43:56 2021 -0500
+
+    Branch Option for Release Script
+
+commit f66b7cbbe653e05ae48f21d6829e72d1a30c20ff
+Merge: 305e47ef87a f250f6afd0b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 30 13:09:45 2021 +0200
+
+    Merge pull request #1491 from jwillemsen/jwi-ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES2
+    
+    Removed support for ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES, only set …
+
+commit 4ebccb5b0e332aa59e47aedf74c367979a186192
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 30 10:43:37 2021 +0200
+
+    List changes
+    
+        * ACE/NEWS:
+
+commit f250f6afd0be9024db716148084569b6fd6201df
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 30 10:40:19 2021 +0200
+
+    Removed support for ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES, only set by the config file for LynxOS178 for gcc2.96 which is ancient
+    
+        * ACE/ace/README:
+        * ACE/ace/Singleton.cpp:
+        * ACE/ace/Singleton.h:
+        * ACE/ace/config-lynxos-178.h:
+        * ACE/netsvcs/lib/Log_Message_Receiver.cpp:
+        * ACE/netsvcs/lib/Log_Message_Receiver.h:
+        * ACE/netsvcs/lib/Server_Logging_Handler_T.cpp:
+        * ACE/netsvcs/lib/Server_Logging_Handler_T.h:
+        * TAO/tao/TAO_Singleton.cpp:
+        * TAO/tao/TAO_Singleton.h:
+
+commit 8697db3db42dc5fc6a2071cf41991efed94c673b
+Merge: 9e52a9c1f71 66a3eaf1fe0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 18:33:15 2021 +0200
+
+    Merge pull request #1489 from jwillemsen/jwi-usedelete
+    
+    Make use of delete to make sure an operation can't be called
+
+commit 6f3e147d990d4252f251dde60e5730e1c3009dfe
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 12:34:31 2021 +0200
+
+    Make use of delete to make sure an operation can't be called
+    
+        * ACE/ace/TP_Reactor.h:
+        * TAO/tao/Collocated_Invocation.h:
+        * TAO/tao/DynamicInterface/DII_Arguments.h:
+        * TAO/tao/DynamicInterface/DII_Arguments.inl:
+        * TAO/tao/DynamicInterface/DII_Invocation.h:
+        * TAO/tao/DynamicInterface/DII_Invocation_Adapter.h:
+        * TAO/tao/DynamicInterface/DII_Reply_Handler.cpp:
+        * TAO/tao/DynamicInterface/DII_Reply_Handler.h:
+        * TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h:
+        * TAO/tao/DynamicInterface/ExceptionList.h:
+        * TAO/tao/Messaging/Asynch_Invocation_Adapter.h:
+        * TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h:
+
+commit e34b94be98ca81f5a9640b896e1cf983bb3ea768
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 11:35:23 2021 +0200
+
+    Make use of delete
+    
+        * ACE/performance-tests/TCP/tcp_test.cpp:
+        * ACE/performance-tests/UDP/udp_test.cpp:
+        * ACE/tests/Token_Strategy_Test.cpp:
+        * TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h:
+
+commit ae4bd945a234a175b54dafb1cb54678b7cc67639
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 11:34:48 2021 +0200
+
+    Removed not used auto_ptr member, use delete instead of ACE_UNIMPLEMENTED_FUNC, layout changes, fixed typos in comments
+    
+        * ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h:
+        * ACE/netsvcs/lib/Log_Message_Receiver.h:
+        * ACE/performance-tests/TCP/tcp_test.cpp:
+        * TAO/orbsvcs/Trading_Service/README:
+        * TAO/orbsvcs/Trading_Service/Trading_Server.cpp:
+        * TAO/orbsvcs/Trading_Service/Trading_Service.cpp:
+        * TAO/orbsvcs/Trading_Service/Trading_Service.h:
+        * TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp:
+        * TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Trader.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Trader_T.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp:
+        * TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h:
+        * TAO/orbsvcs/tests/Trading/Simple_Dynamic.h:
+        * TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h:
+        * TAO/tao/RTCORBA/Priority_Mapping_Manager.h:
+        * TAO/tao/RTScheduling/RTScheduler_Manager.h:
+
+commit ac8caeed1f3db9239e84ccc79f5cf3a1f952a6d7
+Merge: 7f76346bc32 292114e68b4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 23 21:35:27 2021 +0200
+
+    Merge pull request #1480 from jwillemsen/jwi-minorcleanup
+    
+    Minor cleanup, layout changes, use nullptr
+
+commit 7f76346bc32eb5b7bd29ce0bce4d6be38ce97641
+Merge: 6b2749bef34 0a0646ce59f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 23 21:35:14 2021 +0200
+
+    Merge pull request #1479 from jwillemsen/jwi-envinfo
+    
+    Cleanup and simplified this small test source
+
+commit 6b2749bef34f4882a96dccc4c53a288a2d4d04d5
+Merge: b2a31c772e0 c589fbcb365
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 23 21:35:01 2021 +0200
+
+    Merge pull request #1478 from jwillemsen/jwi-macosxbigsur
+    
+    MacOSX 11.1/11.2 are both bigsur releases
+
+commit 292114e68b44623de91c107d989a83fb0d183d29
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 23 14:37:28 2021 +0200
+
+    Minor cleanup, layout changes, use nullptr
+    
+        * ACE/ACEXML/common/HttpCharStream.cpp:
+        * ACE/ACEXML/common/HttpCharStream.h:
+        * ACE/ACEXML/common/URL_Addr.cpp:
+        * ACE/ACEXML/common/XML_Codecs.cpp:
+        * ACE/Kokyu/Default_Dispatcher_Impl.cpp:
+        * ACE/Kokyu/Kokyu.cpp:
+        * ACE/ace/Asynch_IO.h:
+        * ACE/ace/Local_Memory_Pool.cpp:
+        * ACE/ace/Parse_Node.h:
+        * ACE/ace/Proactor.cpp:
+        * ACE/ace/Thread_Manager.cpp:
+        * ACE/tests/Priority_Reactor_Test.cpp:
+        * TAO/tao/Stub.h:
+        * TAO/tao/Stub.inl:
+
+commit 0a0646ce59f66ff408755774c82a80db3eab93b4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 23 14:21:56 2021 +0200
+
+    Cleanup and simplified this small test source
+    
+        * ACE/bin/envinfo.cpp:
+
+commit c589fbcb36576f48efaacb65828223f8c1bdd202
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 22 14:31:27 2021 +0200
+
+    MacOSX 11.1/11.2 are both bigsur releases
+    
+        * ACE/include/makeinclude/platform_macosx.GNU:
+
+commit cd464a4219852ae12644e4a2aaee9bcdddade45d
+Merge: a0ecadfcfd7 62fcedd0c81
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 16 18:59:20 2021 +0200
+
+    Merge pull request #1474 from jwillemsen/master
+    
+    Fixed typo in comment
+
+commit 62fcedd0c81e56d243e6689891b6a83de470a2d4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 16 12:30:39 2021 +0200
+
+    Fixed typo in comment
+    
+        * ACE/ace/Log_Record.h:
+
+commit 7fa0188744a75dc77e9d5ddf9626ed1a851c31e1
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Apr 7 23:30:22 2021 -0500
+
+    Defer Including rules.tao.GNU for gnuace
+    
+    Alternative fix for
+    https://github.com/objectcomputing/OpenDDS/pull/2559. See there for
+    details.
+    
+    https://github.com/DOCGroup/ACE_TAO/pull/1296 changed the order of
+    includes of rules make files to effectively being how the base projects
+    that set them are included. This can lead to the order of
+    `GNUACE_PROJECT_VERSION ?=` being set differently than what the case was
+    in ACE6/TAO2. The result in OpenDDS is that so library files get TAO's
+    version number.
+    
+    This tires to fix that by including `tao.rules.GNU` at a marker after
+    the `extension` marker.
+
+commit 8547bfe3ead4c0e789eb5ca6f624a90e0a529fc4
+Merge: 98fec40e355 4650bff5062
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Mar 29 15:42:14 2021 +0200
+
+    Merge pull request #1469 from jwillemsen/jwi-etclwanring
+    
+    Added fallthrough comment to fix gcc warning
+
+commit 4650bff5062290a530cf47185fb1f96eb1684392
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Mar 29 13:04:29 2021 +0200
+
+    Changed code to silence gcc
+    
+        * ACE/ace/ETCL/ETCL_l.cpp:
+
+commit 750bdcd348ba6234705c1421818bafd0f4a46efe
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Mar 29 09:18:43 2021 +0200
+
+    Added break to silence gcc
+    
+        * ACE/ace/ETCL/ETCL_l.cpp:
+
+commit 617279a571bab705910a45d4aee2984d64743016
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Mar 29 08:29:56 2021 +0200
+
+    Generate some fallthroughs to silence gcc warnings
+    
+        * ACE/apps/gperf/src/Key_List.cpp:
+
+commit 0c77ead322245be4f943347544f065cf1401b679
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Mar 27 19:10:18 2021 +0100
+
+    Fixed compile warnings
+    
+        * ACE/ACEXML/parser/parser/Parser.cpp:
+        * ACE/ace/Message_Queue_T.cpp:
+        * ACE/examples/IPC_SAP/FIFO_SAP/FIFO-test.cpp:
+        * ACE/examples/IPC_SAP/SOCK_SAP/FD-unserver.cpp:
+
+commit 7ba97586c298e582093e69967a700c0b60ad1105
+Merge: a634022e80c ec94256f65a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Mar 27 18:33:33 2021 +0100
+
+    Merge pull request #1466 from jwillemsen/jwi-gccwarnings
+    
+    Fixed compile warnings
+
+commit ec94256f65a4d34e90a8ee1923f5e8b433764036
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Mar 27 16:25:21 2021 +0100
+
+    Fixed compile warnings
+    
+        * ACE/apps/drwho/Options.h:
+        * ACE/tests/Proactor_Test_IPV6.cpp:
+        * ACE/tests/SOCK_Send_Recv_Test.cpp:
+        * ACE/tests/SOCK_Test.cpp:
+        * ACE/tests/Sendfile_Test.cpp:
+
+commit 0a641f5931481f5b13a4ea54877539fb7dc5fd55
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Mar 27 10:50:21 2021 +0100
+
+    Fixed compile warnings
+    
+        * ACE/protocols/ace/RMCast/Acknowledge.cpp:
+        * ACE/protocols/ace/RMCast/Protocol.h:
+        * ACE/tests/Memcpy_Test.cpp:
+
+commit 8a81a8f16cc4d46a54f235c41d70935289bbfee8
+Merge: 457ccb123b5 2672e1078fb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Mar 26 19:13:37 2021 +0100
+
+    Merge pull request #1463 from jwillemsen/jwi-handleset
+    
+    Provide optimized copy constructor for ACE_Handle_Set to fix warnings…
+
+commit 457ccb123b5656012e153ab1c65b0408ff0988c7
+Merge: 58053435aa3 70a05736260
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Mar 26 19:13:19 2021 +0100
+
+    Merge pull request #1462 from jwillemsen/jwi-psos
+    
+    Replace psos
+
+commit 2672e1078fbec8c3c95e0ab9f8d9527b81fa0693
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Mar 26 16:41:03 2021 +0100
+
+    Extend handle set test further
+    
+        * ACE/tests/Handle_Set_Test.cpp:
+
+commit 09442240972bf6c0d2223e4ee4fa86134ef8af08
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Mar 26 16:30:32 2021 +0100
+
+    Provide optimized copy constructor for ACE_Handle_Set to fix warnings with newer g++ versions
+    
+        * ACE/ace/Handle_Set.cpp:
+        * ACE/ace/Handle_Set.h:
+        * ACE/ace/Handle_Set.inl:
+        * ACE/tests/Handle_Set_Test.cpp:
+
+commit ed6c27a6406eefce42e0a77e574eb025491e2055
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Mar 26 14:43:50 2021 +0100
+
+    Make use of std::unique_ptr instead of auto_ptr
+    
+        * ACE/ACEXML/common/Attributes_Def_Builder.h:
+        * ACE/ACEXML/common/Element_Def_Builder.h:
+        * ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.cpp:
+        * ACE/examples/Bounded_Packet_Relay/bpr_thread.cpp:
+        * ACE/examples/C++NPv2/TP_Reactor_Logging_Server.cpp:
+        * ACE/examples/Reactor/TP_Reactor/AcceptHandler.cpp:
+        * ACE/examples/Shared_Malloc/test_multiple_mallocs.cpp:
+        * ACE/examples/Shared_Malloc/test_position_independent_malloc.cpp:
+        * ACE/examples/Timer_Queue/main_async.cpp:
+        * ACE/examples/Timer_Queue/main_reactor.cpp:
+        * ACE/examples/Timer_Queue/main_thread.cpp:
+        * ACE/examples/Timer_Queue/main_thread_custom_handler.cpp:
+        * ACE/protocols/ace/TMCast/Group.cpp:
+        * ACE/protocols/ace/TMCast/Group.hpp:
+        * ACE/protocols/ace/TMCast/MTQueue.hpp:
+
+commit 373b467654b715f9b60b5659077832a65ab335e1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Mar 23 11:10:45 2021 +0100
+
+    Use bool instead of int for error variable
+    
+        * ACE/ace/ACE.cpp:
+        * ACE/ace/Asynch_Acceptor.cpp:
+        * ACE/ace/Asynch_Connector.cpp:
+        * ACE/ace/Connector.cpp:
+        * ACE/ace/ICMP_Socket.cpp:
+        * ACE/ace/WFMO_Reactor.cpp:
+
+commit c22e1496f305f0fef210445f3e371b1c987ba318
+Merge: adc3b318495 09ae013e2b0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 14:28:53 2021 +0100
+
+    Merge pull request #1458 from jwillemsen/jwi-cleanup
+    
+    Minor cleanup
+
+commit adc3b3184957de087fb84f045a7e4ba7287e1270
+Merge: 5f9ccb42bc0 104d9f8a30c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 14:28:21 2021 +0100
+
+    Merge pull request #1457 from jwillemsen/jwi-redundantvoid
+    
+    Removed redundant void
+
+commit 05ec4d3db0f7b68581bccff74b59df95ede3d819
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 11:57:23 2021 +0100
+
+    Minor cleanup
+
+commit 104d9f8a30c479fe661883b295f120ab035645d9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 10:52:29 2021 +0100
+
+    Removed redundant void
+
+commit 5a0dbea7c881e97c5419d8584a45ed43d07ab8e9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 10:29:17 2021 +0100
+
+    Update email address
+    
+        * ACE/tests/ACE_Init_Test.h:
+
+commit c606e6186764968f211c6e4539048761f54dc742
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 10:29:07 2021 +0100
+
+    Update email addresses
+    
+        * ACE/tests/ACE_Init_Test_StdAfx.h:
+
+commit a2c34ec23eb876c261950835ed0b55ea1ec3fe30
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 10:28:38 2021 +0100
+
+    Removed ancient _MSVC_VER checks
+    
+        * ACE/ace/Select_Reactor.h:
+        * ACE/tests/ACE_Init_Test.h:
+        * ACE/tests/ACE_Init_TestDlg.h:
+        * ACE/tests/ACE_Init_Test_StdAfx.h:
+
+commit 032af08d563a5fb5311e7449b7aee4b8b946fb21
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 09:32:59 2021 +0100
+
+    More updates to point to github
+    
+        * ACE/docs/ACE-bug-process.html:
+        * ACE/docs/ACE-subsets.html:
+        * README.md:
+
+commit c4002d0ec12ea841bfdb11eb881f1ece2e06d2e3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 09:09:44 2021 +0100
+
+    Refer to github issues/discussions instead of the mailing lists
+    
+        * ACE/ACE-INSTALL.html:
+        * ACE/ASNMP/README:
+        * ACE/PROBLEM-REPORT-FORM:
+        * ACE/README:
+        * ACE/VERSION.txt:
+        * ACE/ace/High_Res_Timer.cpp:
+        * ACE/docs/ACE-bug-process.html:
+        * ACE/docs/ACE-guidelines.html:
+        * ACE/docs/ACE-subsets.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/tests/README:
+        * TAO/PROBLEM-REPORT-FORM:
+        * TAO/README:
+        * TAO/TAO-INSTALL.html:
+        * TAO/VERSION.txt:
+        * TAO/docs/implrepo/paper.html:
+        * TAO/docs/rtcorba/status.html:
+        * TAO/orbsvcs/ImplRepo_Service/README:
+        * TAO/orbsvcs/tests/Property/README:
+
+commit 2d22ad2099d46d44fa05778313a8d4c9c4a4eba3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Mar 15 18:31:41 2021 +0100
+
+    Prepare for next release
+    
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit 8ceaf2865fc1eaced77993cb864f838c0bb7f297
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Mar 15 09:35:22 2021 +0100
+
+    Make x.0.1 available for download
+    
+        * ACE/bin/copy-local-script.sh:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+
+commit 70a05736260791106fcb87b0a7fe57248dd215eb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jan 5 12:04:54 2021 +0100
+
+    Replace psos
+    
+        * ACE/docs/ACE-guidelines.html:
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index d6557cf4d36..cc6052e9aec 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.1
+    ACE VERSION: 7.0.2
 
     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 d6468c9915f..106ebe7badb 100644
--- a/ACE/VERSION.txt
+++ b/ACE/VERSION.txt
@@ -1,4 +1,4 @@
-This is ACE version 7.0.1, released Mon Mar 15 09:03:24 CET 2021
+This is ACE version 7.0.2, released Fri May 14 11:33:28 CEST 2021
 
 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 2cc9456cd1c..6ec7c70d32d 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 1
-#define ACE_VERSION "7.0.1"
-#define ACE_VERSION_CODE 458753
+#define ACE_MICRO_VERSION 2
+#define ACE_VERSION "7.0.2"
+#define ACE_VERSION_CODE 0x70002
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/ACE/debian/control b/ACE/debian/control
index 21d0efddb21..985aa20c9bd 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.1
+Package: libace-7.0.2
 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.1 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-7.0.2 (= ${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.1
+Package: libace-ssl-7.0.2
 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.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-7.0.2 (= ${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.1
+Package: libace-rmcast-7.0.2
 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.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-7.0.2 (= ${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.1
+Package: libace-tmcast-7.0.2
 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.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-7.0.2 (= ${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.1
+Package: libace-htbp-7.0.2
 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.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-7.0.2 (= ${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.1
+Package: libace-inet-7.0.2
 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.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-7.0.2 (= ${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.1
+Package: libace-inet-ssl-7.0.2
 Architecture: any
 Section: libs
-Depends: libace-inet-7.0.1, libace-ssl-7.0.1, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-7.0.2, libace-ssl-7.0.2, ${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.1 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-7.0.2 (= ${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.1
+Package: libacexml-7.0.2
 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.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-7.0.2 (= ${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.1
+Package: libace-xml-utils-7.0.2
 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.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-7.0.2 (= ${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.1
+Package: libkokyu-7.0.2
 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.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-7.0.2 (= ${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.1
+Package: libace-xtreactor-7.0.2
 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.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-7.0.2 (= ${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.1
+Package: libace-tkreactor-7.0.2
 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.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-7.0.2 (= ${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.1
+Package: libace-flreactor-7.0.2
 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.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends}
+Depends: libace-flreactor-7.0.2 (= ${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.1
+Package: libace-foxreactor-7.0.2
 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.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-7.0.2 (= ${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.1
+Package: libnetsvcs-7.0.2
 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.1 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-7.0.2 (= ${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 278598b63d9..ae68862c31b 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.1
-%define TAOVER  3.0.1
+%define ACEVER  7.0.2
+%define TAOVER  3.0.2
 
 # Conditional build
 # Default values are
diff --git a/TAO/ChangeLogs/TAO-3_0_2 b/TAO/ChangeLogs/TAO-3_0_2
new file mode 100644
index 00000000000..f7f0cb08d2a
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-3_0_2
@@ -0,0 +1,503 @@
+commit e8c833ce42e602930aaa9da4f19e39559f54059c
+Merge: 4a5270d6292 54e1cd9fb57
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon May 3 16:09:52 2021 +0200
+
+    Merge pull request #1497 from jwillemsen/jwi-taonews
+    
+    List changes
+
+commit 54e1cd9fb5797060b125dc6123e92bcad49ca968
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon May 3 16:09:16 2021 +0200
+
+    List changes
+    
+        * TAO/NEWS:
+
+commit f968d5916066fad70d5fa8c6c30b5d9a7e573a8d
+Merge: 158c653cd69 61cf0ceadf1
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 30 17:17:26 2021 +0200
+
+    Merge branch 'master' into jwi-hashoverride
+
+commit 158c653cd69fc21eebf39b03e779d80d865bfeb9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 30 17:17:13 2021 +0200
+
+    Mark also the generated hash operation with override
+    
+        * TAO/TAO_IDL/be/be_interface.cpp:
+        * TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h:
+
+commit e46edfd9ff99e54a5bffbbf93fc8aefac0134ce0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 30 14:53:22 2021 +0200
+
+    Generate execute operation with override
+    
+        * TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp:
+
+commit f250f6afd0be9024db716148084569b6fd6201df
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 30 10:40:19 2021 +0200
+
+    Removed support for ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES, only set by the config file for LynxOS178 for gcc2.96 which is ancient
+    
+        * ACE/ace/README:
+        * ACE/ace/Singleton.cpp:
+        * ACE/ace/Singleton.h:
+        * ACE/ace/config-lynxos-178.h:
+        * ACE/netsvcs/lib/Log_Message_Receiver.cpp:
+        * ACE/netsvcs/lib/Log_Message_Receiver.h:
+        * ACE/netsvcs/lib/Server_Logging_Handler_T.cpp:
+        * ACE/netsvcs/lib/Server_Logging_Handler_T.h:
+        * TAO/tao/TAO_Singleton.cpp:
+        * TAO/tao/TAO_Singleton.h:
+
+commit ff216a0df9679117e068903a337dc10c98ab78c5
+Merge: 8697db3db42 0057e52b28a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 18:33:21 2021 +0200
+
+    Merge pull request #1490 from jwillemsen/jwi-taoidl-hashtableoverride
+    
+    Add override to the generated lookup operation
+
+commit 8697db3db42dc5fc6a2071cf41991efed94c673b
+Merge: 9e52a9c1f71 66a3eaf1fe0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 18:33:15 2021 +0200
+
+    Merge pull request #1489 from jwillemsen/jwi-usedelete
+    
+    Make use of delete to make sure an operation can't be called
+
+commit 9e52a9c1f715032921da09ce5fa8bd543ed24f47
+Merge: fb9a4a0fab2 91a68ccacfc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 18:33:07 2021 +0200
+
+    Merge pull request #1488 from jwillemsen/jwi-avnullwarning
+    
+    Corrected null check, only when it is non null
+
+commit fb9a4a0fab263d90bcfdbfef4be5a4b4dd1eb6d7
+Merge: 10f275eb348 e34b94be98c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 18:33:00 2021 +0200
+
+    Merge pull request #1487 from jwillemsen/jwi-autoptrunimpl
+    
+    Removed not used auto_ptr member, use delete, layout changes, fixed typos
+
+commit 0057e52b28a77857b7628b393735e20386784609
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 14:11:09 2021 +0200
+
+    Add override to the generated lookup operation
+    
+        * TAO/TAO_IDL/be/be_interface.cpp:
+
+commit 66a3eaf1fe0675d8be285268029fa3f3998f8334
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 12:50:52 2021 +0200
+
+    Make use of std::addressof
+    
+        * TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp:
+
+commit 1720f78a38854ae2808f17eaf446f84f925ceefd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 12:41:32 2021 +0200
+
+    Make use of delete/default
+    
+        * TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
+        * TAO/tao/DynamicAny/DynAnyFactory.h:
+        * TAO/tao/DynamicInterface/Context.cpp:
+        * TAO/tao/DynamicInterface/Context.h:
+        * TAO/tao/DynamicInterface/Context.inl:
+        * TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp:
+        * TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h:
+        * TAO/tao/Invocation_Adapter.h:
+
+commit 6f3e147d990d4252f251dde60e5730e1c3009dfe
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 12:34:31 2021 +0200
+
+    Make use of delete to make sure an operation can't be called
+    
+        * ACE/ace/TP_Reactor.h:
+        * TAO/tao/Collocated_Invocation.h:
+        * TAO/tao/DynamicInterface/DII_Arguments.h:
+        * TAO/tao/DynamicInterface/DII_Arguments.inl:
+        * TAO/tao/DynamicInterface/DII_Invocation.h:
+        * TAO/tao/DynamicInterface/DII_Invocation_Adapter.h:
+        * TAO/tao/DynamicInterface/DII_Reply_Handler.cpp:
+        * TAO/tao/DynamicInterface/DII_Reply_Handler.h:
+        * TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h:
+        * TAO/tao/DynamicInterface/ExceptionList.h:
+        * TAO/tao/Messaging/Asynch_Invocation_Adapter.h:
+        * TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.h:
+
+commit d48393410c37be7ff5fff6e224d175f58abdaa4a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 12:04:50 2021 +0200
+
+    Use override, removed redundant void
+    
+        * TAO/tao/RTScheduling/Current.h:
+        * TAO/tao/RTScheduling/RTScheduler_Initializer.h:
+        * TAO/tao/RTScheduling/RTScheduler_Loader.h:
+        * TAO/tao/RTScheduling/RTScheduler_Manager.h:
+        * TAO/tao/RTScheduling/Request_Interceptor.h:
+
+commit a59ef0359679f03b619cc20be072cad263a6b852
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 11:59:45 2021 +0200
+
+    Removed redundant void, use delete, layout changes
+    
+        * TAO/tao/RTScheduling/Current.cpp:
+        * TAO/tao/RTScheduling/Current.h:
+        * TAO/tao/RTScheduling/Distributable_Thread.h:
+        * TAO/tao/RTScheduling/RTScheduler.cpp:
+        * TAO/tao/RTScheduling/RTScheduler.h:
+        * TAO/tao/RTScheduling/RTScheduler_Loader.h:
+        * TAO/tao/RTScheduling/RTScheduler_Manager.cpp:
+        * TAO/tao/RTScheduling/RTScheduler_Manager.h:
+
+commit 9096ce55d62cafdcc3304420ec2e87b464205a71
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 11:54:08 2021 +0200
+
+    Fixed compile error
+    
+        * TAO/tao/RTScheduling/Request_Interceptor.cpp:
+
+commit 91a68ccacfc09fcf6d98aaa36f5fd4d3fa68c82f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 11:52:44 2021 +0200
+
+    Various layout changes
+    
+        * TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h:
+        * TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h:
+        * TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h:
+        * TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.h:
+        * TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h:
+        * TAO/orbsvcs/orbsvcs/AV/Flows_T.h:
+        * TAO/orbsvcs/orbsvcs/AV/MCast.h:
+        * TAO/orbsvcs/orbsvcs/AV/Policy.h:
+        * TAO/orbsvcs/orbsvcs/AV/RTCP.h:
+        * TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h:
+        * TAO/orbsvcs/orbsvcs/AV/RTP.h:
+        * TAO/orbsvcs/orbsvcs/AV/TCP.h:
+        * TAO/orbsvcs/orbsvcs/AV/Transport.h:
+        * TAO/orbsvcs/orbsvcs/AV/UDP.cpp:
+        * TAO/orbsvcs/orbsvcs/AV/UDP.h:
+        * TAO/orbsvcs/orbsvcs/AV/default_resource.h:
+        * TAO/orbsvcs/orbsvcs/AV/media_timer.h:
+        * TAO/orbsvcs/orbsvcs/AV/sfp.h:
+
+commit f56b19454dcf14fc2b53f53d4e0b55b22bbba456
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 11:43:10 2021 +0200
+
+    Corrected null check, only when it is non null
+    
+        * TAO/orbsvcs/orbsvcs/AV/Transport.cpp:
+
+commit e34b94be98ca81f5a9640b896e1cf983bb3ea768
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 11:35:23 2021 +0200
+
+    Make use of delete
+    
+        * ACE/performance-tests/TCP/tcp_test.cpp:
+        * ACE/performance-tests/UDP/udp_test.cpp:
+        * ACE/tests/Token_Strategy_Test.cpp:
+        * TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h:
+
+commit ae4bd945a234a175b54dafb1cb54678b7cc67639
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 11:34:48 2021 +0200
+
+    Removed not used auto_ptr member, use delete instead of ACE_UNIMPLEMENTED_FUNC, layout changes, fixed typos in comments
+    
+        * ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h:
+        * ACE/netsvcs/lib/Log_Message_Receiver.h:
+        * ACE/performance-tests/TCP/tcp_test.cpp:
+        * TAO/orbsvcs/Trading_Service/README:
+        * TAO/orbsvcs/Trading_Service/Trading_Server.cpp:
+        * TAO/orbsvcs/Trading_Service/Trading_Service.cpp:
+        * TAO/orbsvcs/Trading_Service/Trading_Service.h:
+        * TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp:
+        * TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Trader.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Trader_T.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h:
+        * TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp:
+        * TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h:
+        * TAO/orbsvcs/tests/Trading/Simple_Dynamic.h:
+        * TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h:
+        * TAO/tao/RTCORBA/Priority_Mapping_Manager.h:
+        * TAO/tao/RTScheduling/RTScheduler_Manager.h:
+
+commit d7c2c70f375caf8bb135d84462b9b702cf01b932
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Apr 29 11:19:09 2021 +0200
+
+    Fixed misleading indent warning
+    
+        * TAO/tao/RTScheduling/Request_Interceptor.cpp:
+
+commit 2446b519893f6bebc1da64891752c3d718d00c7d
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Tue Apr 27 12:45:22 2021 -0500
+
+    Remove Support Macro
+
+commit c733aaf4ca00fa2f380452eba76815805711e239
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Mon Apr 26 21:57:47 2021 -0500
+
+    Support C++ Keywords in DCPS_DATA_SEQUENCE_TYPE
+    
+    Made for https://github.com/objectcomputing/OpenDDS/pull/2608
+
+commit ac8caeed1f3db9239e84ccc79f5cf3a1f952a6d7
+Merge: 7f76346bc32 292114e68b4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 23 21:35:27 2021 +0200
+
+    Merge pull request #1480 from jwillemsen/jwi-minorcleanup
+    
+    Minor cleanup, layout changes, use nullptr
+
+commit 292114e68b44623de91c107d989a83fb0d183d29
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Apr 23 14:37:28 2021 +0200
+
+    Minor cleanup, layout changes, use nullptr
+    
+        * ACE/ACEXML/common/HttpCharStream.cpp:
+        * ACE/ACEXML/common/HttpCharStream.h:
+        * ACE/ACEXML/common/URL_Addr.cpp:
+        * ACE/ACEXML/common/XML_Codecs.cpp:
+        * ACE/Kokyu/Default_Dispatcher_Impl.cpp:
+        * ACE/Kokyu/Kokyu.cpp:
+        * ACE/ace/Asynch_IO.h:
+        * ACE/ace/Local_Memory_Pool.cpp:
+        * ACE/ace/Parse_Node.h:
+        * ACE/ace/Proactor.cpp:
+        * ACE/ace/Thread_Manager.cpp:
+        * ACE/tests/Priority_Reactor_Test.cpp:
+        * TAO/tao/Stub.h:
+        * TAO/tao/Stub.inl:
+
+commit 2dbe4e39da5fb319a4f85f840f49d99a9fff17f8
+Author: Timothy Simpson <simpsont@objectcomputing.com>
+Date:   Fri Apr 16 09:23:17 2021 -0500
+
+    fix wstring coerce leak in tao_idl
+
+commit 7fa0188744a75dc77e9d5ddf9626ed1a851c31e1
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date:   Wed Apr 7 23:30:22 2021 -0500
+
+    Defer Including rules.tao.GNU for gnuace
+    
+    Alternative fix for
+    https://github.com/objectcomputing/OpenDDS/pull/2559. See there for
+    details.
+    
+    https://github.com/DOCGroup/ACE_TAO/pull/1296 changed the order of
+    includes of rules make files to effectively being how the base projects
+    that set them are included. This can lead to the order of
+    `GNUACE_PROJECT_VERSION ?=` being set differently than what the case was
+    in ACE6/TAO2. The result in OpenDDS is that so library files get TAO's
+    version number.
+    
+    This tires to fix that by including `tao.rules.GNU` at a marker after
+    the `extension` marker.
+
+commit 0ac144a73290156a3916cbf04fa96cac583b7d2a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Mar 27 08:28:19 2021 +0100
+
+    Fixed warning
+
+commit df92428febdcd8225514e0f70855833bb2fb0005
+Merge: 770305187e0 e6675814c2a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 24 09:59:36 2021 +0100
+
+    Merge pull request #1460 from jwillemsen/jwi-interror
+    
+    Use bool instead of int for error variable
+
+commit e6675814c2a0667c7caba5abcecb7e1a457e207e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Mar 23 11:10:58 2021 +0100
+
+    Remove redundant void
+    
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h:
+
+commit 6e13193f8e9260d0a1dad3a7206d761439aa97b2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Mar 19 11:47:24 2021 +0100
+
+    Layout/void cleanup
+    
+        * TAO/orbsvcs/orbsvcs/Naming/Entries.h:
+        * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_PG_Group_Factory.cpp:
+        * TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h:
+        * TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h:
+        * TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h:
+        * TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h:
+        * TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.h:
+        * TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h:
+        * TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Factory.h:
+
+commit 02377257f10464b70fae5302936bfd3a69169caf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Mar 19 11:44:01 2021 +0100
+
+    Small doxygen changes and use default for copy/assignment operator
+    
+        * TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp:
+        * TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h:
+
+commit c22e1496f305f0fef210445f3e371b1c987ba318
+Merge: adc3b318495 09ae013e2b0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 14:28:53 2021 +0100
+
+    Merge pull request #1458 from jwillemsen/jwi-cleanup
+    
+    Minor cleanup
+
+commit adc3b3184957de087fb84f045a7e4ba7287e1270
+Merge: 5f9ccb42bc0 104d9f8a30c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 14:28:21 2021 +0100
+
+    Merge pull request #1457 from jwillemsen/jwi-redundantvoid
+    
+    Removed redundant void
+
+commit 5f9ccb42bc00bd6e0eee5907f5046c10ea4404eb
+Merge: 81493d4f7c8 78045a2ee2b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 14:28:05 2021 +0100
+
+    Merge pull request #1456 from jwillemsen/jwi-github
+    
+    Refer to github issues/discussions instead of the mailing lists and some bool changes
+
+commit 09ae013e2b0237107f34eef9d34695c75cf287c3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 12:03:34 2021 +0100
+
+    Cleanup
+
+commit 05ec4d3db0f7b68581bccff74b59df95ede3d819
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 11:57:23 2021 +0100
+
+    Minor cleanup
+
+commit 104d9f8a30c479fe661883b295f120ab035645d9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 10:52:29 2021 +0100
+
+    Removed redundant void
+
+commit 78045a2ee2bee3a4521af3606d671f644e409fc2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 10:41:37 2021 +0100
+
+    bool changes
+
+commit fe0a8e3c6c8bf1d10a71d1eee6a956c3560bd562
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 10:37:15 2021 +0100
+
+    bool changes
+
+commit ba2bcbfe87a34a9f401b69e2cb69fad0e12201d4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 09:29:49 2021 +0100
+
+    Update to github
+    
+        * TAO/docs/minimumTAO.html:
+        * TAO/orbsvcs/Naming_Service/README:
+
+commit c4002d0ec12ea841bfdb11eb881f1ece2e06d2e3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed Mar 17 09:09:44 2021 +0100
+
+    Refer to github issues/discussions instead of the mailing lists
+    
+        * ACE/ACE-INSTALL.html:
+        * ACE/ASNMP/README:
+        * ACE/PROBLEM-REPORT-FORM:
+        * ACE/README:
+        * ACE/VERSION.txt:
+        * ACE/ace/High_Res_Timer.cpp:
+        * ACE/docs/ACE-bug-process.html:
+        * ACE/docs/ACE-guidelines.html:
+        * ACE/docs/ACE-subsets.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/tests/README:
+        * TAO/PROBLEM-REPORT-FORM:
+        * TAO/README:
+        * TAO/TAO-INSTALL.html:
+        * TAO/VERSION.txt:
+        * TAO/docs/implrepo/paper.html:
+        * TAO/docs/rtcorba/status.html:
+        * TAO/orbsvcs/ImplRepo_Service/README:
+        * TAO/orbsvcs/tests/Property/README:
+
+commit ecba7cd70564cb56433aedb0f6e0b487178d9981
+Merge: 30b2290d728 2d22ad2099d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Mar 15 18:32:13 2021 +0100
+
+    Merge pull request #1454 from jwillemsen/master
+    
+    Prepare for next release
+
+commit 2d22ad2099d46d44fa05778313a8d4c9c4a4eba3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Mar 15 18:31:41 2021 +0100
+
+    Prepare for next release
+    
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit 43d78f7c66c6724ec9e4dcf9710641a26d4ce568
+Author: Johnny Willemsen <johnny@jwillemsen.nl>
+Date:   Mon Mar 15 11:29:37 2021 +0100
+
+    Revert "Add include of OS_NS_string.h, seems it was pulled in implicitly in t…"
+
+commit 4d3608a999123643afdd58c81c1dc22af8074146
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Mar 15 10:37:02 2021 +0100
+
+    Add include of OS_NS_string.h, seems it was pulled in implicitly in the past
+    
+        * TAO/tao/Unbounded_Octet_Sequence_T.h:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index baab8ceb3db..efdb3be5b85 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.1
-    ACE VERSION: 7.0.1
+    TAO VERSION: 3.0.2
+    ACE VERSION: 7.0.2
 
     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 81d954c540d..bd2ef818c31 100644
--- a/TAO/VERSION.txt
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 3.0.1, released Mon Mar 15 09:03:24 CET 2021
+This is TAO version 3.0.2, released Fri May 14 11:33:28 CEST 2021
 
 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 7b2b50ad5b6..4cf1f0e1f8c 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 1
-#define TAO_VERSION "3.0.1"
-#define TAO_VERSION_CODE 196609
+#define TAO_MICRO_VERSION 2
+#define TAO_VERSION "3.0.2"
+#define TAO_VERSION_CODE 0x30002
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))