summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ACE/ChangeLogs/ACE-6_5_17137
-rw-r--r--ACE/PROBLEM-REPORT-FORM2
-rw-r--r--ACE/VERSION.txt2
-rw-r--r--ACE/ace/Version.h8
-rw-r--r--ACE/debian/control62
-rw-r--r--ACE/rpmbuild/ace-tao.spec4
-rw-r--r--TAO/ChangeLogs/TAO-2_5_17118
-rw-r--r--TAO/PROBLEM-REPORT-FORM4
-rw-r--r--TAO/VERSION.txt2
-rw-r--r--TAO/tao/Version.h8
10 files changed, 301 insertions, 46 deletions
diff --git a/ACE/ChangeLogs/ACE-6_5_17 b/ACE/ChangeLogs/ACE-6_5_17
new file mode 100644
index 00000000000..c0afcf9055d
--- /dev/null
+++ b/ACE/ChangeLogs/ACE-6_5_17
@@ -0,0 +1,137 @@
+commit 4637db4161be645eb73aae66eeb7cdf98853bca7
+Author: Justin R. Wilson <wilsonj@objectcomputing.com>
+Date: Thu May 26 14:21:46 2022 -0500
+
+ Add support for macOS Monterey
+
+commit 77c66ad410a81710ae5c8f91b316f2566dfb0035
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Tue May 10 11:05:27 2022 -0500
+
+ From review
+
+commit 717332778368b909f502a0b91a130bf9d4013d3b
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Mon May 9 14:21:13 2022 -0500
+
+ Return when core files are handled by a dedicated service
+
+commit ed7780d7c28553a7f1080c450d3a5aa62245e1d8
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Wed May 4 16:14:30 2022 -0500
+
+ From review
+
+commit c45da571827a06c29a794b9e3ac17c720892b5fe
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Tue May 3 12:05:17 2022 -0500
+
+ From review
+
+commit 25671db08e2f939f96dc90a75f39038f4cff3953
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Fri Apr 29 17:41:07 2022 -0500
+
+ Choosing debugger is configurable
+
+commit fad3aa9f735ede7455e2fe7e7ff5a5c991b9f8f7
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Fri Apr 29 16:45:38 2022 -0500
+
+ From review
+
+commit f04748dc14e7218547cd8621b89d880390ea8b38
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Fri Apr 29 16:30:31 2022 -0500
+
+ Add support for macOS & fixed errors
+
+commit c3dea08e83126e36b99d919ddcd0c8cf333092d8
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Thu Apr 28 18:22:28 2022 -0500
+
+ Update logs
+
+commit a45738d60e2ffe6792f4c3d582eaa369bac8b82d
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Thu Apr 28 18:07:18 2022 -0500
+
+ Update WaitKill
+
+commit 66e7e08a2042ed8cfeb56d72e3538eaed5a11b97
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Thu Apr 28 17:39:07 2022 -0500
+
+ Print out stack trace
+
+commit 7846f2db1fe1f781cf9573c5392fe69131be71c7
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Wed Apr 6 13:00:30 2022 -0500
+
+ Update doc and add argument to SpawnWaitKill
+
+commit 146a30e97879d52584d681754354e3e1bc9df02b
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Mon Apr 4 17:00:53 2022 -0500
+
+ Update Kill function
+
+commit e401f02ed7c528e6caaba85763d1b153f56e75f3
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Mon Apr 4 12:31:09 2022 -0500
+
+ Indicating if a process can self crash and get signal info
+
+commit 0f190e0f155c2eea7587a7b4462d52efc6d6d725
+Author: Son Dinh <technology789@gmail.com>
+Date: Thu Mar 31 14:35:10 2022 -0500
+
+ Revert "Get signal information from PerlACE"
+
+commit 9e115d56f7986e3bc79b5bb6de9508fc2c11cf64
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Mon Mar 28 21:52:05 2022 -0500
+
+ Update code comments
+
+commit 2aae81f0997ff78652023276f5a61e1c2a6edcbf
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Fri Mar 25 12:23:14 2022 -0500
+
+ Use hashref
+
+commit f336038380c3d096d36d94b68777cab077163d8c
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Wed Mar 23 14:42:39 2022 -0500
+
+ Update function prototype
+
+commit 8a40528ea37006b20f031ad93d038ecb52090d2d
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Tue Mar 22 11:29:33 2022 -0500
+
+ Update VMS process
+
+commit cb7b485a4641b0c0282e2d73216c1c3a54a92e4c
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Mon Mar 21 23:34:47 2022 -0500
+
+ Update comment
+
+commit 34602aeea68e0c364b87c2de7b4215839f7807f2
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Mon Mar 21 23:21:28 2022 -0500
+
+ Return signal code if any
+
+commit bb40fc4e180ba724d1a23296e526ff8591e9985f
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Thu Jan 6 11:01:55 2022 -0600
+
+ depgen for IDL: remove assumption about IDL files in subdirs
+
+ tao_idl dir/file.idl doesn't put its output in dir by default
+ The ObjectGenerator perl module doesn't know about the -o option to tao_idl
+ The base filename may work anyway due to VPATH
+
+ (cherry picked from commit 5edb3f8c49de9b98900bcc03ba5e0500fcc020db)
diff --git a/ACE/PROBLEM-REPORT-FORM b/ACE/PROBLEM-REPORT-FORM
index e1f5ee523ed..1e8e129f26d 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.5.16
+ ACE VERSION: 6.5.17
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 00cbe107063..2aef84891a7 100644
--- a/ACE/VERSION.txt
+++ b/ACE/VERSION.txt
@@ -1,4 +1,4 @@
-This is ACE version 6.5.16, released Wed Nov 17 08:51:00 CET 2021
+This is ACE version 6.5.17, released Tue Jun 14 08:43:48 CEST 2022
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 e246812bd97..6f7270fd91f 100644
--- a/ACE/ace/Version.h
+++ b/ACE/ace/Version.h
@@ -4,8 +4,8 @@
#define ACE_MAJOR_VERSION 6
#define ACE_MINOR_VERSION 5
-#define ACE_MICRO_VERSION 16
-#define ACE_BETA_VERSION 16
-#define ACE_VERSION "6.5.16"
-#define ACE_VERSION_CODE 0x60510
+#define ACE_MICRO_VERSION 17
+#define ACE_BETA_VERSION 17
+#define ACE_VERSION "6.5.17"
+#define ACE_VERSION_CODE 0x60511
#define ACE_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
diff --git a/ACE/debian/control b/ACE/debian/control
index 4235a54d572..31b243c2df2 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.5.16
+Package: libace-6.5.17
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.5.16 (= ${binary:Version}), ${misc:Depends}
+Depends: libace-6.5.17 (= ${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.5.16
+Package: libace-ssl-6.5.17
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.5.16 (= ${binary:Version}), libace-dev (= ${binary:Version}), libssl-dev, ${misc:Depends}
+Depends: libace-ssl-6.5.17 (= ${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.5.16
+Package: libace-rmcast-6.5.17
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.5.16 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-rmcast-6.5.17 (= ${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.5.16
+Package: libace-tmcast-6.5.17
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.5.16 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-tmcast-6.5.17 (= ${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.5.16
+Package: libace-htbp-6.5.17
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.5.16 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-htbp-6.5.17 (= ${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.5.16
+Package: libace-inet-6.5.17
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.5.16 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-6.5.17 (= ${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.5.16
+Package: libace-inet-ssl-6.5.17
Architecture: any
Section: libs
-Depends: libace-inet-6.5.16, libace-ssl-6.5.16, ${shlibs:Depends}, ${misc:Depends}
+Depends: libace-inet-6.5.17, libace-ssl-6.5.17, ${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.5.16 (= ${binary:Version}), libace-inet-dev (= ${binary:Version}), libace-ssl-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libace-inet-ssl-6.5.17 (= ${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.5.16
+Package: libacexml-6.5.17
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.5.16 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libacexml-6.5.17 (= ${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.5.16
+Package: libace-xml-utils-6.5.17
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.5.16 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}, libxerces-c-dev
+Depends: libace-xml-utils-6.5.17 (= ${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.5.16
+Package: libkokyu-6.5.17
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.5.16 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libkokyu-6.5.17 (= ${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.5.16
+Package: libace-xtreactor-6.5.17
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.5.16 (= ${binary:Version}), libace-dev (= ${binary:Version}), libxt-dev (>= 4.3.0), ${misc:Depends}
+Depends: libace-xtreactor-6.5.17 (= ${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.5.16
+Package: libace-tkreactor-6.5.17
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.5.16 (= ${binary:Version}), libace-dev (= ${binary:Version}), tk-dev (>= 8.5), ${misc:Depends}
+Depends: libace-tkreactor-6.5.17 (= ${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.5.16
+Package: libace-flreactor-6.5.17
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.5.16 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfltk1.1-dev (>= 1.1.4), ${misc:Depends}
+Depends: libace-flreactor-6.5.17 (= ${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.5.16
+Package: libace-foxreactor-6.5.17
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.5.16 (= ${binary:Version}), libace-dev (= ${binary:Version}), libfox-1.6-dev, ${misc:Depends}
+Depends: libace-foxreactor-6.5.17 (= ${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.5.16
+Package: libnetsvcs-6.5.17
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.5.16 (= ${binary:Version}), libace-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libnetsvcs-6.5.17 (= ${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 2c2206e3114..eed46d39866 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.5.16
-%define TAOVER 2.5.16
+%define ACEVER 6.5.17
+%define TAOVER 2.5.17
# Conditional build
# Default values are
diff --git a/TAO/ChangeLogs/TAO-2_5_17 b/TAO/ChangeLogs/TAO-2_5_17
new file mode 100644
index 00000000000..8c8f00b440c
--- /dev/null
+++ b/TAO/ChangeLogs/TAO-2_5_17
@@ -0,0 +1,118 @@
+commit d4139bda50f6c91fd0678532c45738b676522da6
+Author: Johnny Willemsen <jwillemsen@remedy.nl>
+Date: Tue Jun 7 09:39:44 2022 +0200
+
+ Fixed merge conflicts
+
+commit c59927e3016c817114e5572d0d9bcfb5fe94ac66
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Tue Apr 12 12:37:45 2022 -0500
+
+ More tests update
+
+commit 027700d2ee6d9c8265717e9d117ad87d43911d44
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Fri Apr 8 12:34:55 2022 -0500
+
+ Update orbsvcs tests
+
+commit abd2964b279d3d54450750fc0359f4aad24d40a5
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Thu Apr 7 16:56:03 2022 -0500
+
+ More updates to TAO/tests
+
+commit 8d4dfcbddad8a3aeb48c8d69f45ad037a3129e28
+Author: Son Dinh <dinhs@objectcomputing.com>
+Date: Thu Apr 7 11:26:20 2022 -0500
+
+ Fixing tests
+
+commit 84c8fabf00da4d576e0671f3f5c274970a4d9281
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Thu Mar 31 16:26:49 2022 -0500
+
+ NEWS for recent TAO 2.x changes
+
+commit 670074ab32dbb65d4e2cb0503dedba2751c69fd6
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Fri Mar 11 10:35:21 2022 -0600
+
+ tao_idl: avoid undefined behavior (adding to nullptr)
+
+ (cherry picked from commit 0bfdaeb95608f3652cfe499e1960988c71476f30)
+
+commit 56748a767cc984fefe3473515cc3985b8c68a59e
+Author: Fred Hornsey <hornseyf@objectcomputing.com>
+Date: Tue Feb 15 14:41:57 2022 -0600
+
+ Fix tao_idl File Error Messages
+
+ Backport of https://github.com/DOCGroup/ACE_TAO/pull/1783
+
+ 1. The error message for failing to open an IDL file didn't have the
+ filename in it. This was because the `ACE_ERROR` for it was using a
+ `%m` when it should have been using a `%p`.
+ It looks like https://github.com/DOCGroup/ACE_TAO/commit/faab6830cf4ecf67b452183dba712caae7996be4
+ went one change too far.
+
+ 2. First brought up here: https://github.com/objectcomputing/OpenDDS/issues/3308
+ Inputting a directory to tao_idl results in an empty file that causes
+ a weird error latter. Changed it to ensure the file is a regular file
+ using `stat`.
+
+commit 132801c870f2fa1a951770099f8781da006d455b
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Thu Feb 3 10:50:44 2022 -0600
+
+ Merge pull request #1778 from ClaytonCalabrese/resolve_space_in_path_followup
+
+ TAO_IDL: Fix Space In Path Handling: Unused Variable Followup
+
+ (cherry picked from commit a943c6302418abb397b271f94202df3efb722151)
+
+commit 57c9ec77ae81388bc212820417d1cc27ab9e4b3a
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Tue Feb 1 14:57:43 2022 -0600
+
+ Merge pull request #1772 from ClaytonCalabrese/resolve_space_in_path
+
+ TAO_IDL: Fix Space In Path Handling
+
+ (cherry picked from commit e4b72cc9a0fcc5e0f4449eef2598d84df37715b2)
+
+commit 1196295dc3f4a17d4ebb6688c3160aa3e69c8279
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Fri Jan 14 16:48:18 2022 -0600
+
+ Merge pull request #1760 from mitza-oci/cxx20
+
+ fixed build with GCC -std=c++20
+
+ (cherry picked from commit a8372419d0e73f4b816fccd15d85b085c56ea4d3)
+
+ # Conflicts:
+ # .github/workflows/linux.yml
+
+commit facc3186b738077451f2f3357f0ba2b02b81b517
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Tue Jan 11 14:21:45 2022 -0600
+
+ [TAO 2]: fixed warning in ast_expression.cpp
+
+ Already fixed in TAO 3
+
+commit b451f7e5b2ebaaa95085fab746821d9de167efab
+Merge: 570490704a2 f8d8777b9cb
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Tue Nov 23 09:09:04 2021 -0600
+
+ Merge pull request #1738 from mitza-oci/tao2-comments
+
+ [TAO 2] fixed comments in tao_idl-generated code
+
+commit f8d8777b9cb4c42d8e693b9c97f8f9469740de76
+Author: Adam Mitz <mitza@objectcomputing.com>
+Date: Fri Nov 19 16:00:54 2021 -0600
+
+ fixed comments in tao_idl-generated code
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index a1a5f177325..e33cff2b184 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.5.16
- ACE VERSION: 6.5.16
+ TAO VERSION: 2.5.17
+ ACE VERSION: 6.5.17
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 57493ecf078..0416cc64c33 100644
--- a/TAO/VERSION.txt
+++ b/TAO/VERSION.txt
@@ -1,4 +1,4 @@
-This is TAO version 2.5.16, released Wed Nov 17 08:51:00 CET 2021
+This is TAO version 2.5.17, released Tue Jun 14 08:43:48 CEST 2022
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 7992e2a57e4..8ddceb158b6 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -4,8 +4,8 @@
#define TAO_MAJOR_VERSION 2
#define TAO_MINOR_VERSION 5
-#define TAO_MICRO_VERSION 16
-#define TAO_BETA_VERSION 16
-#define TAO_VERSION "2.5.16"
-#define TAO_VERSION_CODE 0x20510
+#define TAO_MICRO_VERSION 17
+#define TAO_BETA_VERSION 17
+#define TAO_VERSION "2.5.17"
+#define TAO_VERSION_CODE 0x20511
#define TAO_MAKE_VERSION_CODE(a,b,c) (((a) << 16) + ((b) << 8) + (c))
View Lorry Controller Status