ACE+TAO-7_0_8ACE+TAO-7_0_8

10 files changed, 307 insertions, 44 deletions

diff --git a/ACE/ChangeLogs/ACE-7_0_8 b/ACE/ChangeLogs/ACE-7_0_8
new file mode 100644
index 00000000000..199225b7900
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-7_0_8
@@ -0,0 +1,84 @@
+commit 5fd5dddae69d99c336e41bdd3dd7137e79b4f83b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 28 09:31:45 2022 +0200
+
+    Minor updates, link to github for notifications and commercial support options
+    
+        * ACE/docs/Download.html:
+
+commit 842114c404a60bc1fa8fd867a506d85ae0c17f43
+Merge: 6c1476eef08 94d132b1738
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Jun 25 06:49:08 2022 +0200
+
+    Merge branch 'master' into no_ifdef_anyops_ns
+
+commit 94d132b173807bb55f8c7481a57a523b4f07ba7e
+Merge: 0fd01e75a0b 9fd4f2bd77d
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jun 24 15:13:50 2022 -0600
+
+    Merge pull request #1864 from mitza-oci/g++12
+    
+    GCC 12
+
+commit 6c1476eef08213a05f0b2b9b4746d4ff7beda437
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jun 24 15:55:21 2022 -0500
+
+    Removed ACE_ANY_OPS_USE_NAMESPACE as a compile-time option
+
+commit 5e9d29efdf8e1654cd19e37edba34c0460521aaf
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jun 24 10:48:37 2022 -0500
+
+    try building on macOS without ACE_ANY_OPS_USE_NAMESPACE
+
+commit f2fe7927b6894ab38af79cf3c9be760448cf5ee9
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jun 23 22:51:20 2022 -0500
+
+    -fdelayed-template-parsing workaround for clang no longer needed
+
+commit 2a37e231fb737e52ac2a7028f7cc1afae3fcc6a4
+Author: chaof <fan-chao@users.noreply.github.com>
+Date:   Wed Jun 22 15:53:26 2022 +0800
+
+    Update Service_Gestalt.cpp
+    
+    Fix compiling error resulted from misspelling word std::unique_ptr.
+
+commit e1f7c3ba17c4f57cc3c624285f7009f4d5145cca
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 14 08:40:39 2022 +0200
+
+    Removed redundant void
+    
+        * ACE/ace/NT_Service.h:
+        * TAO/tests/MT_Server/test_i.h:
+
+commit ef9ea413c1a7b869969f175be943cb56cc3ca0ce
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat May 21 08:59:07 2022 +0200
+
+    Update Download.html
+
+commit 5abccb83ac1da6be99e28832fde74b835b45ebbc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat May 21 08:42:13 2022 +0200
+
+    Updated for x.0.7 release
+    
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
+
+commit 116c58f63888c84be7ae30173eaedc5647f22740
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat May 21 08:38:55 2022 +0200
+
+    Updated versions
+    
+        * ACE/docs/bczar/bczar.html:
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index 8bc1fb7795c..144fce9cf6b 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.7
+    ACE VERSION: 7.0.8
 
     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 3856145e3f2..2d034f23eaa 100644
