ACE+TAO-6_5_0Latest_MinorACE+TAO-6_5_0Latest_Minor

60 files changed, 477 insertions, 78 deletions

diff --git a/ACE/ChangeLogs/ACE-6_5_0 b/ACE/ChangeLogs/ACE-6_5_0
new file mode 100644
index 00000000000..dd7a5f32c4d
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_0
@@ -0,0 +1,96 @@
+commit 5837bc6cf7b1e2b1b71ce318e2748fa37c3d516a
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue Jun 5 08:57:02 2018 +0200
+
+    Added starter files for MacOSX Mojave
+    
+        * ACE/ace/config-macosx-mojave.h:
+        * ACE/include/makeinclude/platform_macosx_mojave.GNU:
+          Added.
+    
+        * ACE/ace/config-macosx.h:
+        * ACE/include/makeinclude/platform_macosx.GNU:
+
+commit 19536a1a9f180bce5160cfa4c0f3dc22410af6c3
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu May 31 14:39:51 2018 +0200
+
+    Removed invalid supp
+    
+        * ACE/bin/valgrind.supp:
+
+commit 51d87f3608962ffe1fb12e7a1de31e4c9fa7d729
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed May 30 11:51:07 2018 +0200
+
+    Next release will be minor
+    
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit 8df6cf5df25f1de0a9a329ed44bc802d0ebf987f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri May 18 16:35:09 2018 +0200
+
+    Updated suppresion
+        * ACE/bin/valgrind.supp:
+
+commit 5f92d94e30389d3f4bf595ae4d270fb5ef8fbde4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri May 18 16:03:34 2018 +0200
+
+    Add valgrind suppression
+    
+        * ACE/bin/valgrind.supp:
+
+commit 98b95510000b4da8460034b8936422e98527740f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed May 16 18:27:21 2018 +0200
+
+    List std::unique_ptr usage
+
+commit 4c6e6ee3e74a866a345e0cb056b549815fcda121
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed May 16 16:18:24 2018 +0200
+
+    Make use of std::unique_ptr when C++11 is used
+    
+        * ACE/ace/XML_Utils/XML_Helper.h:
+        * ACE/ace/XML_Utils/XSCRT/Elements.hpp:
+
+commit ae77ea225ceb7eb17a8a4a0caaacdb9217bcfef7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 17:13:20 2018 +0200
+
+    Use std::unique_ptr when we have C++11
+    
+        * ACE/ace/Thread_Manager.cpp:
+
+commit 22018c88a84afaad35045c52d74a212092a763f7
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 17:12:12 2018 +0200
+
+    Use std::unique_ptr when we have C++11
+    
+        * ACE/ace/Proactor.cpp:
+
+commit 0de4dc18e8809c9c0d47ae810ae6d5d087dab087
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 17:10:48 2018 +0200
+
+    Make use of std::unique_ptr when we have C++11
+    
+        * ACE/ace/OS_NS_Thread.cpp:
+
+commit c560110d8f3206a7866866cff325489eb2ea88db
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon May 14 16:27:08 2018 +0200
+
+    ACE+TAO x.4.8 release
+    
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index bbf88da1c65..b7b201936c2 100644
--- a/ACE/PROBLEM-REPORT-FORM
+++ b/ACE/PROBLEM-REPORT-FORM
@@ -40,7 +40,7 @@
 To: ace-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    ACE VERSION: 6.4.8
+    ACE VERSION: 6.5.0
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/ACE/VERSION b/ACE/VERSION
index 22ff78d4608..75a0a3c0df2 100644
--- a/ACE/VERSION
+++ b/ACE/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 6.4.8, released Mon May 14 16:19:00 CEST 2018
+This is ACE version 6.5.0, released Tue Jun 12 08:27:49 CEST 2018
 
 If you have any problems with or questions about ACE, please send
 e-mail to the ACE mailing list (ace-bugs@list.isis.vanderbilt.edu),
diff --git a/ACE/ace/Version.h b/ACE/ace/Version.h
index ad57900f4e9..5e0d58ccd2f 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -3,10 +3,10 @@
 // This is file was automatically generated by $ACE_ROOT/bin/make_release.py
 
 #define ACE_MAJOR_VERSION 6
-#define ACE_MINOR_VERSION 4
-#define ACE_MICRO_VERSION 8
-#define ACE_BETA_VERSION 8
-#define ACE_VERSION "6.4.8"
-#define ACE_VERSION_CODE 394248
+#define ACE_MINOR_VERSION 5
+#define ACE_MICRO_VERSION 0
+#define ACE_BETA_VERSION 0
+#define ACE_VERSION "6.5.0"
+#define ACE_VERSION_CODE 394496
 #define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
 
diff --git a/ACE/debian/control b/ACE/debian/control
index 8917062faa8..cd8bb3361d2 100644
--- a/ACE/debian/control
+++ b/ACE/debian/control
@@ -27,7 +27,7 @@ Description: makefile, project, and workspace creator
   * mpc-ace: generates project files for a single target
   * mwc-ace: generates workspace files for a set of projects
 
-Package: libace-6.4.8
+Package: libace-6.5.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -45,7 +45,7 @@ Description: C++ network programming framework
 Package: libace-dev
 Architecture: any
 Section: libdevel
-Depends: libace-6.4.8 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.0 (= ${binary:Version}), ${misc:Depends}
 Suggests: libace-doc, pkg-config
 Replaces: mpc-ace (<< 5.6.3-4)
 Description: C++ network programming framework - development files
@@ -62,7 +62,7 @@ Description: C++ network programming framework - documentation
  This package contains the ACE overview documentation, tutorials,
  examples, and information regarding upstream development.
 
-Package: libace-ssl-6.4.8
+Package: libace-ssl-6.5.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -73,12 +73,12 @@ Description: ACE secure socket layer library
 Package: libace-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-ssl-6.4.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
 Description: ACE secure socket layer library - development files
  This package contains the header files and static library for the ACE
  SSL library.
 
-Package: libace-rmcast-6.4.8
+Package: libace-rmcast-6.5.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -92,12 +92,12 @@ Description: ACE reliable multicast library
 Package: libace-rmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-rmcast-6.4.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE reliable multicast library - development files
  This package contains the header files and static library for the ACE
  reliable multicast library.
 
-Package: libace-tmcast-6.4.8
+Package: libace-tmcast-6.5.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -111,12 +111,12 @@ Description: ACE transactional multicast library
 Package: libace-tmcast-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tmcast-6.4.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE transactional multicast library - development files
  This package contains the header files and static library for the ACE
  transactional multicast library.
 
-Package: libace-htbp-6.4.8
+Package: libace-htbp-6.5.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -130,12 +130,12 @@ Description: ACE protocol over HTTP tunneling library
 Package: libace-htbp-dev
 Architecture: any
 Section: libdevel
-Depends: libace-htbp-6.4.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE protocol over HTTP tunneling library - development files
  This package contains the header files and static library for the ACE
  HTBP library.
 
-Package: libace-inet-6.4.8
+Package: libace-inet-6.5.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -146,15 +146,15 @@ Description: ACE Inet protocol library
 Package: libace-inet-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-6.4.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE Inet protocol library - development files
  This package contains the header files and static library for the ACE
  Inet protocol library.
 
-Package: libace-inet-ssl-6.4.8
+Package: libace-inet-ssl-6.5.0
 Architecture: any
 Section: libs
-Depends: libace-inet-6.4.8, libace-ssl-6.4.8, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.0, libace-ssl-6.5.0, ${shlibs:Depends}, ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library
  This package provides an ACE addon library for clients (and possibly
  servers at some point) using Inet protocols which support SSL, such as
@@ -163,7 +163,7 @@ Description: ACE SSL-enabled Inet protocol library
 Package: libace-inet-ssl-dev
 Architecture: any
 Section: libdevel
-Depends: libace-inet-ssl-6.4.8 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.0 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SSL-enabled Inet protocol library - development files
  This package contains the header files and static library for the ACE
  SSL-enabled Inet protocol library.
@@ -180,7 +180,7 @@ Description: ACE perfect hash function generator
  basically the same options and functionality. ace_gperf simply takes
  advantage of some of the features provided by the ACE library.
 
-Package: libacexml-6.4.8
+Package: libacexml-6.5.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -196,12 +196,12 @@ Package: libacexml-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libacexml-6.4.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE SAX based XML parsing library - development files
  This package contains the header files and static library for the ACE
  XML parsing library.
 
-Package: libace-xml-utils-6.4.8
+Package: libace-xml-utils-6.5.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -215,12 +215,12 @@ Package: libace-xml-utils-dev
 Architecture: any
 Section: libdevel
 Replaces: libace-dev (<< 5.7.7-4)
-Depends: libace-xml-utils-6.4.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
 Description: ACE XML utility classes and methods - development files
  This package contains the header files and static library for the ACE XML
  Utils library
 
-Package: libkokyu-6.4.8
+Package: libkokyu-6.5.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -234,12 +234,12 @@ Description: ACE scheduling and dispatching library
 Package: libkokyu-dev
 Architecture: any
 Section: libdevel
-Depends: libkokyu-6.4.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
 Description: ACE scheduling and dispatching library - development files
  This package contains the header files and static library for the ACE
  scheduling and dispatching library.
 
-Package: libace-xtreactor-6.4.8
+Package: libace-xtreactor-6.5.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -257,12 +257,12 @@ Description: ACE-GUI reactor integration for Xt
 Package: libace-xtreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-xtreactor-6.4.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
 Description: ACE-GUI reactor integration for Xt - development files
  This package contains header files and static library for the ACE-Xt
  reactor integration.
 
-Package: libace-tkreactor-6.4.8
+Package: libace-tkreactor-6.5.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -281,12 +281,12 @@ Description: ACE-GUI reactor integration for Tk
 Package: libace-tkreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-tkreactor-6.4.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
 Description: ACE-GUI reactor integration for Tk - development files
  This package contains header files and static library for the ACE-Tk
  reactor integration.
 
-Package: libace-flreactor-6.4.8
+Package: libace-flreactor-6.5.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -304,12 +304,12 @@ Description: ACE-GUI reactor integration for FLTK
 Package: libace-flreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-flreactor-6.4.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
 Description: ACE-GUI reactor integration for FLTK - development files
  This package contains header files and static library for the ACE-FLTK
  reactor integration.
 
-Package: libace-foxreactor-6.4.8
+Package: libace-foxreactor-6.5.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -326,7 +326,7 @@ Description: ACE-GUI reactor integration for FOX
 Package: libace-foxreactor-dev
 Architecture: any
 Section: libdevel
-Depends: libace-foxreactor-6.4.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.0 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
 Description: ACE-GUI reactor integration for FOX - development files
  This package contains header files and static library for the ACE-FOX
  reactor integration.
@@ -343,7 +343,7 @@ Description: ACE network service implementations
  files to link the various ACE network services together, either
  statically or dynamically, and form complete server programs.
 