--- a/ACE/VERSION.txt
+++ b/ACE/VERSION.txt
@@ -1,4 +1,4 @@
-This is ACE version 7.0.7, released Sat May 21 08:35:00 CEST 2022
+This is ACE version 7.0.8, released Fri Jul 01 09:15:13 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 256aa6a6836..627111d5027 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 7
-#define ACE_VERSION "7.0.7"
-#define ACE_VERSION_CODE 0x70007
+#define ACE_MICRO_VERSION 8
+#define ACE_VERSION "7.0.8"
+#define ACE_VERSION_CODE 0x70008
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/ACE/debian/control b/ACE/debian/control
index d569ba6a852..d411899194d 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.7
+Package: libace-7.0.8
 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.7 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-7.0.8 (= ${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.7
+Package: libace-ssl-7.0.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-7.0.8 (= ${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.7
+Package: libace-rmcast-7.0.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-7.0.8 (= ${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.7
+Package: libace-tmcast-7.0.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-7.0.8 (= ${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.7
+Package: libace-htbp-7.0.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-7.0.8 (= ${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.7
+Package: libace-inet-7.0.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-7.0.8 (= ${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.7
+Package: libace-inet-ssl-7.0.8
 Architecture: any
 Section: libs
-Depends: libace-inet-7.0.7, libace-ssl-7.0.7, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-7.0.8, libace-ssl-7.0.8, ${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.7 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-7.0.8 (= ${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.7
+Package: libacexml-7.0.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-7.0.8 (= ${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.7
+Package: libace-xml-utils-7.0.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-7.0.8 (= ${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.7
+Package: libkokyu-7.0.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-7.0.8 (= ${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.7
+Package: libace-xtreactor-7.0.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-7.0.8 (= ${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.7
+Package: libace-tkreactor-7.0.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-7.0.8 (= ${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.7
+Package: libace-flreactor-7.0.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.3-dev, ${misc:Depends}
+Depends: libace-flreactor-7.0.8 (= ${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.7
+Package: libace-foxreactor-7.0.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-7.0.8 (= ${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.7
+Package: libnetsvcs-7.0.8
 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.7 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-7.0.8 (= ${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 cafb8eaaf4a..3e5a7e4fe5d 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.7
-%define TAOVER  3.0.7
+%define ACEVER  7.0.8
+%define TAOVER  3.0.8
 
 # Conditional build
 # Default values are
diff --git a/TAO/ChangeLogs/TAO-3_0_8 b/TAO/ChangeLogs/TAO-3_0_8
new file mode 100644
index 00000000000..13130876300
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-3_0_8
@@ -0,0 +1,179 @@
+commit b4822ca137fe6622bbe7d2e3a48737a7d4bec21a
+Merge: 6f45d133c86 01865991423
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Tue Jun 28 08:47:31 2022 -0600
+
+    Merge pull request #1868 from mitza-oci/seq-codegen-any
+    
+    Updated sequence Any operators code generation
+
+commit 01865991423cf451a7a689198f54e2715e01f241
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jun 27 14:42:19 2022 -0500
+
+    Updated .gitignore
+
+commit ccaccc38fc368183e8ac3caff85c85643b95c30b
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jun 27 14:40:32 2022 -0500
+
+    updated namespaces based on review comment
+
+commit 00322cece3e96c695fc20a3fe38be2cbec9682cf
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jun 27 21:32:36 2022 +0200
+
+    Use default/nullptr
+        * TAO/tao/AnyTypeCode/Any.cpp:
+        * TAO/tao/AnyTypeCode/Any.h:
+
+commit 9cb860c2773e35781196fb3fc42d7dbbaeb1a09d
+Merge: 7089ca0a2ca dbc6154a1b9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jun 27 21:28:27 2022 +0200
+
+    Merge branch 'master' into jwi-addressofany
+
+commit 7089ca0a2cacc8f0c00eca0f4228bcbff35cb12c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon Jun 27 21:28:14 2022 +0200
+
+    Make use of addressof/const
+    
+        * TAO/tao/AnyTypeCode/Any.cpp:
+
+commit 13c6769e5ec7caaea332e7f4d5af14f350c41255
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jun 27 13:23:05 2022 -0500
+
+    fixed whitespace for CodeFactor check
+
+commit 1dcb876984270da8634b6ef95da1a3be2660a5ad
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jun 27 11:54:17 2022 -0500
+
+    Updated sequence Any operators code generation
+    
+    - Fixed the alternate mapping (std::vector)
+    - Use leading :: to avoid naming collision with CORBA namespace
+
+commit da57b9d4b194ccad355e2a7b0b252d32bfdfd2bc
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Mon Jun 27 09:54:47 2022 -0500
+
+    Updated NEWS
+
+commit 6c1476eef08213a05f0b2b9b4746d4ff7beda437
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jun 24 15:55:21 2022 -0500
+
+    Removed ACE_ANY_OPS_USE_NAMESPACE as a compile-time option
+
+commit 9fd4f2bd77dd3d54995068f20e711fb3737ef711
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Fri Jun 24 13:45:32 2022 -0500
+
+    Updated NEWS
+
+commit ae3ff95027b1845e284c9869737d94c54e3ed38c
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jun 23 21:30:05 2022 -0500
+
+    struct anyops: use fully-qualified scope
+
+commit 2c2be5bf757c0d167a38045fdeb598af8d750ac6
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jun 23 18:53:17 2022 -0500
+
+    moved operator<<= and >>= for CORBA::Any into namespace CORBA
+
+commit 8ab5b907ce4f15c1daf3ce69cb1e07fe43868a4c
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jun 16 17:01:17 2022 -0500
+
+    fixed whitespace
+
+commit 8a7e22701d1150bbaef3dd3b213693744b18d7c2
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jun 16 16:57:00 2022 -0500
+
+    Corrected versioned_namespace usage in mpc file
+
+commit ff4b2b64fd8889033117dea0ea75a0d7d00e57a1
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jun 16 15:54:44 2022 -0500
+
+    TAO_IDL -Wb,versioning options do not depend on ACE_HAS_VERSIONED_NAMESPACE
+
+commit 5fe812b68381b582a63a8a8b761b85776e087c45
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Thu Jun 16 15:17:03 2022 -0500
+
+    TAO_IDL: improve versioned namespace and valuetype support
+    
+    - made versioned namespaces more general
+    - valuetype's traits need to be in TAO's namespace
+    - allow valuetypes with -Scdr
+
+commit cd015ed2ea0f03e51732c7d0213476da4023aeab
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date:   Wed Jun 15 17:10:44 2022 -0500
+
+    Test tao_idl-generated code with versioned namespaces
+    
+    TAO::Value_Traits is generated in the wrong namespace
+
+commit 21cb902c2e5c8296d36e0eb8d6c251b85a046dcb
+Merge: ee4008d6869 e1f7c3ba17c
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 14 09:26:11 2022 +0200
+
+    Merge pull request #1854 from jwillemsen/jwi-redundantvoid2
+    
+    Removed redundant void
+
+commit e1f7c3ba17c4f57cc3c624285f7009f4d5145cca
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 14 08:40:39 2022 +0200
+
+    Removed redundant void
+    
+        * ACE/ace/NT_Service.h:
+        * TAO/tests/MT_Server/test_i.h:
+
+commit 57cb0af875c71d8b24552c179d94fe83bd20007d
+Merge: 3703b49316d 44292a1fbae
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 7 12:40:16 2022 +0200
+
+    Merge pull request #1850 from jwillemsen/jwi-messagingglobalscope
+    
+    Use global scope for Messaging to fix problems when using an own Mess…
+
+commit 44292a1fbae067464ab2866b4c97d90701e0f324
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 7 09:39:44 2022 +0200
+
+    Use global scope for Messaging to fix problems when using an own Messaging namespace in a different scope
+    
+        * TAO/tao/PI_Server/ServerRequestInfo.h:
+
+commit ef76fa29be7a5dda6319f27eb0eb39a5018f88d2
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jun 3 10:45:39 2022 +0200
+
+    Use override to fix Embarcadero C++ Builder 11.1 warnings
+    
+        * TAO/orbsvcs/tests/Security/Big_Request/TX_Object_i.h:
+
+commit 5abccb83ac1da6be99e28832fde74b835b45ebbc
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat May 21 08:42:13 2022 +0200
+
+    Updated for x.0.7 release
+    
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index 5a4f4f34f7c..f43f96f6aca 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.7
-    ACE VERSION: 7.0.7
+    TAO VERSION: 3.0.8
+    ACE VERSION: 7.0.8
 
     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 e42d1388bda..a4be5366a0a 100644
--- a/TAO/VERSION.txt
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 3.0.7, released Sat May 21 08:35:00 CEST 2022
+This is TAO version 3.0.8, released Fri Jul 01 09:15:13 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 19023d6a5b1..cfcf95de6b8 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 7
-#define TAO_VERSION "3.0.7"
-#define TAO_VERSION_CODE 0x30007
+#define TAO_MICRO_VERSION 8
+#define TAO_VERSION "3.0.8"
+#define TAO_VERSION_CODE 0x30008
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))