-Package: libnetsvcs-6.4.8
+Package: libnetsvcs-6.5.0
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -357,7 +357,7 @@ Description: ACE network service implementations - libraries
 Package: libnetsvcs-dev
 Architecture: any
 Section: libdevel
-Depends: libnetsvcs-6.4.8 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.0 (= ${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/debian/libace-6.4.8.lintian-overrides b/ACE/debian/libace-6.4.8.lintian-overrides
deleted file mode 100644
index 53d463177f5..00000000000
--- a/ACE/debian/libace-6.4.8.lintian-overrides
+++ /dev/null
@@ -1,6 +0,0 @@
-libace-6.4.8: no-symbols-control-file usr/lib/libACE-6.4.8.so
-libace-6.4.8: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.4.8.so
-libace-6.4.8: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.4.8.so
-libace-6.4.8: no-symbols-control-file usr/lib/libACE_ETCL-6.4.8.so
-libace-6.4.8: no-symbols-control-file usr/lib/libACE_RLECompression-6.4.8.so
-libace-6.4.8: no-symbols-control-file usr/lib/libACE_Compression-6.4.8.so
diff --git a/ACE/debian/libace-6.4.8.docs b/ACE/debian/libace-6.5.0.docs
index 3bdab5b0089..3bdab5b0089 100644
--- a/ACE/debian/libace-6.4.8.docs
+++ b/ACE/debian/libace-6.5.0.docs
diff --git a/ACE/debian/libace-6.4.8.install b/ACE/debian/libace-6.5.0.install
index 182a5eda411..182a5eda411 100644
--- a/ACE/debian/libace-6.4.8.install
+++ b/ACE/debian/libace-6.5.0.install
diff --git a/ACE/debian/libace-6.5.0.lintian-overrides b/ACE/debian/libace-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..304cd5f2a0f
--- /dev/null
+++ b/ACE/debian/libace-6.5.0.lintian-overrides
@@ -0,0 +1,6 @@
+libace-6.5.0: no-symbols-control-file usr/lib/libACE-6.5.0.so
+libace-6.5.0: no-symbols-control-file usr/lib/libACE_ETCL_Parser-6.5.0.so
+libace-6.5.0: no-symbols-control-file usr/lib/libACE_Monitor_Control-6.5.0.so
+libace-6.5.0: no-symbols-control-file usr/lib/libACE_ETCL-6.5.0.so
+libace-6.5.0: no-symbols-control-file usr/lib/libACE_RLECompression-6.5.0.so
+libace-6.5.0: no-symbols-control-file usr/lib/libACE_Compression-6.5.0.so
diff --git a/ACE/debian/libace-flreactor-6.4.8.lintian-overrides b/ACE/debian/libace-flreactor-6.4.8.lintian-overrides
deleted file mode 100644
index a3c729a3ee9..00000000000
--- a/ACE/debian/libace-flreactor-6.4.8.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-flreactor-6.4.8: no-symbols-control-file usr/lib/libACE_FlReactor-6.4.8.so
diff --git a/ACE/debian/libace-flreactor-6.4.8.install b/ACE/debian/libace-flreactor-6.5.0.install
index 528836aacee..528836aacee 100644
--- a/ACE/debian/libace-flreactor-6.4.8.install
+++ b/ACE/debian/libace-flreactor-6.5.0.install
diff --git a/ACE/debian/libace-flreactor-6.5.0.lintian-overrides b/ACE/debian/libace-flreactor-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..fbe6d8c8d6f
--- /dev/null
+++ b/ACE/debian/libace-flreactor-6.5.0.lintian-overrides
@@ -0,0 +1 @@
+libace-flreactor-6.5.0: no-symbols-control-file usr/lib/libACE_FlReactor-6.5.0.so
diff --git a/ACE/debian/libace-foxreactor-6.4.8.lintian-overrides b/ACE/debian/libace-foxreactor-6.4.8.lintian-overrides
deleted file mode 100644
index d2fe44583b4..00000000000
--- a/ACE/debian/libace-foxreactor-6.4.8.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-foxreactor-6.4.8: no-symbols-control-file usr/lib/libACE_FoxReactor-6.4.8.so
diff --git a/ACE/debian/libace-foxreactor-6.4.8.install b/ACE/debian/libace-foxreactor-6.5.0.install
index e360f29f5af..e360f29f5af 100644
--- a/ACE/debian/libace-foxreactor-6.4.8.install
+++ b/ACE/debian/libace-foxreactor-6.5.0.install
diff --git a/ACE/debian/libace-foxreactor-6.5.0.lintian-overrides b/ACE/debian/libace-foxreactor-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..21b2dcf6093
--- /dev/null
+++ b/ACE/debian/libace-foxreactor-6.5.0.lintian-overrides
@@ -0,0 +1 @@
+libace-foxreactor-6.5.0: no-symbols-control-file usr/lib/libACE_FoxReactor-6.5.0.so
diff --git a/ACE/debian/libace-htbp-6.4.8.lintian-overrides b/ACE/debian/libace-htbp-6.4.8.lintian-overrides
deleted file mode 100644
index 76fa305446a..00000000000
--- a/ACE/debian/libace-htbp-6.4.8.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-htbp-6.4.8: no-symbols-control-file usr/lib/libACE_HTBP-6.4.8.so
diff --git a/ACE/debian/libace-htbp-6.4.8.install b/ACE/debian/libace-htbp-6.5.0.install
index 08103fd5cad..08103fd5cad 100644
--- a/ACE/debian/libace-htbp-6.4.8.install
+++ b/ACE/debian/libace-htbp-6.5.0.install
diff --git a/ACE/debian/libace-htbp-6.5.0.lintian-overrides b/ACE/debian/libace-htbp-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..f70a4e5096b
--- /dev/null
+++ b/ACE/debian/libace-htbp-6.5.0.lintian-overrides
@@ -0,0 +1 @@
+libace-htbp-6.5.0: no-symbols-control-file usr/lib/libACE_HTBP-6.5.0.so
diff --git a/ACE/debian/libace-inet-6.4.8.lintian-overrides b/ACE/debian/libace-inet-6.4.8.lintian-overrides
deleted file mode 100644
index e283614c75a..00000000000
--- a/ACE/debian/libace-inet-6.4.8.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libace-inet-6.4.8: extended-description-is-probably-too-short
-libace-inet-6.4.8: no-symbols-control-file usr/lib/libACE_INet-6.4.8.so
diff --git a/ACE/debian/libace-inet-6.4.8.install b/ACE/debian/libace-inet-6.5.0.install
index 59a73a509d0..59a73a509d0 100644
--- a/ACE/debian/libace-inet-6.4.8.install
+++ b/ACE/debian/libace-inet-6.5.0.install
diff --git a/ACE/debian/libace-inet-6.5.0.lintian-overrides b/ACE/debian/libace-inet-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..c1d53191e88
--- /dev/null
+++ b/ACE/debian/libace-inet-6.5.0.lintian-overrides
@@ -0,0 +1,2 @@
+libace-inet-6.5.0: extended-description-is-probably-too-short
+libace-inet-6.5.0: no-symbols-control-file usr/lib/libACE_INet-6.5.0.so
diff --git a/ACE/debian/libace-inet-ssl-6.4.8.lintian-overrides b/ACE/debian/libace-inet-ssl-6.4.8.lintian-overrides
deleted file mode 100644
index 34ed979d546..00000000000
--- a/ACE/debian/libace-inet-ssl-6.4.8.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-libace-inet-ssl-6.4.8: no-symbols-control-file usr/lib/libACE_INet_SSL-6.4.8.so
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-inet-ssl-6.4.8: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-inet-ssl-6.4.8.install b/ACE/debian/libace-inet-ssl-6.5.0.install
index b9b8b9045f7..b9b8b9045f7 100644
--- a/ACE/debian/libace-inet-ssl-6.4.8.install
+++ b/ACE/debian/libace-inet-ssl-6.5.0.install
diff --git a/ACE/debian/libace-inet-ssl-6.5.0.lintian-overrides b/ACE/debian/libace-inet-ssl-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..7b64def9a35
--- /dev/null
+++ b/ACE/debian/libace-inet-ssl-6.5.0.lintian-overrides
@@ -0,0 +1,4 @@
+libace-inet-ssl-6.5.0: no-symbols-control-file usr/lib/libACE_INet_SSL-6.5.0.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-inet-ssl-6.5.0: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-rmcast-6.4.8.lintian-overrides b/ACE/debian/libace-rmcast-6.4.8.lintian-overrides
deleted file mode 100644
index f4dd3f6552c..00000000000
--- a/ACE/debian/libace-rmcast-6.4.8.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-rmcast-6.4.8: no-symbols-control-file usr/lib/libACE_RMCast-6.4.8.so
diff --git a/ACE/debian/libace-rmcast-6.4.8.install b/ACE/debian/libace-rmcast-6.5.0.install
index 86e78259853..86e78259853 100644
--- a/ACE/debian/libace-rmcast-6.4.8.install
+++ b/ACE/debian/libace-rmcast-6.5.0.install
diff --git a/ACE/debian/libace-rmcast-6.5.0.lintian-overrides b/ACE/debian/libace-rmcast-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..75b12caae6c
--- /dev/null
+++ b/ACE/debian/libace-rmcast-6.5.0.lintian-overrides
@@ -0,0 +1 @@
+libace-rmcast-6.5.0: no-symbols-control-file usr/lib/libACE_RMCast-6.5.0.so
diff --git a/ACE/debian/libace-ssl-6.4.8.lintian-overrides b/ACE/debian/libace-ssl-6.4.8.lintian-overrides
deleted file mode 100644
index 32109418d73..00000000000
--- a/ACE/debian/libace-ssl-6.4.8.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-libace-ssl-6.4.8: extended-description-is-probably-too-short
-libace-ssl-6.4.8: no-symbols-control-file usr/lib/libACE_SSL-6.4.8.so
-
-# It's Bison-generate code covered by the GNU Bison GPL-exception
-libace-ssl-6.4.8: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-ssl-6.4.8.NEWS b/ACE/debian/libace-ssl-6.5.0.NEWS
index e5bd0e4aa10..e5bd0e4aa10 100644
--- a/ACE/debian/libace-ssl-6.4.8.NEWS
+++ b/ACE/debian/libace-ssl-6.5.0.NEWS
diff --git a/ACE/debian/libace-ssl-6.4.8.install b/ACE/debian/libace-ssl-6.5.0.install
index 8df45a6d55f..8df45a6d55f 100644
--- a/ACE/debian/libace-ssl-6.4.8.install
+++ b/ACE/debian/libace-ssl-6.5.0.install
diff --git a/ACE/debian/libace-ssl-6.5.0.lintian-overrides b/ACE/debian/libace-ssl-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..4535ada60ef
--- /dev/null
+++ b/ACE/debian/libace-ssl-6.5.0.lintian-overrides
@@ -0,0 +1,5 @@
+libace-ssl-6.5.0: extended-description-is-probably-too-short
+libace-ssl-6.5.0: no-symbols-control-file usr/lib/libACE_SSL-6.5.0.so
+
+# It's Bison-generate code covered by the GNU Bison GPL-exception
+libace-ssl-6.5.0: possible-gpl-code-linked-with-openssl
diff --git a/ACE/debian/libace-tkreactor-6.4.8.lintian-overrides b/ACE/debian/libace-tkreactor-6.4.8.lintian-overrides
deleted file mode 100644
index 38ee64ea180..00000000000
--- a/ACE/debian/libace-tkreactor-6.4.8.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tkreactor-6.4.8: no-symbols-control-file usr/lib/libACE_TkReactor-6.4.8.so
diff --git a/ACE/debian/libace-tkreactor-6.4.8.install b/ACE/debian/libace-tkreactor-6.5.0.install
index 12ab35062d2..12ab35062d2 100644
--- a/ACE/debian/libace-tkreactor-6.4.8.install
+++ b/ACE/debian/libace-tkreactor-6.5.0.install
diff --git a/ACE/debian/libace-tkreactor-6.5.0.lintian-overrides b/ACE/debian/libace-tkreactor-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..ed3936e9c39
--- /dev/null
+++ b/ACE/debian/libace-tkreactor-6.5.0.lintian-overrides
@@ -0,0 +1 @@
+libace-tkreactor-6.5.0: no-symbols-control-file usr/lib/libACE_TkReactor-6.5.0.so
diff --git a/ACE/debian/libace-tmcast-6.4.8.lintian-overrides b/ACE/debian/libace-tmcast-6.4.8.lintian-overrides
deleted file mode 100644
index baab78beaa8..00000000000
--- a/ACE/debian/libace-tmcast-6.4.8.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-tmcast-6.4.8: no-symbols-control-file usr/lib/libACE_TMCast-6.4.8.so
diff --git a/ACE/debian/libace-tmcast-6.4.8.install b/ACE/debian/libace-tmcast-6.5.0.install
index e066131dea0..e066131dea0 100644
--- a/ACE/debian/libace-tmcast-6.4.8.install
+++ b/ACE/debian/libace-tmcast-6.5.0.install
diff --git a/ACE/debian/libace-tmcast-6.5.0.lintian-overrides b/ACE/debian/libace-tmcast-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..2f2a5f4f23d
--- /dev/null
+++ b/ACE/debian/libace-tmcast-6.5.0.lintian-overrides
@@ -0,0 +1 @@
+libace-tmcast-6.5.0: no-symbols-control-file usr/lib/libACE_TMCast-6.5.0.so
diff --git a/ACE/debian/libace-xml-utils-6.4.8.lintian-overrides b/ACE/debian/libace-xml-utils-6.4.8.lintian-overrides
deleted file mode 100644
index 7d3811a9a39..00000000000
--- a/ACE/debian/libace-xml-utils-6.4.8.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xml-utils-6.4.8: no-symbols-control-file usr/lib/libACE_XML_Utils-6.4.8.so
diff --git a/ACE/debian/libace-xml-utils-6.4.8.install b/ACE/debian/libace-xml-utils-6.5.0.install
index 2428ec9f109..2428ec9f109 100644
--- a/ACE/debian/libace-xml-utils-6.4.8.install
+++ b/ACE/debian/libace-xml-utils-6.5.0.install
diff --git a/ACE/debian/libace-xml-utils-6.5.0.lintian-overrides b/ACE/debian/libace-xml-utils-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..f75a280799a
--- /dev/null
+++ b/ACE/debian/libace-xml-utils-6.5.0.lintian-overrides
@@ -0,0 +1 @@
+libace-xml-utils-6.5.0: no-symbols-control-file usr/lib/libACE_XML_Utils-6.5.0.so
diff --git a/ACE/debian/libace-xtreactor-6.4.8.lintian-overrides b/ACE/debian/libace-xtreactor-6.4.8.lintian-overrides
deleted file mode 100644
index 9ab3819ebb0..00000000000
--- a/ACE/debian/libace-xtreactor-6.4.8.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libace-xtreactor-6.4.8: no-symbols-control-file usr/lib/libACE_XtReactor-6.4.8.so
diff --git a/ACE/debian/libace-xtreactor-6.4.8.install b/ACE/debian/libace-xtreactor-6.5.0.install
index c53614c7208..c53614c7208 100644
--- a/ACE/debian/libace-xtreactor-6.4.8.install
+++ b/ACE/debian/libace-xtreactor-6.5.0.install
diff --git a/ACE/debian/libace-xtreactor-6.5.0.lintian-overrides b/ACE/debian/libace-xtreactor-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..b6051b04ae2
--- /dev/null
+++ b/ACE/debian/libace-xtreactor-6.5.0.lintian-overrides
@@ -0,0 +1 @@
+libace-xtreactor-6.5.0: no-symbols-control-file usr/lib/libACE_XtReactor-6.5.0.so
diff --git a/ACE/debian/libacexml-6.4.8.lintian-overrides b/ACE/debian/libacexml-6.4.8.lintian-overrides
deleted file mode 100644
index 212303f93be..00000000000
--- a/ACE/debian/libacexml-6.4.8.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-libacexml-6.4.8: no-symbols-control-file usr/lib/libACEXML_Parser-6.4.8.so
-libacexml-6.4.8: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.4.8.so
-libacexml-6.4.8: no-symbols-control-file usr/lib/libACEXML-6.4.8.so
diff --git a/ACE/debian/libacexml-6.4.8.docs b/ACE/debian/libacexml-6.5.0.docs
index 002855d7915..002855d7915 100644
--- a/ACE/debian/libacexml-6.4.8.docs
+++ b/ACE/debian/libacexml-6.5.0.docs
diff --git a/ACE/debian/libacexml-6.4.8.install b/ACE/debian/libacexml-6.5.0.install
index d3e912ffa51..d3e912ffa51 100644
--- a/ACE/debian/libacexml-6.4.8.install
+++ b/ACE/debian/libacexml-6.5.0.install
diff --git a/ACE/debian/libacexml-6.5.0.lintian-overrides b/ACE/debian/libacexml-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..fdd3bfbdbb8
--- /dev/null
+++ b/ACE/debian/libacexml-6.5.0.lintian-overrides
@@ -0,0 +1,3 @@
+libacexml-6.5.0: no-symbols-control-file usr/lib/libACEXML_Parser-6.5.0.so
+libacexml-6.5.0: no-symbols-control-file usr/lib/libACEXML_XML_Svc_Conf_Parser-6.5.0.so
+libacexml-6.5.0: no-symbols-control-file usr/lib/libACEXML-6.5.0.so
diff --git a/ACE/debian/libkokyu-6.4.8.lintian-overrides b/ACE/debian/libkokyu-6.4.8.lintian-overrides
deleted file mode 100644
index 1509a39c7e8..00000000000
--- a/ACE/debian/libkokyu-6.4.8.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkokyu-6.4.8: no-symbols-control-file usr/lib/libKokyu-6.4.8.so
diff --git a/ACE/debian/libkokyu-6.4.8.docs b/ACE/debian/libkokyu-6.5.0.docs
index e8869c513b2..e8869c513b2 100644
--- a/ACE/debian/libkokyu-6.4.8.docs
+++ b/ACE/debian/libkokyu-6.5.0.docs
diff --git a/ACE/debian/libkokyu-6.4.8.install b/ACE/debian/libkokyu-6.5.0.install
index 62854308f96..62854308f96 100644
--- a/ACE/debian/libkokyu-6.4.8.install
+++ b/ACE/debian/libkokyu-6.5.0.install
diff --git a/ACE/debian/libkokyu-6.5.0.lintian-overrides b/ACE/debian/libkokyu-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..0c93cd792e7
--- /dev/null
+++ b/ACE/debian/libkokyu-6.5.0.lintian-overrides
@@ -0,0 +1 @@
+libkokyu-6.5.0: no-symbols-control-file usr/lib/libKokyu-6.5.0.so
diff --git a/ACE/debian/libnetsvcs-6.4.8.lintian-overrides b/ACE/debian/libnetsvcs-6.4.8.lintian-overrides
deleted file mode 100644
index 3081d88a58d..00000000000
--- a/ACE/debian/libnetsvcs-6.4.8.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnetsvcs-6.4.8: no-symbols-control-file usr/lib/libnetsvcs-6.4.8.so
diff --git a/ACE/debian/libnetsvcs-6.4.8.docs b/ACE/debian/libnetsvcs-6.5.0.docs
index 0b03c55b91f..0b03c55b91f 100644
--- a/ACE/debian/libnetsvcs-6.4.8.docs
+++ b/ACE/debian/libnetsvcs-6.5.0.docs
diff --git a/ACE/debian/libnetsvcs-6.4.8.install b/ACE/debian/libnetsvcs-6.5.0.install
index c7a04b16213..c7a04b16213 100644
--- a/ACE/debian/libnetsvcs-6.4.8.install
+++ b/ACE/debian/libnetsvcs-6.5.0.install
diff --git a/ACE/debian/libnetsvcs-6.5.0.lintian-overrides b/ACE/debian/libnetsvcs-6.5.0.lintian-overrides
new file mode 100644
index 00000000000..e15cde2607d
--- /dev/null
+++ b/ACE/debian/libnetsvcs-6.5.0.lintian-overrides
@@ -0,0 +1 @@
+libnetsvcs-6.5.0: no-symbols-control-file usr/lib/libnetsvcs-6.5.0.so
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index 9f4ad7fd9cd..ea073ceb74f 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -1,6 +1,6 @@
 # Set the version number here.
-%define ACEVER  6.4.8
-%define TAOVER  2.4.8
+%define ACEVER  6.5.0
+%define TAOVER  2.5.0
 
 # Conditional build
 # Default values are
diff --git a/TAO/ChangeLogs/TAO-2_5_0 b/TAO/ChangeLogs/TAO-2_5_0
new file mode 100644
index 00000000000..2e71b46bc8e
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_5_0
@@ -0,0 +1,303 @@
+commit cf42f2ce36123105d52cfeff3d736775436cd96a
+Merge: 7d72360c4d6 7bd7f6cfe57
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jun 7 21:09:16 2018 +0200
+
+    Merge pull request #637 from jwillemsen/master
+    
+    Fixed typo and removed some empty lines
+
+commit 7bd7f6cfe5764bc2bb9f6fb7204bdf773d693c05
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jun 7 13:02:49 2018 +0200
+
+    Removed empty lines
+    
+        * TAO/tests/Portable_Interceptors/AdvSlot/client.cpp:
+        * TAO/tests/Portable_Interceptors/AdvSlot/server.cpp:
+        * TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp:
+        * TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h:
+
+commit ec9ea2cb073f98e1f56f23f23ede885c5e4d831e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Thu Jun 7 13:02:39 2018 +0200
+
+    Fixed typo in comment
+    
+        * TAO/tao/PI/ClientRequestInfo.cpp:
+
+commit 7a03ab755914edbf2494d5fe3f9b3eb9bd5bf2dd
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Sat Jun 2 09:55:50 2018 +0200
+
+    Fixed compile errors
+    
+        * TAO/examples/PluggableUDP/tests/Performance/server.cpp:
+        * TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp:
+
+commit 4bb2475504a0f1b85d1358f8daeedb4c65f9f548
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jun 1 17:02:27 2018 +0200
+
+    Add unit test for issue #570
+    
+        * TAO/tests/Bug_3845_Regression/issue570.idl:
+          Added.
+    
+        * TAO/tests/Bug_3845_Regression/run_test.pl:
+
+commit 0e06e1e74355e86aeda52bf2a2ca8f4dd2cde954
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jun 1 16:59:44 2018 +0200
+
+    Fix issue #570, crash of TAO_IDL on invalid IDL
+    
+        * TAO/TAO_IDL/util/utl_scope.cpp:
+
+commit 80bce7afb0cccdb9dbf82b24aebdcb36f918f2aa
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jun 1 14:34:35 2018 +0200
+
+    Fixed CodeFactor issues
+
+commit 8956a849cf8ccd48dacaf8db7b2add3df2c4a84d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jun 1 14:28:30 2018 +0200
+
+    Layout changes
+    
+        * TAO/DevGuideExamples/PortableInterceptors/Auth/Messenger_i.cpp:
+        * TAO/DevGuideExamples/PortableInterceptors/IOR/ClientInitializer.cpp:
+        * TAO/DevGuideExamples/PortableInterceptors/SimpleCodec/ClientInitializer.cpp:
+        * TAO/TAO_IDL/ast/ast_interface.cpp:
+        * TAO/TAO_IDL/ast/ast_union.cpp:
+        * TAO/TAO_IDL/be/be_global.cpp:
+        * TAO/examples/Advanced/ch_18/client.cpp:
+        * TAO/examples/Advanced/ch_18/server.h:
+        * TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp:
+        * TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.h:
+        * TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp:
+        * TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp:
+        * TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.h:
+        * TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp:
+        * TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.h:
+        * TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp:
+        * TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp:
+        * TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp:
+        * TAO/examples/PluggableUDP/tests/Performance/client.cpp:
+        * TAO/examples/PluggableUDP/tests/Performance/server.cpp:
+        * TAO/orbsvcs/DevGuideExamples/NotifyService/EventSequence/Messenger_i.cpp:
+        * TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp:
+        * TAO/orbsvcs/IFR_Service/be_global.cpp:
+        * TAO/orbsvcs/IFR_Service/be_produce.cpp:
+        * TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
+        * TAO/orbsvcs/ImplRepo_Service/ImR_Activator.cpp:
+        * TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp:
+        * TAO/orbsvcs/examples/CosEC/TypedSimple/Country_i.cpp:
+        * TAO/orbsvcs/examples/Notify/Lanes/Supplier.cpp:
+        * TAO/orbsvcs/examples/Notify/ThreadPool/Supplier.cpp:
+        * TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+        * TAO/orbsvcs/orbsvcs/AV/TCP.cpp:
+        * TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp:
+        * TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp:
+        * TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp:
+        * TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h:
+        * TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp:
+        * TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h:
+        * TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h:
+
+commit 10b5846921aa7d988936cdc21057a592b51d7690
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jun 1 14:18:32 2018 +0200
+
+    Layout change
+    
+        * TAO/orbsvcs/examples/Notify/Lanes/Consumer.cpp:
+
+commit b870908ba95d171f8d2ffbc456ab8a7b659c4433
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Fri Jun 1 11:24:20 2018 +0200
+
+    Removed last TAO env macros and some layout changes
+
+commit 51d87f3608962ffe1fb12e7a1de31e4c9fa7d729
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed May 30 11:51:07 2018 +0200
+
+    Next release will be minor
+    
+        * ACE/NEWS:
+        * TAO/NEWS:
+
+commit 98b95510000b4da8460034b8936422e98527740f
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Wed May 16 18:27:21 2018 +0200
+
+    List std::unique_ptr usage
+
+commit 03ead678354f6e07c988a46e158b997896f8aeca
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 19:09:14 2018 +0200
+
+    Make use of std::unique_ptr
+    
+        * TAO/tao/PortableServer/Object_Adapter.cpp:
+
+commit 43bdfc0437da6a2e78732f072253c9725818d556
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 17:15:22 2018 +0200
+
+    Layout changes
+    
+        * TAO/tao/IORManipulation/IORManipulation.cpp:
+        * TAO/tao/Valuetype/ValueBase.inl:
+
+commit 774e7f6ef1630fc42d3bf45d45e37fbaeb101659
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 17:01:11 2018 +0200
+
+    Make use of std::unique_ptr when we have C++11
+    
+        * TAO/tao/IORManipulation/IORManipulation.cpp:
+
+commit 330d868ab419f28e24dfe1b9d29500eafac66b7e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 16:24:30 2018 +0200
+
+    Use std::unique_ptr when usign C++11
+    
+        * TAO/tao/Dynamic_TP/DTP_Thread_Pool.cpp:
+        * TAO/tao/PortableServer/Object_Adapter.cpp:
+        * TAO/tao/PortableServer/Root_POA.cpp:
+        * TAO/tao/PortableServer/ServantRetentionStrategyRetain.h:
+
+commit c4a7434d85ec752a5939bfafc35384534fc4705d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 15:32:58 2018 +0200
+
+    Make use of std::unique_ptr with C++11
+    
+        * TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
+
+commit 2201a11b5acbbe38c86f72e8e444b1932196d38e
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 15:04:20 2018 +0200
+
+    Use std::unique_ptr with C++11
+    
+        * TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp:
+        * TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp:
+        * TAO/tao/AnyTypeCode/Any_SystemException.cpp:
+        * TAO/tao/AnyTypeCode/NVList.cpp:
+        * TAO/tao/IORManipulation/IORManipulation.cpp:
+
+commit 074ca6ccfcbd44a76620ef52a42d644a32737eb0
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 15:00:27 2018 +0200
+
+    Fixed typo in error message
+    
+        * TAO/tao/PortableServer/Active_Object_Map.cpp:
+        * TAO/tao/PortableServer/Object_Adapter.cpp:
+
+commit c32cb0f99e00b506c78644fcaa0098f3b72c912d
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 14:38:57 2018 +0200
+
+    Further changes for using std::unique_ptr
+    
+        * TAO/tao/PortableServer/Active_Object_Map.cpp:
+
+commit df6d9751d3bf1a45c22c6282fe404ba2857f6ff4
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 14:07:19 2018 +0200
+
+    No need to initialise auto_ptr/unique_ptr to 0 in the constructor
+    
+        * TAO/tao/PortableServer/Active_Object_Map.cpp:
+
+commit 80f2464b6e7f72016db991dbd12e87ba1fd83271
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 13:43:53 2018 +0200
+
+    Make use of std::unique_ptr when we have C++11
+    
+        * TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp:
+        * TAO/tao/AnyTypeCode/Any_Special_Impl_T.cpp:
+
+commit b361514d8bea5de5bd984bb10205ecf0843c04c6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 13:12:51 2018 +0200
+
+    Make use of std::unique_ptr when we have C++11
+    
+        * TAO/tao/PortableServer/Active_Object_Map.h:
+
+commit afa546317cb4ad800e4337edd4ea98f91135e7c9
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 13:03:34 2018 +0200
+
+    Use std::unique_ptr when using C++11
+    
+        * TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
+        * TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp:
+        * TAO/tao/AnyTypeCode/Any_Impl_T.cpp:
+        * TAO/tao/Connector_Registry.cpp:
+        * TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+        * TAO/tao/Load_Protocol_Factory_T.h:
+        * TAO/tao/ORB_Core.cpp:
+        * TAO/tao/RTCORBA/Thread_Pool.cpp:
+        * TAO/tao/Stub.cpp:
+        * TAO/tao/Synch_Invocation.cpp:
+
+commit e915b48fcd7eee34bf661673b532bfa0b6e9cccb
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 12:28:55 2018 +0200
+
+    Make use of std::unique_ptr when we have C++11
+    
+        * TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp:
+        * TAO/tao/Load_Protocol_Factory_T.h:
+
+commit 880d4ee94da593dedaa766e0ded0cb09eb15394b
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 11:56:40 2018 +0200
+
+    Make use of std::unique_ptr when we have C++11
+    
+        * TAO/tao/RTCORBA/Thread_Pool.cpp:
+
+commit 7344ff452a10010a88fa937d85ebaed40eddb638
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 11:46:45 2018 +0200
+
+    Make use of std::unique_ptr when we have C++11
+    
+        * TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp:
+
+commit c3953feb3a48473bc0b78691e7fe18d08f477df8
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Tue May 15 11:07:52 2018 +0200
+
+    When we have C++11 make use of std::unique_ptr
+    
+        * TAO/tao/AnyTypeCode/Any_Impl_T.cpp:
+        * TAO/tao/Connector_Registry.cpp:
+        * TAO/tao/ORB_Core.cpp:
+        * TAO/tao/Stub.cpp:
+        * TAO/tao/Synch_Invocation.cpp:
+
+commit c560110d8f3206a7866866cff325489eb2ea88db
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date:   Mon May 14 16:27:08 2018 +0200
+
+    ACE+TAO x.4.8 release
+    
+        * ACE/NEWS:
+        * ACE/bin/diff-builds-and-group-fixed-tests-only.sh:
+        * ACE/docs/Download.html:
+        * ACE/docs/bczar/bczar.html:
+        * ACE/etc/index.html:
+        * TAO/NEWS:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index ccc5c3943c5..faaaaee409b 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -40,8 +40,8 @@
 To: tao-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 2.4.8
-    ACE VERSION: 6.4.8
+    TAO VERSION: 2.5.0
+    ACE VERSION: 6.5.0
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/VERSION b/TAO/VERSION
index 9c2bd4eae82..6c08a230c9c 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 2.4.8, released Mon May 14 16:19:00 CEST 2018
+This is TAO version 2.5.0, released Tue Jun 12 08:27:49 CEST 2018
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu),
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 883a9ac8a39..8b07464f6b4 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -3,10 +3,10 @@
 // This is file was automatically generated by $ACE_ROOT/bin/make_release.py
 
 #define TAO_MAJOR_VERSION 2
-#define TAO_MINOR_VERSION 4
-#define TAO_MICRO_VERSION 8
-#define TAO_BETA_VERSION 8
-#define TAO_VERSION "2.4.8"
-#define TAO_VERSION_CODE 132104
+#define TAO_MINOR_VERSION 5
+#define TAO_MICRO_VERSION 0
+#define TAO_BETA_VERSION 0
+#define TAO_VERSION "2.5.0"
+#define TAO_VERSION_CODE 132352
 #define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))